| Message ID | 1523509343-18123-7-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 45519924a09d7818c30042b1ccd0b7526ef5e26d |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | bootvx: Various enhancements to booting VxWorks x86 kernels | expand |
2018-04-12 7:02 GMT+02:00 Bin Meng <bmeng.cn@gmail.com>: > This changes 'struct e820entry' to 'struct e820_entry' to conform > with the coding style. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> > --- > > Changes in v2: None > > arch/x86/cpu/coreboot/sdram.c | 2 +- > arch/x86/cpu/qemu/e820.c | 2 +- > arch/x86/cpu/tangier/sdram.c | 4 ++-- > arch/x86/include/asm/bootparam.h | 2 +- > arch/x86/include/asm/e820.h | 4 ++-- > arch/x86/lib/coreboot_table.c | 2 +- > arch/x86/lib/e820.c | 2 +- > arch/x86/lib/fsp/fsp_dram.c | 2 +- > cmd/elf.c | 6 +++--- > 9 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c > index 05918bc..885fc6f 100644 > --- a/arch/x86/cpu/coreboot/sdram.c > +++ b/arch/x86/cpu/coreboot/sdram.c > @@ -13,7 +13,7 @@ > DECLARE_GLOBAL_DATA_PTR; > > unsigned int install_e820_map(unsigned int max_entries, > - struct e820entry *entries) > + struct e820_entry *entries) > { > unsigned int num_entries; > int i; > diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c > index 11409dd..ec733cb 100644 > --- a/arch/x86/cpu/qemu/e820.c > +++ b/arch/x86/cpu/qemu/e820.c > @@ -10,7 +10,7 @@ > DECLARE_GLOBAL_DATA_PTR; > > unsigned int install_e820_map(unsigned int max_entries, > - struct e820entry *entries) > + struct e820_entry *entries) > { > entries[0].addr = 0; > entries[0].size = ISA_START_ADDRESS; > diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c > index daa9909..f5f412a 100644 > --- a/arch/x86/cpu/tangier/sdram.c > +++ b/arch/x86/cpu/tangier/sdram.c > @@ -100,7 +100,7 @@ static struct sfi_table_simple *sfi_search_mmap(void) > i++, mentry++) \ > > static unsigned int sfi_setup_e820(unsigned int max_entries, > - struct e820entry *entries) > + struct e820_entry *entries) > { > struct sfi_table_simple *sb; > struct sfi_mem_entry *mentry; > @@ -190,7 +190,7 @@ static phys_size_t sfi_get_ram_size(void) > } > > unsigned int install_e820_map(unsigned int max_entries, > - struct e820entry *entries) > + struct e820_entry *entries) > { > return sfi_setup_e820(max_entries, entries); > } > diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h > index 6aba614..0386cbe 100644 > --- a/arch/x86/include/asm/bootparam.h > +++ b/arch/x86/include/asm/bootparam.h > @@ -111,7 +111,7 @@ struct boot_params { > struct setup_header hdr; /* setup header */ /* 0x1f1 */ > __u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; > __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ > - struct e820entry e820_map[E820MAX]; /* 0x2d0 */ > + struct e820_entry e820_map[E820MAX]; /* 0x2d0 */ > __u8 _pad8[48]; /* 0xcd0 */ > struct edd_info eddbuf[EDDMAXNR]; /* 0xd00 */ > __u8 _pad9[276]; /* 0xeec */ > diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h > index 8355c34..9d29f82 100644 > --- a/arch/x86/include/asm/e820.h > +++ b/arch/x86/include/asm/e820.h > @@ -12,7 +12,7 @@ > #ifndef __ASSEMBLY__ > #include <linux/types.h> > > -struct e820entry { > +struct e820_entry { > __u64 addr; /* start of memory segment */ > __u64 size; /* size of memory segment */ > __u32 type; /* type of memory segment */ > @@ -25,6 +25,6 @@ struct e820entry { > > /* Implementation defined function to install an e820 map */ > unsigned int install_e820_map(unsigned int max_entries, > - struct e820entry *); > + struct e820_entry *); > > #endif /* _ASM_X86_E820_H */ > diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c > index b1b4cd9..5e0edd3 100644 > --- a/arch/x86/lib/coreboot_table.c > +++ b/arch/x86/lib/coreboot_table.c > @@ -100,7 +100,7 @@ void write_coreboot_table(u32 addr, struct memory_area *cfg_tables) > struct cb_record *cbr; > struct cb_memory *mem; > struct cb_memory_range *map; > - struct e820entry e820[32]; > + struct e820_entry e820[32]; > struct cb_framebuffer *fb; > struct vesa_mode_info *vesa; > int i, num; > diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c > index c2595b1..84c8fab 100644 > --- a/arch/x86/lib/e820.c > +++ b/arch/x86/lib/e820.c > @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; > * CONFIG_PCIE_ECAM_BASE PCIe ECAM > */ > __weak unsigned int install_e820_map(unsigned int max_entries, > - struct e820entry *entries) > + struct e820_entry *entries) > { > entries[0].addr = 0; > entries[0].size = ISA_START_ADDRESS; > diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c > index c1c6c54..662d4ac 100644 > --- a/arch/x86/lib/fsp/fsp_dram.c > +++ b/arch/x86/lib/fsp/fsp_dram.c > @@ -63,7 +63,7 @@ ulong board_get_usable_ram_top(ulong total_size) > } > > unsigned int install_e820_map(unsigned int max_entries, > - struct e820entry *entries) > + struct e820_entry *entries) > { > unsigned int num_entries = 0; > const struct hob_header *hdr; > diff --git a/cmd/elf.c b/cmd/elf.c > index 0717feb..824f88e 100644 > --- a/cmd/elf.c > +++ b/cmd/elf.c > @@ -210,7 +210,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > #ifdef CONFIG_X86 > ulong base; > struct e820_info *info; > - struct e820entry *data; > + struct e820_entry *data; > #endif > > /* > @@ -339,13 +339,13 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > * if we don't specify it in the environment, use a default one. > */ > base = env_get_hex("vx_phys_mem_base", VXWORKS_PHYS_MEM_BASE); > - data = (struct e820entry *)(base + E820_DATA_OFFSET); > + data = (struct e820_entry *)(base + E820_DATA_OFFSET); > info = (struct e820_info *)(base + E820_INFO_OFFSET); > > memset(info, 0, sizeof(struct e820_info)); > info->sign = E820_SIGNATURE; > info->entries = install_e820_map(E820MAX, data); > - info->addr = (info->entries - 1) * sizeof(struct e820entry) + > + info->addr = (info->entries - 1) * sizeof(struct e820_entry) + > E820_DATA_OFFSET; > > /* > -- > 2.7.4 >
On Thu, Apr 12, 2018 at 3:28 PM, Christian Gmeiner <christian.gmeiner@gmail.com> wrote: > 2018-04-12 7:02 GMT+02:00 Bin Meng <bmeng.cn@gmail.com>: >> This changes 'struct e820entry' to 'struct e820_entry' to conform >> with the coding style. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> > >> --- >> >> Changes in v2: None >> >> arch/x86/cpu/coreboot/sdram.c | 2 +- >> arch/x86/cpu/qemu/e820.c | 2 +- >> arch/x86/cpu/tangier/sdram.c | 4 ++-- >> arch/x86/include/asm/bootparam.h | 2 +- >> arch/x86/include/asm/e820.h | 4 ++-- >> arch/x86/lib/coreboot_table.c | 2 +- >> arch/x86/lib/e820.c | 2 +- >> arch/x86/lib/fsp/fsp_dram.c | 2 +- >> cmd/elf.c | 6 +++--- >> 9 files changed, 13 insertions(+), 13 deletions(-) >> applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 05918bc..885fc6f 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; unsigned int install_e820_map(unsigned int max_entries, - struct e820entry *entries) + struct e820_entry *entries) { unsigned int num_entries; int i; diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index 11409dd..ec733cb 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -10,7 +10,7 @@ DECLARE_GLOBAL_DATA_PTR; unsigned int install_e820_map(unsigned int max_entries, - struct e820entry *entries) + struct e820_entry *entries) { entries[0].addr = 0; entries[0].size = ISA_START_ADDRESS; diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index daa9909..f5f412a 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -100,7 +100,7 @@ static struct sfi_table_simple *sfi_search_mmap(void) i++, mentry++) \ static unsigned int sfi_setup_e820(unsigned int max_entries, - struct e820entry *entries) + struct e820_entry *entries) { struct sfi_table_simple *sb; struct sfi_mem_entry *mentry; @@ -190,7 +190,7 @@ static phys_size_t sfi_get_ram_size(void) } unsigned int install_e820_map(unsigned int max_entries, - struct e820entry *entries) + struct e820_entry *entries) { return sfi_setup_e820(max_entries, entries); } diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 6aba614..0386cbe 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h @@ -111,7 +111,7 @@ struct boot_params { struct setup_header hdr; /* setup header */ /* 0x1f1 */ __u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ - struct e820entry e820_map[E820MAX]; /* 0x2d0 */ + struct e820_entry e820_map[E820MAX]; /* 0x2d0 */ __u8 _pad8[48]; /* 0xcd0 */ struct edd_info eddbuf[EDDMAXNR]; /* 0xd00 */ __u8 _pad9[276]; /* 0xeec */ diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 8355c34..9d29f82 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h @@ -12,7 +12,7 @@ #ifndef __ASSEMBLY__ #include <linux/types.h> -struct e820entry { +struct e820_entry { __u64 addr; /* start of memory segment */ __u64 size; /* size of memory segment */ __u32 type; /* type of memory segment */ @@ -25,6 +25,6 @@ struct e820entry { /* Implementation defined function to install an e820 map */ unsigned int install_e820_map(unsigned int max_entries, - struct e820entry *); + struct e820_entry *); #endif /* _ASM_X86_E820_H */ diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index b1b4cd9..5e0edd3 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -100,7 +100,7 @@ void write_coreboot_table(u32 addr, struct memory_area *cfg_tables) struct cb_record *cbr; struct cb_memory *mem; struct cb_memory_range *map; - struct e820entry e820[32]; + struct e820_entry e820[32]; struct cb_framebuffer *fb; struct vesa_mode_info *vesa; int i, num; diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index c2595b1..84c8fab 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; * CONFIG_PCIE_ECAM_BASE PCIe ECAM */ __weak unsigned int install_e820_map(unsigned int max_entries, - struct e820entry *entries) + struct e820_entry *entries) { entries[0].addr = 0; entries[0].size = ISA_START_ADDRESS; diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index c1c6c54..662d4ac 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -63,7 +63,7 @@ ulong board_get_usable_ram_top(ulong total_size) } unsigned int install_e820_map(unsigned int max_entries, - struct e820entry *entries) + struct e820_entry *entries) { unsigned int num_entries = 0; const struct hob_header *hdr; diff --git a/cmd/elf.c b/cmd/elf.c index 0717feb..824f88e 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -210,7 +210,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_X86 ulong base; struct e820_info *info; - struct e820entry *data; + struct e820_entry *data; #endif /* @@ -339,13 +339,13 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * if we don't specify it in the environment, use a default one. */ base = env_get_hex("vx_phys_mem_base", VXWORKS_PHYS_MEM_BASE); - data = (struct e820entry *)(base + E820_DATA_OFFSET); + data = (struct e820_entry *)(base + E820_DATA_OFFSET); info = (struct e820_info *)(base + E820_INFO_OFFSET); memset(info, 0, sizeof(struct e820_info)); info->sign = E820_SIGNATURE; info->entries = install_e820_map(E820MAX, data); - info->addr = (info->entries - 1) * sizeof(struct e820entry) + + info->addr = (info->entries - 1) * sizeof(struct e820_entry) + E820_DATA_OFFSET; /*
This changes 'struct e820entry' to 'struct e820_entry' to conform with the coding style. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v2: None arch/x86/cpu/coreboot/sdram.c | 2 +- arch/x86/cpu/qemu/e820.c | 2 +- arch/x86/cpu/tangier/sdram.c | 4 ++-- arch/x86/include/asm/bootparam.h | 2 +- arch/x86/include/asm/e820.h | 4 ++-- arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/e820.c | 2 +- arch/x86/lib/fsp/fsp_dram.c | 2 +- cmd/elf.c | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-)