pflash: Fixes and cleanups
Subsystems (2)
cover pflash: Fixes and cleanups
Alex Bennée posted this patch to address an XXX comment in pflash_cfi01_realize() the other day:
Subject: [PATCH v2] hw/block: report when pflash backing file isn't aligned
Message-Id: <[email protected]>
https://lists.nongnu.org/archive/html/qemu-devel/2019-02/msg04166.html
Review led me to look into its callers. Most of them are pleasantly
boring: they create flash memory of some fixed size at some fixed address. A few are more creative, and some of the creative ones look quite broken to me. Fix them, and clean up some along the way.
Markus Armbruster (10):
pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
pflash: Macro PFLASH_BUG() is used just once, expand
hw: Use CFI_PFLASH0{1,2} and TYPE_CFI_PFLASH0{1,2}
sam460ex: Don't size flash memory to match backing image
ppc405_boards: Don't size flash memory to match backing image
r2d: Flash memory creation is confused about size, mark FIXME
mips_malta: Clean up definition of flash memory size somewhat
pflash: Clean up after commit 368a354f02b part 1
pflash: Clean up after commit 368a354f02b part 2 hw/arm hw/xtensa: De-duplicate pflash creation code some
hw/arm/collie.c | 9 +- hw/arm/digic_boards.c | 3 +- hw/arm/gumstix.c | 8 +- hw/arm/mainstone.c | 4 +- hw/arm/musicpal.c | 8 +- hw/arm/omap_sx1.c | 8 +- hw/arm/versatilepb.c | 3 +- hw/arm/vexpress.c | 30 ++---- hw/arm/virt.c | 27 ++--- hw/arm/xilinx_zynq.c | 5 +- hw/arm/z2.c | 5 +- hw/block/pflash_cfi01.c | 120 ++++++++++++----------- hw/block/pflash_cfi02.c | 69 ++++++------- hw/i386/pc_sysfw.c | 10 +- hw/lm32/lm32_boards.c | 8 +- hw/lm32/milkymist.c | 4 +- hw/microblaze/petalogix_ml605_mmu.c | 5 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 +- hw/mips/mips_malta.c | 15 ++- hw/mips/mips_r4k.c | 4 +- hw/ppc/ppc405_boards.c | 59 ++++------- hw/ppc/sam460ex.c | 23 ++--- hw/ppc/virtex_ml507.c | 4 +- hw/sh4/r2d.c | 11 ++- hw/xtensa/xtfpga.c | 26 +++-- include/hw/block/flash.h | 65 +++++++----- 26 files changed, 258 insertions(+), 279 deletions(-)
Signature · 1 line
2.17.2
PATCH 1/10 pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
flash.h's incomplete struct pflash_t is completed both in pflash_cfi01.c and in pflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing a pflash_t created with pflash_cfi02_register() to pflash_cfi01_get_memory().
Furthermore, POSIX reserves typedef names ending with _t.
Rename the two structs to PFlashCFI01 and PFlashCFI02.
--- hw/arm/vexpress.c | 8 ++-- hw/block/pflash_cfi01.c | 87 +++++++++++++++++++++------------------- hw/block/pflash_cfi02.c | 67 ++++++++++++++++--------------- hw/i386/pc_sysfw.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/xtensa/xtfpga.c | 10 ++--- include/hw/block/flash.h | 53 ++++++++++++++---------- 7 files changed, 122 insertions(+), 107 deletions(-)
hw/arm/vexpress.c +4 -4
@@ -512,8 +512,8 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)/* Open code a private version of pflash registration since we * need to set non-default device width for VExpress platform. */ -static pflash_t *ve_pflash_cfi01_register (hwaddr base,const char *name, -DriveInfo *di) +static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name, +DriveInfo *di) {DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" );
@@ -536,7 +536,7 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (pflash_t, (dev),"cfi.pflash01" ); +return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); }static void vexpress_common_init (MachineState *machine)
@@ -548,7 +548,7 @@ static void vexpress_common_init(MachineState *machine)qemu_irq pic[64 ];uint32_t sys_id;DriveInfo *dinfo; -pflash_t *pflash0; +PFlashCFI01 *pflash0;I2CBus *i2c;ram_addr_t vram_size, sram_size;MemoryRegion *sysmem =get_system_memory ();
hw/block/pflash_cfi01.c +45 -42
216 lines not on this page · raw message
hw/block/pflash_cfi02.c +35 -32
134 lines not on this page · raw message
hw/i386/pc_sysfw.c +1 -1
@@ -111,7 +111,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)char *fatal_errmsg =NULL ;hwaddr phys_addr =0x100000000ULL ;int sector_bits, sector_size; -pflash_t *system_flash; +PFlashCFI01 *system_flash;MemoryRegion *flash_mem;char name[64 ];void *flash_ptr;
hw/mips/mips_malta.c +1 -1
@@ -1189,7 +1189,7 @@ void mips_malta_init(MachineState *machine)const char *kernel_cmdline = machine->kernel_cmdline;const char *initrd_filename = machine->initrd_filename;char *filename; -pflash_t *fl; +PFlashCFI01 *fl;MemoryRegion *system_memory =get_system_memory ();MemoryRegion *ram_high =g_new (MemoryRegion,1 );MemoryRegion *ram_low_preio =g_new (MemoryRegion,1 );
hw/xtensa/xtfpga.c +5 -5
@@ -162,9 +162,9 @@ static void xtfpga_net_init(MemoryRegion *address_space,memory_region_add_subregion (address_space, buffers, ram); } -static pflash_t *xtfpga_flash_init (MemoryRegion *address_space, -const XtfpgaBoardDesc *board, -DriveInfo *dinfo,int be) +static PFlashCFI01 *xtfpga_flash_init (MemoryRegion *address_space, +const XtfpgaBoardDesc *board, +DriveInfo *dinfo,int be) {SysBusDevice *s;DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" );
@@ -181,7 +181,7 @@ static pflash_t *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (pflash_t, (dev),"cfi.pflash01" ); +return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)
@@ -229,7 +229,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)XtensaMxPic *mx_pic =NULL ;qemu_irq *extints;DriveInfo *dinfo; -pflash_t *flash =NULL ; +PFlashCFI01 *flash =NULL ;QemuOpts *machine_opts =qemu_get_machine_opts ();const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" );const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" );
include/hw/block/flash.h +31 -22
63 lines not on this page · raw message
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
Quoted 3 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible.
O_o
Quoted 8 lines
This can hide type errors, such as passing a
pflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Rename the two structs to PFlashCFI01 and PFlashCFI02.
Signed-off-by Markus Armbruster <[email protected]>
Quoted 9 lines
--- hw/arm/vexpress.c | 8 ++-- hw/block/pflash_cfi01.c | 87 +++++++++++++++++++++------------------- hw/block/pflash_cfi02.c | 67 ++++++++++++++++--------------- hw/i386/pc_sysfw.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/xtensa/xtfpga.c | 10 ++--- include/hw/block/flash.h | 53 ++++++++++++++---------- 7 files changed, 122 insertions(+), 107 deletions(-)
I didn't check larger contexts in the modified files. I also didn't look for typos or try to verify the patch by recreating it from scratch, and by comparison. I read through the posted patch and it looks OK to me.
Thanks
Laszlo
Re: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
In reply to Markus ArmbrusterQuoted 8 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing apflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Rename the two structs to PFlashCFI01 and PFlashCFI02.
Why not ParallelFlashCFIxx?
Ideally ParallelFlashCFI would be an InterfaceInfo...
Quoted 562 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 8 ++-- hw/block/pflash_cfi01.c | 87 +++++++++++++++++++++------------------- hw/block/pflash_cfi02.c | 67 ++++++++++++++++--------------- hw/i386/pc_sysfw.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/xtensa/xtfpga.c | 10 ++--- include/hw/block/flash.h | 53 ++++++++++++++---------- 7 files changed, 122 insertions(+), 107 deletions(-)hw/arm/vexpress.c +4
-4@@ -512,8 +512,8 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)/* Open code a private version of pflash registration since we * need to set non-default device width for VExpress platform. */ -static pflash_t *ve_pflash_cfi01_register (hwaddr base,const char *name, -DriveInfo *di) +static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name, +DriveInfo *di) {DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" );@@ -536,7 +536,7 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (pflash_t, (dev),"cfi.pflash01" ); +return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); }static void vexpress_common_init (MachineState *machine)@@ -548,7 +548,7 @@ static void vexpress_common_init(MachineState *machine)qemu_irq pic[64 ];uint32_t sys_id;DriveInfo *dinfo; -pflash_t *pflash0; +PFlashCFI01 *pflash0;I2CBus *i2c;ram_addr_t vram_size, sram_size;MemoryRegion *sysmem =get_system_memory ();hw/block/pflash_cfi01.c +45
-42@@ -65,12 +65,13 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH01) +#define CFI_PFLASH01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)#define PFLASH_BE 0#define PFLASH_SECURE 1 -struct pflash_t { +struct PFlashCFI01 {/*< private >*/ SysBusDevice parent_obj;/*< public >*/ @@ -109,17 +110,17 @@ static const VMStateDescription vmstate_pflash = { .minimum_version_id = 1, .post_load = pflash_post_load, .fields = (VMStateField []) { -VMSTATE_UINT8 (wcycle, pflash_t), -VMSTATE_UINT8 (cmd, pflash_t), -VMSTATE_UINT8 (status, pflash_t), -VMSTATE_UINT64 (counter, pflash_t), +VMSTATE_UINT8 (wcycle, PFlashCFI01), +VMSTATE_UINT8 (cmd, PFlashCFI01), +VMSTATE_UINT8 (status, PFlashCFI01), +VMSTATE_UINT64 (counter, PFlashCFI01),VMSTATE_END_OF_LIST () } };static void pflash_timer (void *opaque) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;trace_pflash_timer_expired (pfl->cmd);/* Reset flash */ @@ -133,7 +134,7 @@ static void pflash_timer (void *opaque)* If this code is called we know we have a device_width set for * this flash. */ -static uint32_t pflash_cfi_query (pflash_t *pfl,hwaddr offset) +static uint32_t pflash_cfi_query (PFlashCFI01 *pfl,hwaddr offset) {int i;uint32_t resp =0 ;@@ -193,7 +194,7 @@ static uint32_t pflash_cfi_query(pflash_t *pfl, hwaddr offset)/* Perform a device id query based on the bank width of the flash. */ -static uint32_t pflash_devid_query (pflash_t *pfl,hwaddr offset) +static uint32_t pflash_devid_query (PFlashCFI01 *pfl,hwaddr offset) {int i;uint32_t resp;@@ -241,7 +242,7 @@ static uint32_t pflash_devid_query(pflash_t *pfl, hwaddr offset)return resp; } -static uint32_t pflash_data_read (pflash_t *pfl,hwaddr offset, +static uint32_t pflash_data_read (PFlashCFI01 *pfl,hwaddr offset,int width,int be) {uint8_t *p;@@ -284,7 +285,7 @@ static uint32_t pflash_data_read(pflash_t *pfl, hwaddr offset,return ret; } -static uint32_t pflash_read (pflash_t *pfl,hwaddr offset, +static uint32_t pflash_read (PFlashCFI01 *pfl,hwaddr offset,int width,int be) {hwaddr boff;@@ -398,7 +399,7 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset, }/* update flash content on disk */ -static void pflash_update (pflash_t *pfl,int offset, +static void pflash_update (PFlashCFI01 *pfl,int offset,int size) {int offset_end;@@ -412,7 +413,7 @@ static void pflash_update(pflash_t *pfl, int offset, } } -static inline void pflash_data_write (pflash_t *pfl,hwaddr offset, +static inline void pflash_data_write (PFlashCFI01 *pfl,hwaddr offset,uint32_t value,int width,int be) {uint8_t *p = pfl->storage;@@ -448,7 +449,7 @@ static inline void pflash_data_write(pflash_t *pfl, hwaddr offset, } -static void pflash_write (pflash_t *pfl,hwaddr offset, +static void pflash_write (PFlashCFI01 *pfl,hwaddr offset,uint32_t value,int width,int be) {uint8_t *p;@@ -654,7 +655,7 @@ static void pflash_write(pflash_t *pfl, hwaddr offset,static MemTxResult pflash_mem_read_with_attrs (void *opaque,hwaddr addr,uint64_t *value,unsigned len,MemTxAttrs attrs) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;bool be = !!(pfl->features & (1 <<PFLASH_BE ));if ((pfl->features & (1 <<PFLASH_SECURE )) && !attrs.secure) {@@ -668,7 +669,7 @@ static MemTxResult pflash_mem_read_with_attrs(void *opaque, hwaddr addr, uint64_static MemTxResult pflash_mem_write_with_attrs (void *opaque,hwaddr addr,uint64_t value,unsigned len,MemTxAttrs attrs) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;bool be = !!(pfl->features & (1 <<PFLASH_BE ));if ((pfl->features & (1 <<PFLASH_SECURE )) && !attrs.secure) {@@ -687,7 +688,7 @@ static const MemoryRegionOps pflash_cfi01_ops = {static void pflash_cfi01_realize (DeviceState *dev,Error **errp) { -pflash_t *pfl =CFI_PFLASH01 (dev); +PFlashCFI01 *pfl =CFI_PFLASH01 (dev);uint64_t total_len;int ret;uint64_t blocks_per_device, sector_len_per_device, device_len;@@ -864,14 +865,14 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) }static Property pflash_cfi01_properties[] = { - DEFINE_PROP_DRIVE("drive", struct pflash_t, blk), +DEFINE_PROP_DRIVE ("drive" , PFlashCFI01, blk),/* num-blocks is the number of blocks actually visible to the guest, * ie the total size of the device divided by the sector length. * If we're emulating flash devices wired in parallel the actual * number of blocks per indvidual device will differ. */ - DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0), - DEFINE_PROP_UINT64("sector-length", struct pflash_t, sector_len, 0), +DEFINE_PROP_UINT32 ("num-blocks" , PFlashCFI01, nb_blocs,0 ), +DEFINE_PROP_UINT64 ("sector-length" , PFlashCFI01, sector_len,0 ),/* width here is the overall width of this QEMU device in bytes. * The QEMU device may be emulating a number of flash devices * wired up in parallel; the width of each individual flash @@ -888,17 +889,17 @@ static Property pflash_cfi01_properties[] = {* 16 bit devices making up a 32 bit wide QEMU device. This * is deprecated for new uses of this device. */ - DEFINE_PROP_UINT8("width", struct pflash_t, bank_width, 0), - DEFINE_PROP_UINT8("device-width", struct pflash_t, device_width, 0), - DEFINE_PROP_UINT8("max-device-width", struct pflash_t, max_device_width, 0), - DEFINE_PROP_BIT("big-endian", struct pflash_t, features, PFLASH_BE, 0), - DEFINE_PROP_BIT("secure", struct pflash_t, features, PFLASH_SECURE, 0), - DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0), - DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0), - DEFINE_PROP_UINT16("id2", struct pflash_t, ident2, 0), - DEFINE_PROP_UINT16("id3", struct pflash_t, ident3, 0), - DEFINE_PROP_STRING("name", struct pflash_t, name), - DEFINE_PROP_BOOL("old-multiple-chip-handling", struct pflash_t, +DEFINE_PROP_UINT8 ("width" , PFlashCFI01, bank_width,0 ), +DEFINE_PROP_UINT8 ("device-width" , PFlashCFI01, device_width,0 ), +DEFINE_PROP_UINT8 ("max-device-width" , PFlashCFI01, max_device_width,0 ), +DEFINE_PROP_BIT ("big-endian" , PFlashCFI01, features,PFLASH_BE ,0 ), +DEFINE_PROP_BIT ("secure" , PFlashCFI01, features,PFLASH_SECURE ,0 ), +DEFINE_PROP_UINT16 ("id0" , PFlashCFI01, ident0,0 ), +DEFINE_PROP_UINT16 ("id1" , PFlashCFI01, ident1,0 ), +DEFINE_PROP_UINT16 ("id2" , PFlashCFI01, ident2,0 ), +DEFINE_PROP_UINT16 ("id3" , PFlashCFI01, ident3,0 ), +DEFINE_PROP_STRING ("name" , PFlashCFI01, name), +DEFINE_PROP_BOOL ("old-multiple-chip-handling" , PFlashCFI01, old_multiple_chip_handling, false), DEFINE_PROP_END_OF_LIST(), };@@ -917,7 +918,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)static const TypeInfo pflash_cfi01_info = { .name =TYPE_CFI_PFLASH01 , .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (struct pflash_t ), + .instance_size =sizeof (PFlashCFI01), .class_init = pflash_cfi01_class_init, };@@ -928,13 +929,15 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) -pflash_t *pflash_cfi01_register(hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk, -uint32_t sector_len,int nb_blocs, -int bank_width,uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3,int be) +PFlashCFI01 *pflash_cfi01_register(hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int bank_width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be) {DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );@@ -956,14 +959,14 @@ pflash_t *pflash_cfi01_register(hwaddr base,return CFI_PFLASH01 (dev); } -MemoryRegion *pflash_cfi01_get_memory (pflash_t *fl) +MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl) {return &fl->mem; }static void postload_update_cb (void *opaque,int running,RunState state) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;/* This is called after bdrv_invalidate_cache_all. */ qemu_del_vm_change_state_handler (pfl->vmstate);@@ -975,7 +978,7 @@ static void postload_update_cb(void *opaque, int running, RunState state)static int pflash_post_load (void *opaque,int version_id) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;if (!pfl->ro) { pfl->vmstate = qemu_add_vm_change_state_handler(postload_update_cb,hw/block/pflash_cfi02.c +35
-32@@ -57,9 +57,10 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH02) +#define CFI_PFLASH02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) -struct pflash_t { +struct PFlashCFI02 {/*< private >*/ SysBusDevice parent_obj;/*< public >*/ @@ -101,7 +102,7 @@ struct pflash_t {/* * Set up replicated mappings of the same region. */ -static void pflash_setup_mappings (pflash_t *pfl) +static void pflash_setup_mappings (PFlashCFI02 *pfl) {unsigned i;hwaddr size =memory_region_size (&pfl->orig_mem);@@ -115,7 +116,7 @@ static void pflash_setup_mappings(pflash_t *pfl) } } -static void pflash_register_memory (pflash_t *pfl,int rom_mode) +static void pflash_register_memory (PFlashCFI02 *pfl,int rom_mode) {memory_region_rom_device_set_romd (&pfl->orig_mem, rom_mode); pfl->rom_mode = rom_mode;@@ -123,7 +124,7 @@ static void pflash_register_memory(pflash_t *pfl, int rom_mode)static void pflash_timer (void *opaque) { -pflash_t *pfl = opaque; +PFlashCFI02 *pfl = opaque;trace_pflash_timer_expired (pfl->cmd);/* Reset flash */ @@ -137,7 +138,7 @@ static void pflash_timer (void *opaque) pfl->cmd =0 ; } -static uint32_t pflash_read (pflash_t *pfl,hwaddr offset, +static uint32_t pflash_read (PFlashCFI02 *pfl,hwaddr offset,int width,int be) {hwaddr boff;@@ -246,7 +247,7 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset, }/* update flash content on disk */ -static void pflash_update (pflash_t *pfl,int offset, +static void pflash_update (PFlashCFI02 *pfl,int offset,int size) {int offset_end;@@ -260,7 +261,7 @@ static void pflash_update(pflash_t *pfl, int offset, } } -static void pflash_write (pflash_t *pfl,hwaddr offset, +static void pflash_write (PFlashCFI02 *pfl,hwaddr offset,uint32_t value,int width,int be) {hwaddr boff;@@ -533,7 +534,7 @@ static const MemoryRegionOps pflash_cfi02_ops_le = {static void pflash_cfi02_realize (DeviceState *dev,Error **errp) { -pflash_t *pfl =CFI_PFLASH02 (dev); +PFlashCFI02 *pfl =CFI_PFLASH02 (dev);uint32_t chip_len;int ret;Error *local_err =NULL ;@@ -679,19 +680,19 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) }static Property pflash_cfi02_properties[] = { - DEFINE_PROP_DRIVE("drive", struct pflash_t, blk), - DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0), - DEFINE_PROP_UINT32("sector-length", struct pflash_t, sector_len, 0), - DEFINE_PROP_UINT8("width", struct pflash_t, width, 0), - DEFINE_PROP_UINT8("mappings", struct pflash_t, mappings, 0), - DEFINE_PROP_UINT8("big-endian", struct pflash_t, be, 0), - DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0), - DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0), - DEFINE_PROP_UINT16("id2", struct pflash_t, ident2, 0), - DEFINE_PROP_UINT16("id3", struct pflash_t, ident3, 0), - DEFINE_PROP_UINT16("unlock-addr0", struct pflash_t, unlock_addr0, 0), - DEFINE_PROP_UINT16("unlock-addr1", struct pflash_t, unlock_addr1, 0), - DEFINE_PROP_STRING("name", struct pflash_t, name), +DEFINE_PROP_DRIVE ("drive" , PFlashCFI02, blk), +DEFINE_PROP_UINT32 ("num-blocks" , PFlashCFI02, nb_blocs,0 ), +DEFINE_PROP_UINT32 ("sector-length" , PFlashCFI02, sector_len,0 ), +DEFINE_PROP_UINT8 ("width" , PFlashCFI02, width,0 ), +DEFINE_PROP_UINT8 ("mappings" , PFlashCFI02, mappings,0 ), +DEFINE_PROP_UINT8 ("big-endian" , PFlashCFI02, be,0 ), +DEFINE_PROP_UINT16 ("id0" , PFlashCFI02, ident0,0 ), +DEFINE_PROP_UINT16 ("id1" , PFlashCFI02, ident1,0 ), +DEFINE_PROP_UINT16 ("id2" , PFlashCFI02, ident2,0 ), +DEFINE_PROP_UINT16 ("id3" , PFlashCFI02, ident3,0 ), +DEFINE_PROP_UINT16 ("unlock-addr0" , PFlashCFI02, unlock_addr0,0 ), +DEFINE_PROP_UINT16 ("unlock-addr1" , PFlashCFI02, unlock_addr1,0 ), +DEFINE_PROP_STRING ("name" , PFlashCFI02, name),DEFINE_PROP_END_OF_LIST (), };@@ -707,7 +708,7 @@ static void pflash_cfi02_class_init(ObjectClass *klass, void *data)static const TypeInfo pflash_cfi02_info = { .name =TYPE_CFI_PFLASH02 , .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (struct pflash_t ), + .instance_size =sizeof (PFlashCFI02), .class_init = pflash_cfi02_class_init, };@@ -718,15 +719,17 @@ static void pflash_cfi02_register_types(void)type_init (pflash_cfi02_register_types) -pflash_t *pflash_cfi02_register(hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk,uint32_t sector_len, -int nb_blocs,int nb_mappings,int width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3, -uint16_t unlock_addr0,uint16_t unlock_addr1, -int be) +PFlashCFI02 *pflash_cfi02_register(hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int nb_mappings,int width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +uint16_t unlock_addr0, +uint16_t unlock_addr1, +int be) {DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH02 );hw/i386/pc_sysfw.c +1
-1@@ -111,7 +111,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)char *fatal_errmsg =NULL ;hwaddr phys_addr =0x100000000ULL ;int sector_bits, sector_size; -pflash_t *system_flash; +PFlashCFI01 *system_flash;MemoryRegion *flash_mem;char name[64 ];void *flash_ptr;hw/mips/mips_malta.c +1
-1@@ -1189,7 +1189,7 @@ void mips_malta_init(MachineState *machine)const char *kernel_cmdline = machine->kernel_cmdline;const char *initrd_filename = machine->initrd_filename;char *filename; -pflash_t *fl; +PFlashCFI01 *fl;MemoryRegion *system_memory =get_system_memory ();MemoryRegion *ram_high =g_new (MemoryRegion,1 );MemoryRegion *ram_low_preio =g_new (MemoryRegion,1 );hw/xtensa/xtfpga.c +5
-5@@ -162,9 +162,9 @@ static void xtfpga_net_init(MemoryRegion *address_space,memory_region_add_subregion (address_space, buffers, ram); } -static pflash_t *xtfpga_flash_init (MemoryRegion *address_space, -const XtfpgaBoardDesc *board, -DriveInfo *dinfo,int be) +static PFlashCFI01 *xtfpga_flash_init (MemoryRegion *address_space, +const XtfpgaBoardDesc *board, +DriveInfo *dinfo,int be) {SysBusDevice *s;DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" );@@ -181,7 +181,7 @@ static pflash_t *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (pflash_t, (dev),"cfi.pflash01" ); +return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)@@ -229,7 +229,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)XtensaMxPic *mx_pic =NULL ;qemu_irq *extints;DriveInfo *dinfo; -pflash_t *flash =NULL ; +PFlashCFI01 *flash =NULL ;QemuOpts *machine_opts =qemu_get_machine_opts ();const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" );const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" );include/hw/block/flash.h +31
-22@@ -5,32 +5,41 @@#include "exec/memory.h" -#define TYPE_CFI_PFLASH01 "cfi.pflash01" -#define TYPE_CFI_PFLASH02 "cfi.pflash02" - -typedef struct pflash_t pflash_t ; -/* pflash_cfi01.c */ -pflash_t *pflash_cfi01_register (hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk, -uint32_t sector_len,int nb_blocs,int width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3,int be); + +#define TYPE_CFI_PFLASH01 "cfi.pflash01" + +typedef struct PFlashCFI01 PFlashCFI01 ; + +PFlashCFI01 *pflash_cfi01_register (hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be); +MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl);/* pflash_cfi02.c */ -pflash_t *pflash_cfi02_register (hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk,uint32_t sector_len, -int nb_blocs,int nb_mappings,int width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3, -uint16_t unlock_addr0,uint16_t unlock_addr1, -int be); -MemoryRegion *pflash_cfi01_get_memory (pflash_t *fl); +#define TYPE_CFI_PFLASH02 "cfi.pflash02" + +typedef struct PFlashCFI02 PFlashCFI02 ; + +PFlashCFI02 *pflash_cfi02_register (hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int nb_mappings, +int width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +uint16_t unlock_addr0, +uint16_t unlock_addr1, +int be);/* nand.c */ DeviceState *nand_init (BlockBackend *blk,int manf_id,int chip_id);
Re: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
Quoted 11 lines · Philippe Mathieu-Daudé
Quoted 8 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing apflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Rename the two structs to PFlashCFI01 and PFlashCFI02.
Why not ParallelFlashCFIxx?
Feels a bit long, and we abbreviate to pflash pretty consistently. That said, I'm not particularly enamored with my choice of name :)
Quoted 1 line
Ideally ParallelFlashCFI would be an InterfaceInfo...
You mean TYPE_CFI_PFLASH0{1,2} should be children of an abstract parent?
Re: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
Quoted 9 lines · Markus Armbruster
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing apflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Worth adding in CODING_STYLE 'Naming' section :)
Quoted 11 lines
Quoted 4 lines
Quoted 2 lines
Rename the two structs to PFlashCFI01 and PFlashCFI02.
Why not ParallelFlashCFIxx?
Feels a bit long, and we abbreviate to pflash pretty consistently. That said, I'm not particularly enamored with my choice of name :)
Quoted 1 line
Ideally ParallelFlashCFI would be an InterfaceInfo...
You mean TYPE_CFI_PFLASH0{1,2} should be children of an abstract parent?
I'd use "TYPE_PFLASH_CFI0[12]".
---
The "Common Flash memory Interface" as stated is definitively an interface :)
QEMU models the 2 most famous industry implementations:
- vendor 0x01: Intel (and Sharp)
- vendor 0x02: AMD (and Fujistu)
---
My first refactor attempt was to have both implementations inheritate from an abstract parent, but since the migration structures are different, it looked easier to me to extract an InterfaceInfo.
Quoted 1 line
From here my idea was to add an NorFlash abstract parent where to share
the block devices and some of the reset:
+-------------------+
| |
| NOR Flash |
| |
+-------------------+
| Parent |
| |
| |
+------------v---+ +---v------------+
| | | |
| PFlash01 | | PFlash02 |
| | | |
+----------------+ +----------------+
Child | |
| |
| Implements|
+---v-----------v---+
| |
| CFI Flash |
| |
+-------------------+But since there is no consumer of the CFI InterfaceInfo, we can simply go the way you suggested:
+-------------------+
| |
| CFI NOR Flash |
| |
+-------------------+
| Parent |
| |
+------------v---+ +---v------------+
| | | |
| PFlash01 | | PFlash02 |
| | | |
+----------------+ +----------------+
Child ChildRe: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
Quoted 18 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Markus Armbruster
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing apflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Worth adding in
CODING_STYLE'Naming' section :)Quoted 5 lines
Quoted 4 lines
Quoted 2 lines
Rename the two structs to PFlashCFI01 and PFlashCFI02.
Why not ParallelFlashCFIxx?
Quoted 8 lines
Quoted 6 lines
Feels a bit long, and we abbreviate to pflash pretty consistently. That said, I'm not particularly enamored with my choice of name :)
Quoted 1 line
Ideally ParallelFlashCFI would be an InterfaceInfo...
You mean TYPE_CFI_PFLASH0{1,2} should be children of an abstract parent?
I'd use "TYPE_PFLASH_CFI0[12]".
That's a separate renaming patch. It could go right before PATCH 03. Worthwhile?
[...]
Re: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
Quoted 23 lines · Markus Armbruster
Quoted 21 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Markus Armbruster
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing apflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Worth adding in
CODING_STYLE'Naming' section :)Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Rename the two structs to PFlashCFI01 and PFlashCFI02.
Why not ParallelFlashCFIxx?
Feels a bit long, and we abbreviate to pflash pretty consistently. That said, I'm not particularly enamored with my choice of name :)
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Ideally ParallelFlashCFI would be an InterfaceInfo...
You mean TYPE_CFI_PFLASH0{1,2} should be children of an abstract parent?
I'd use "TYPE_PFLASH_CFI0[12]".
That's a separate renaming patch. It could go right before PATCH 03. Worthwhile?
Definitively not the more important issue with this device =)
Re: [Qemu-devel] [PATCH 01/10] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
In reply to Markus ArmbrusterQuoted 8 lines · Markus Armbruster
flash.h's incomplete struct
pflash_tis completed both inpflash_cfi01.cand inpflash_cfi02.c. The complete types are incompatible. This can hide type errors, such as passing apflash_tcreated withpflash_cfi02_register()topflash_cfi01_get_memory().Furthermore, POSIX reserves typedef names ending with _t.
Rename the two structs to PFlashCFI01 and PFlashCFI02.
modulo whatever name you eventually settle on:
Quoted 551 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 8 ++-- hw/block/pflash_cfi01.c | 87 +++++++++++++++++++++------------------- hw/block/pflash_cfi02.c | 67 ++++++++++++++++--------------- hw/i386/pc_sysfw.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/xtensa/xtfpga.c | 10 ++--- include/hw/block/flash.h | 53 ++++++++++++++---------- 7 files changed, 122 insertions(+), 107 deletions(-)hw/arm/vexpress.c +4
-4@@ -512,8 +512,8 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)/* Open code a private version of pflash registration since we * need to set non-default device width for VExpress platform. */ -static pflash_t *ve_pflash_cfi01_register (hwaddr base,const char *name, -DriveInfo *di) +static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name, +DriveInfo *di) {DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" );@@ -536,7 +536,7 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (pflash_t, (dev),"cfi.pflash01" ); +return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); }static void vexpress_common_init (MachineState *machine)@@ -548,7 +548,7 @@ static void vexpress_common_init(MachineState *machine)qemu_irq pic[64 ];uint32_t sys_id;DriveInfo *dinfo; -pflash_t *pflash0; +PFlashCFI01 *pflash0;I2CBus *i2c;ram_addr_t vram_size, sram_size;MemoryRegion *sysmem =get_system_memory ();hw/block/pflash_cfi01.c +45
-42@@ -65,12 +65,13 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH01) +#define CFI_PFLASH01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)#define PFLASH_BE 0#define PFLASH_SECURE 1 -struct pflash_t { +struct PFlashCFI01 {/*< private >*/ SysBusDevice parent_obj;/*< public >*/ @@ -109,17 +110,17 @@ static const VMStateDescription vmstate_pflash = { .minimum_version_id = 1, .post_load = pflash_post_load, .fields = (VMStateField []) { -VMSTATE_UINT8 (wcycle, pflash_t), -VMSTATE_UINT8 (cmd, pflash_t), -VMSTATE_UINT8 (status, pflash_t), -VMSTATE_UINT64 (counter, pflash_t), +VMSTATE_UINT8 (wcycle, PFlashCFI01), +VMSTATE_UINT8 (cmd, PFlashCFI01), +VMSTATE_UINT8 (status, PFlashCFI01), +VMSTATE_UINT64 (counter, PFlashCFI01),VMSTATE_END_OF_LIST () } };static void pflash_timer (void *opaque) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;trace_pflash_timer_expired (pfl->cmd);/* Reset flash */ @@ -133,7 +134,7 @@ static void pflash_timer (void *opaque)* If this code is called we know we have a device_width set for * this flash. */ -static uint32_t pflash_cfi_query (pflash_t *pfl,hwaddr offset) +static uint32_t pflash_cfi_query (PFlashCFI01 *pfl,hwaddr offset) {int i;uint32_t resp =0 ;@@ -193,7 +194,7 @@ static uint32_t pflash_cfi_query(pflash_t *pfl, hwaddr offset)/* Perform a device id query based on the bank width of the flash. */ -static uint32_t pflash_devid_query (pflash_t *pfl,hwaddr offset) +static uint32_t pflash_devid_query (PFlashCFI01 *pfl,hwaddr offset) {int i;uint32_t resp;@@ -241,7 +242,7 @@ static uint32_t pflash_devid_query(pflash_t *pfl, hwaddr offset)return resp; } -static uint32_t pflash_data_read (pflash_t *pfl,hwaddr offset, +static uint32_t pflash_data_read (PFlashCFI01 *pfl,hwaddr offset,int width,int be) {uint8_t *p;@@ -284,7 +285,7 @@ static uint32_t pflash_data_read(pflash_t *pfl, hwaddr offset,return ret; } -static uint32_t pflash_read (pflash_t *pfl,hwaddr offset, +static uint32_t pflash_read (PFlashCFI01 *pfl,hwaddr offset,int width,int be) {hwaddr boff;@@ -398,7 +399,7 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset, }/* update flash content on disk */ -static void pflash_update (pflash_t *pfl,int offset, +static void pflash_update (PFlashCFI01 *pfl,int offset,int size) {int offset_end;@@ -412,7 +413,7 @@ static void pflash_update(pflash_t *pfl, int offset, } } -static inline void pflash_data_write (pflash_t *pfl,hwaddr offset, +static inline void pflash_data_write (PFlashCFI01 *pfl,hwaddr offset,uint32_t value,int width,int be) {uint8_t *p = pfl->storage;@@ -448,7 +449,7 @@ static inline void pflash_data_write(pflash_t *pfl, hwaddr offset, } -static void pflash_write (pflash_t *pfl,hwaddr offset, +static void pflash_write (PFlashCFI01 *pfl,hwaddr offset,uint32_t value,int width,int be) {uint8_t *p;@@ -654,7 +655,7 @@ static void pflash_write(pflash_t *pfl, hwaddr offset,static MemTxResult pflash_mem_read_with_attrs (void *opaque,hwaddr addr,uint64_t *value,unsigned len,MemTxAttrs attrs) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;bool be = !!(pfl->features & (1 <<PFLASH_BE ));if ((pfl->features & (1 <<PFLASH_SECURE )) && !attrs.secure) {@@ -668,7 +669,7 @@ static MemTxResult pflash_mem_read_with_attrs(void *opaque, hwaddr addr, uint64_static MemTxResult pflash_mem_write_with_attrs (void *opaque,hwaddr addr,uint64_t value,unsigned len,MemTxAttrs attrs) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;bool be = !!(pfl->features & (1 <<PFLASH_BE ));if ((pfl->features & (1 <<PFLASH_SECURE )) && !attrs.secure) {@@ -687,7 +688,7 @@ static const MemoryRegionOps pflash_cfi01_ops = {static void pflash_cfi01_realize (DeviceState *dev,Error **errp) { -pflash_t *pfl =CFI_PFLASH01 (dev); +PFlashCFI01 *pfl =CFI_PFLASH01 (dev);uint64_t total_len;int ret;uint64_t blocks_per_device, sector_len_per_device, device_len;@@ -864,14 +865,14 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) }static Property pflash_cfi01_properties[] = { - DEFINE_PROP_DRIVE("drive", struct pflash_t, blk), +DEFINE_PROP_DRIVE ("drive" , PFlashCFI01, blk),/* num-blocks is the number of blocks actually visible to the guest, * ie the total size of the device divided by the sector length. * If we're emulating flash devices wired in parallel the actual * number of blocks per indvidual device will differ. */ - DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0), - DEFINE_PROP_UINT64("sector-length", struct pflash_t, sector_len, 0), +DEFINE_PROP_UINT32 ("num-blocks" , PFlashCFI01, nb_blocs,0 ), +DEFINE_PROP_UINT64 ("sector-length" , PFlashCFI01, sector_len,0 ),/* width here is the overall width of this QEMU device in bytes. * The QEMU device may be emulating a number of flash devices * wired up in parallel; the width of each individual flash @@ -888,17 +889,17 @@ static Property pflash_cfi01_properties[] = {* 16 bit devices making up a 32 bit wide QEMU device. This * is deprecated for new uses of this device. */ - DEFINE_PROP_UINT8("width", struct pflash_t, bank_width, 0), - DEFINE_PROP_UINT8("device-width", struct pflash_t, device_width, 0), - DEFINE_PROP_UINT8("max-device-width", struct pflash_t, max_device_width, 0), - DEFINE_PROP_BIT("big-endian", struct pflash_t, features, PFLASH_BE, 0), - DEFINE_PROP_BIT("secure", struct pflash_t, features, PFLASH_SECURE, 0), - DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0), - DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0), - DEFINE_PROP_UINT16("id2", struct pflash_t, ident2, 0), - DEFINE_PROP_UINT16("id3", struct pflash_t, ident3, 0), - DEFINE_PROP_STRING("name", struct pflash_t, name), - DEFINE_PROP_BOOL("old-multiple-chip-handling", struct pflash_t, +DEFINE_PROP_UINT8 ("width" , PFlashCFI01, bank_width,0 ), +DEFINE_PROP_UINT8 ("device-width" , PFlashCFI01, device_width,0 ), +DEFINE_PROP_UINT8 ("max-device-width" , PFlashCFI01, max_device_width,0 ), +DEFINE_PROP_BIT ("big-endian" , PFlashCFI01, features,PFLASH_BE ,0 ), +DEFINE_PROP_BIT ("secure" , PFlashCFI01, features,PFLASH_SECURE ,0 ), +DEFINE_PROP_UINT16 ("id0" , PFlashCFI01, ident0,0 ), +DEFINE_PROP_UINT16 ("id1" , PFlashCFI01, ident1,0 ), +DEFINE_PROP_UINT16 ("id2" , PFlashCFI01, ident2,0 ), +DEFINE_PROP_UINT16 ("id3" , PFlashCFI01, ident3,0 ), +DEFINE_PROP_STRING ("name" , PFlashCFI01, name), +DEFINE_PROP_BOOL ("old-multiple-chip-handling" , PFlashCFI01, old_multiple_chip_handling, false), DEFINE_PROP_END_OF_LIST(), };@@ -917,7 +918,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)static const TypeInfo pflash_cfi01_info = { .name =TYPE_CFI_PFLASH01 , .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (struct pflash_t ), + .instance_size =sizeof (PFlashCFI01), .class_init = pflash_cfi01_class_init, };@@ -928,13 +929,15 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) -pflash_t *pflash_cfi01_register(hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk, -uint32_t sector_len,int nb_blocs, -int bank_width,uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3,int be) +PFlashCFI01 *pflash_cfi01_register(hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int bank_width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be) {DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );@@ -956,14 +959,14 @@ pflash_t *pflash_cfi01_register(hwaddr base,return CFI_PFLASH01 (dev); } -MemoryRegion *pflash_cfi01_get_memory (pflash_t *fl) +MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl) {return &fl->mem; }static void postload_update_cb (void *opaque,int running,RunState state) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;/* This is called after bdrv_invalidate_cache_all. */ qemu_del_vm_change_state_handler (pfl->vmstate);@@ -975,7 +978,7 @@ static void postload_update_cb(void *opaque, int running, RunState state)static int pflash_post_load (void *opaque,int version_id) { -pflash_t *pfl = opaque; +PFlashCFI01 *pfl = opaque;if (!pfl->ro) { pfl->vmstate = qemu_add_vm_change_state_handler(postload_update_cb,hw/block/pflash_cfi02.c +35
-32@@ -57,9 +57,10 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH02) +#define CFI_PFLASH02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) -struct pflash_t { +struct PFlashCFI02 {/*< private >*/ SysBusDevice parent_obj;/*< public >*/ @@ -101,7 +102,7 @@ struct pflash_t {/* * Set up replicated mappings of the same region. */ -static void pflash_setup_mappings (pflash_t *pfl) +static void pflash_setup_mappings (PFlashCFI02 *pfl) {unsigned i;hwaddr size =memory_region_size (&pfl->orig_mem);@@ -115,7 +116,7 @@ static void pflash_setup_mappings(pflash_t *pfl) } } -static void pflash_register_memory (pflash_t *pfl,int rom_mode) +static void pflash_register_memory (PFlashCFI02 *pfl,int rom_mode) {memory_region_rom_device_set_romd (&pfl->orig_mem, rom_mode); pfl->rom_mode = rom_mode;@@ -123,7 +124,7 @@ static void pflash_register_memory(pflash_t *pfl, int rom_mode)static void pflash_timer (void *opaque) { -pflash_t *pfl = opaque; +PFlashCFI02 *pfl = opaque;trace_pflash_timer_expired (pfl->cmd);/* Reset flash */ @@ -137,7 +138,7 @@ static void pflash_timer (void *opaque) pfl->cmd =0 ; } -static uint32_t pflash_read (pflash_t *pfl,hwaddr offset, +static uint32_t pflash_read (PFlashCFI02 *pfl,hwaddr offset,int width,int be) {hwaddr boff;@@ -246,7 +247,7 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset, }/* update flash content on disk */ -static void pflash_update (pflash_t *pfl,int offset, +static void pflash_update (PFlashCFI02 *pfl,int offset,int size) {int offset_end;@@ -260,7 +261,7 @@ static void pflash_update(pflash_t *pfl, int offset, } } -static void pflash_write (pflash_t *pfl,hwaddr offset, +static void pflash_write (PFlashCFI02 *pfl,hwaddr offset,uint32_t value,int width,int be) {hwaddr boff;@@ -533,7 +534,7 @@ static const MemoryRegionOps pflash_cfi02_ops_le = {static void pflash_cfi02_realize (DeviceState *dev,Error **errp) { -pflash_t *pfl =CFI_PFLASH02 (dev); +PFlashCFI02 *pfl =CFI_PFLASH02 (dev);uint32_t chip_len;int ret;Error *local_err =NULL ;@@ -679,19 +680,19 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) }static Property pflash_cfi02_properties[] = { - DEFINE_PROP_DRIVE("drive", struct pflash_t, blk), - DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0), - DEFINE_PROP_UINT32("sector-length", struct pflash_t, sector_len, 0), - DEFINE_PROP_UINT8("width", struct pflash_t, width, 0), - DEFINE_PROP_UINT8("mappings", struct pflash_t, mappings, 0), - DEFINE_PROP_UINT8("big-endian", struct pflash_t, be, 0), - DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0), - DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0), - DEFINE_PROP_UINT16("id2", struct pflash_t, ident2, 0), - DEFINE_PROP_UINT16("id3", struct pflash_t, ident3, 0), - DEFINE_PROP_UINT16("unlock-addr0", struct pflash_t, unlock_addr0, 0), - DEFINE_PROP_UINT16("unlock-addr1", struct pflash_t, unlock_addr1, 0), - DEFINE_PROP_STRING("name", struct pflash_t, name), +DEFINE_PROP_DRIVE ("drive" , PFlashCFI02, blk), +DEFINE_PROP_UINT32 ("num-blocks" , PFlashCFI02, nb_blocs,0 ), +DEFINE_PROP_UINT32 ("sector-length" , PFlashCFI02, sector_len,0 ), +DEFINE_PROP_UINT8 ("width" , PFlashCFI02, width,0 ), +DEFINE_PROP_UINT8 ("mappings" , PFlashCFI02, mappings,0 ), +DEFINE_PROP_UINT8 ("big-endian" , PFlashCFI02, be,0 ), +DEFINE_PROP_UINT16 ("id0" , PFlashCFI02, ident0,0 ), +DEFINE_PROP_UINT16 ("id1" , PFlashCFI02, ident1,0 ), +DEFINE_PROP_UINT16 ("id2" , PFlashCFI02, ident2,0 ), +DEFINE_PROP_UINT16 ("id3" , PFlashCFI02, ident3,0 ), +DEFINE_PROP_UINT16 ("unlock-addr0" , PFlashCFI02, unlock_addr0,0 ), +DEFINE_PROP_UINT16 ("unlock-addr1" , PFlashCFI02, unlock_addr1,0 ), +DEFINE_PROP_STRING ("name" , PFlashCFI02, name),DEFINE_PROP_END_OF_LIST (), };@@ -707,7 +708,7 @@ static void pflash_cfi02_class_init(ObjectClass *klass, void *data)static const TypeInfo pflash_cfi02_info = { .name =TYPE_CFI_PFLASH02 , .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (struct pflash_t ), + .instance_size =sizeof (PFlashCFI02), .class_init = pflash_cfi02_class_init, };@@ -718,15 +719,17 @@ static void pflash_cfi02_register_types(void)type_init (pflash_cfi02_register_types) -pflash_t *pflash_cfi02_register(hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk,uint32_t sector_len, -int nb_blocs,int nb_mappings,int width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3, -uint16_t unlock_addr0,uint16_t unlock_addr1, -int be) +PFlashCFI02 *pflash_cfi02_register(hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int nb_mappings,int width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +uint16_t unlock_addr0, +uint16_t unlock_addr1, +int be) {DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH02 );hw/i386/pc_sysfw.c +1
-1@@ -111,7 +111,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)char *fatal_errmsg =NULL ;hwaddr phys_addr =0x100000000ULL ;int sector_bits, sector_size; -pflash_t *system_flash; +PFlashCFI01 *system_flash;MemoryRegion *flash_mem;char name[64 ];void *flash_ptr;hw/mips/mips_malta.c +1
-1@@ -1189,7 +1189,7 @@ void mips_malta_init(MachineState *machine)const char *kernel_cmdline = machine->kernel_cmdline;const char *initrd_filename = machine->initrd_filename;char *filename; -pflash_t *fl; +PFlashCFI01 *fl;MemoryRegion *system_memory =get_system_memory ();MemoryRegion *ram_high =g_new (MemoryRegion,1 );MemoryRegion *ram_low_preio =g_new (MemoryRegion,1 );hw/xtensa/xtfpga.c +5
-5@@ -162,9 +162,9 @@ static void xtfpga_net_init(MemoryRegion *address_space,memory_region_add_subregion (address_space, buffers, ram); } -static pflash_t *xtfpga_flash_init (MemoryRegion *address_space, -const XtfpgaBoardDesc *board, -DriveInfo *dinfo,int be) +static PFlashCFI01 *xtfpga_flash_init (MemoryRegion *address_space, +const XtfpgaBoardDesc *board, +DriveInfo *dinfo,int be) {SysBusDevice *s;DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" );@@ -181,7 +181,7 @@ static pflash_t *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (pflash_t, (dev),"cfi.pflash01" ); +return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)@@ -229,7 +229,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)XtensaMxPic *mx_pic =NULL ;qemu_irq *extints;DriveInfo *dinfo; -pflash_t *flash =NULL ; +PFlashCFI01 *flash =NULL ;QemuOpts *machine_opts =qemu_get_machine_opts ();const char *kernel_filename =qemu_opt_get (machine_opts,"kernel" );const char *kernel_cmdline =qemu_opt_get (machine_opts,"append" );include/hw/block/flash.h +24
-22@@ -5,32 +5,41 @@#include "exec/memory.h" -#define TYPE_CFI_PFLASH01 "cfi.pflash01" -#define TYPE_CFI_PFLASH02 "cfi.pflash02" - -typedef struct pflash_t pflash_t ; -/* pflash_cfi01.c */ -pflash_t *pflash_cfi01_register (hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk, -uint32_t sector_len,int nb_blocs,int width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3,int be); + +#define TYPE_CFI_PFLASH01 "cfi.pflash01" + +typedef struct PFlashCFI01 PFlashCFI01 ; + +PFlashCFI01 *pflash_cfi01_register (hwaddr base, +DeviceState *qdev,const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len,int nb_blocs, +int width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be); +MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl);/* pflash_cfi02.c */ -pflash_t *pflash_cfi02_register (hwaddr base, -DeviceState *qdev,const char *name, -hwaddr size, -BlockBackend *blk,uint32_t sector_len, -int nb_blocs,int nb_mappings,int width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3, -uint16_t unlock_addr0,uint16_t unlock_addr1, -int be); -MemoryRegion *pflash_cfi01_get_memory (pflash_t *fl); +#define TYPE_CFI_PFLASH02 "cfi.pflash02" + +typedef struct PFlashCFI02 PFlashCFI02 ; + +PFlashCFI02 *pflash_cfi02_register(hwaddr base, + DeviceState *qdev, const char *name, + hwaddr size, + BlockBackend *blk, + uint32_t sector_len, int nb_blocs,
include/hw/block/flash.h line 45
Quoted 10 lines
include/hw/block/flash.h +7
-0+int nb_mappings, + int width, + uint16_t id0, uint16_t id1, + uint16_t id2, uint16_t id3, + uint16_t unlock_addr0, + uint16_t unlock_addr1, + int be);/* nand.c */ DeviceState *nand_init (BlockBackend *blk,int manf_id,int chip_id);
--
Alex Bennée
PATCH 2/10 pflash: Macro PFLASH_BUG() is used just once, expand
In reply to Markus ArmbrusterPFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.
--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
hw/block/pflash_cfi01.c +2 -8
@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \
@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 ); }break ;default :
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 30 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +0
-6@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 625
Quoted 10 lines
hw/block/pflash_cfi01.c +2
-2@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 ); }break ;default :
Technically speaking, the commit message is slightly incorrect, where it says "all this commit does is expanding the macro" -- the "goto" is being removed as well.
I like the attention to detail in that you didn't add the missing newline character in the expanded fprintf() ;)
With the commit message tweaked, or not:
Thakns
Laszlo
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 37 lines · Laszlo Ersek
Quoted 36 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +2
-8@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 );
Quoted 8 lines
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 625
Quoted 4 lines
hw/block/pflash_cfi01.c +0
-0}break ;default :Technically speaking, the commit message is slightly incorrect, where it says "all this commit does is expanding the macro" -- the "goto" is being removed as well.
You're right. I'll amend the commit message.
Quoted 2 lines
I like the attention to detail in that you didn't add the missing newline character in the expanded
fprintf();)
I wish I could claim it was intentional preservation of a bad smell as fair warning to future readers...
Quoted 3 lines
With the commit message tweaked, or not:
Reviewed-by Laszlo Ersek <[email protected]>
Thanks!
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
In reply to Markus ArmbrusterQuoted 29 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +0
-6@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 622
Quoted 7 lines
hw/block/pflash_cfi01.c +2
-2@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 );
Don't you want to use hw_error here?
hw_error("PFLASH: Possible BUG - Write block confirm");Quoted 4 lines
hw/block/pflash_cfi01.c +0
-0}break ;default :
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 41 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +0
-6@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 622
Quoted 7 lines
hw/block/pflash_cfi01.c +2
-2@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 );Don't you want to use
hw_errorhere?
Quoted 1 line
hw_error("PFLASH: Possible BUG - Write block confirm");This should just be
qemu_log_mask(LOG_GUEST_ERROR, ...);
(replacing both the DPRINTF and the PFLASH_BUG()).
It's triggerable by a guest (if it puts the device into write-block mode and then feeds it a bogus command byte), so it's just a guest error, not an issue with our model of the pflash.
thanks
-- PMM
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 44 lines · Peter Maydell
Quoted 41 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +0
-6@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 622
Quoted 7 lines
hw/block/pflash_cfi01.c +2
-2@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 );Don't you want to use
hw_errorhere?Quoted 1 line
hw_error("PFLASH: Possible BUG - Write block confirm");
Quoted 7 lines
This should just be
qemu_log_mask(LOG_GUEST_ERROR, ...);
(replacing both the DPRINTF and thePFLASH_BUG()).It's triggerable by a guest (if it puts the device into write-block mode and then feeds it a bogus command byte), so it's just a guest error, not an issue with our model of the pflash.
I can do that. Thanks!
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 50 lines · Markus Armbruster
Quoted 48 lines · Peter Maydell
Quoted 41 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +0
-6@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 622
Quoted 7 lines
hw/block/pflash_cfi01.c +2
-2@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 );Don't you want to use
hw_errorhere?Quoted 1 line
hw_error("PFLASH: Possible BUG - Write block confirm");This should just be
qemu_log_mask(LOG_GUEST_ERROR, ...);
(replacing both the DPRINTF and thePFLASH_BUG()).
Quoted 5 lines
Quoted 3 lines
It's triggerable by a guest (if it puts the device into write-block mode and then feeds it a bogus command byte), so it's just a guest error, not an issue with our model of the pflash.
I can do that. Thanks!
Double-checking... you want me to keep goto reset_flash, like this:
@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
pfl->wcycle = 0;
pfl->status |= 0x80;
} else {
- DPRINTF("%s: unknown command for \"write block\"\n", __func__);
- PFLASH_BUG("Write block confirm");
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "unknown command for \"write block\"\n");
goto reset_flash;
}
break;Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 13 lines · Markus Armbruster
Double-checking... you want me to keep goto
reset_flash, like this:hw/block/pflash_cfi01.c +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle =0 ; pfl->status |=0x80 ; }else { -DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); +qemu_log_mask (LOG_GUEST_ERROR , +"unknown command for \"write block\"\n" ); goto reset_flash; }break ;
Yes. (We seem to handle most kinds of guest errors in programming the flash by reset_flash.)
thanks
-- PMM
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
somewhat off-topic:
Quoted 17 lines · Peter Maydell
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 13 lines · Markus Armbruster
Double-checking... you want me to keep goto
reset_flash, like this:hw/block/pflash_cfi01.c +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle =0 ; pfl->status |=0x80 ; }else { -DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); +qemu_log_mask (LOG_GUEST_ERROR , +"unknown command for \"write block\"\n" ); goto reset_flash; }break ;Yes. (We seem to handle most kinds of guest errors in programming the flash by
reset_flash.)
since we're talking "reset_flash", I'll note that there is no actual reset handler for cfi.pflash01. I found out recently, via:
https://bugzilla.redhat.com/show_bug.cgi?id=1678713
Thanks
Laszlo
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 4 lines · Laszlo Ersek
since we're talking "
reset_flash", I'll note that there is no actual reset handler for cfi.pflash01. I found out recently, via:
Yes; this isn't uncommon for some of the really old device models. It should definitely have one added.
You are correct also that the timer in the pflash_cfi01 model is dead code -- it has always been so, since the device was added in 2007. The reason it is there is that pflash_cfi01 was created as a copy-and-hack of the cfi02 device. In cfi02 we do use the timer, as a way of simulating "make full-chip and sector erases take a guest-visible amount of time rather than completing instantaneously". cfi01 doesn't do that (and I think may not implement anything other than block erase), but the timer initialization code was left in rather than being deleted as part of the copy-and-hack.
thanks
-- PMM
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 9 lines · Peter Maydell
Quoted 4 lines · Laszlo Ersek
since we're talking "
reset_flash", I'll note that there is no actual reset handler for cfi.pflash01. I found out recently, via:Yes; this isn't uncommon for some of the really old device models. It should definitely have one added.
Quoted 11 lines
You are correct also that the timer in the
pflash_cfi01model is dead code -- it has always been so, since the device was added in 2007. The reason it is there is thatpflash_cfi01was created as a copy-and-hack of the cfi02 device. In cfi02 we do use the timer, as a way of simulating "make full-chip and sector erases take a guest-visible amount of time rather than completing instantaneously". cfi01 doesn't do that (and I think may not implement anything other than block erase), but the timer initialization code was left in rather than being deleted as part of the copy-and-hack.
Thank you, I've linked this back into the RHBZ.
Laszlo
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 10 lines · Laszlo Ersek
Quoted 9 lines · Peter Maydell
Quoted 4 lines · Laszlo Ersek
since we're talking "
reset_flash", I'll note that there is no actual reset handler for cfi.pflash01. I found out recently, via:Yes; this isn't uncommon for some of the really old device models. It should definitely have one added.
Quoted 9 lines
Quoted 9 lines
You are correct also that the timer in the
pflash_cfi01model is dead code -- it has always been so, since the device was added in 2007. The reason it is there is thatpflash_cfi01was created as a copy-and-hack of the cfi02 device. In cfi02 we do use the timer, as a way of simulating "make full-chip and sector erases take a guest-visible amount of time rather than completing instantaneously". cfi01 doesn't do that (and I think may not implement anything other than block erase),
This time is flash-device specific and is currently hardcoded.
The guest learn from the CFI table how long it should wait before polling/accessing the flash, or take measures in case of timeout.
We set these values in _realize():
...
/* Typical timeout for block erase (512 ms) */
pfl->cfi_table[0x21] = 0x09;
/* Typical timeout for full chip erase (4096 ms) */
pfl->cfi_table[0x22] = 0x0C;
...
/* Max timeout for block erase */
pfl->cfi_table[0x25] = 0x0A;
/* Max timeout for chip erase */
pfl->cfi_table[0x26] = 0x0D;The timer is triggered in _write(), where we use other hardcoded values (which are luckily in range with the CFI announced ones):
/* Let's wait 5 seconds before chip erase is done */
timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
(NANOSECONDS_PER_SECOND * 5));
/* Let's wait 1/2 second before sector erase is done */
timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
(NANOSECONDS_PER_SECOND / 2));When emulating embedded devices, it is very desirable to have those timers working, and I'd prefer we fix that on CFI01 rather than simply removing the unused timer.
Now for the case of "Virt" machines, it is probably pointless to add flash delay and we should remove the timer use.
Quoted 7 lines
Quoted 2 lines
but the timer initialization code was left in rather than being deleted as part of the copy-and-hack.
Thank you, I've linked this back into the RHBZ.
Laszlo
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 51 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Laszlo Ersek
Quoted 9 lines · Peter Maydell
Quoted 4 lines · Laszlo Ersek
since we're talking "
reset_flash", I'll note that there is no actual reset handler for cfi.pflash01. I found out recently, via:Yes; this isn't uncommon for some of the really old device models. It should definitely have one added.
Quoted 9 lines
Quoted 9 lines
You are correct also that the timer in the
pflash_cfi01model is dead code -- it has always been so, since the device was added in 2007. The reason it is there is thatpflash_cfi01was created as a copy-and-hack of the cfi02 device. In cfi02 we do use the timer, as a way of simulating "make full-chip and sector erases take a guest-visible amount of time rather than completing instantaneously". cfi01 doesn't do that (and I think may not implement anything other than block erase),This time is flash-device specific and is currently hardcoded.
The guest learn from the CFI table how long it should wait before polling/accessing the flash, or take measures in case of timeout.
We set these values in
_realize():... /* Typical timeout for block erase (512 ms) */ pfl->cfi_table[0x21] = 0x09; /* Typical timeout for full chip erase (4096 ms) */ pfl->cfi_table[0x22] = 0x0C; ... /* Max timeout for block erase */ pfl->cfi_table[0x25] = 0x0A; /* Max timeout for chip erase */ pfl->cfi_table[0x26] = 0x0D;The timer is triggered in
_write(), where we use other hardcoded values (which are luckily in range with the CFI announced ones):/* Let's wait 5 seconds before chip erase is done */ timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND * 5)); /* Let's wait 1/2 second before sector erase is done */ timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND / 2));
Quoted 6 lines
When emulating embedded devices, it is very desirable to have those timers working, and I'd prefer we fix that on CFI01 rather than simply removing the unused timer.
Now for the case of "Virt" machines, it is probably pointless to add flash delay and we should remove the timer use.
If the timer logic can be completed in such a way that existent OVMF code sees no change at all, on the machine types that it currently runs on (that is, on *unversioned* i440fx and q35), I'm OK with the idea.
Thanks,
Laszlo
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
but the timer initialization code was left in rather than being deleted as part of the copy-and-hack.
Thank you, I've linked this back into the RHBZ.
Laszlo
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
In reply to Peter MaydellQuoted 17 lines · Peter Maydell
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 13 lines · Markus Armbruster
Double-checking... you want me to keep goto
reset_flash, like this:hw/block/pflash_cfi01.c +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle =0 ; pfl->status |=0x80 ; }else { -DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); +qemu_log_mask (LOG_GUEST_ERROR , +"unknown command for \"write block\"\n" ); goto reset_flash; }break ;Yes. (We seem to handle most kinds of guest errors in programming the flash by
reset_flash.)
Oh I missed the context of the patch here.
So for the case of the Multi-WRITE command (0xe8):
1/ On first write cycle we have
- address = flash_page_address (we store it in pfl->counter)
- data = flash_command (0xe8: enter Multi-WRITE)
2/ Second cycle:
- address = flash_page_address
We should check it matches flash_page_address
of cycle 1/, but we don't.
- data: N
"N is the number of elements (bytes / words / double words), minus one, to be written to the write buffer. Expected count ranges are N = 00h to N = 7Fh (e.g., 1 to 128 bytes) in 8-bit mode, N = 00h to N = 003Fh in 16-bit mode, and N = 00h to N = 1Fh in 32-bit mode. Bus cycles 3 and higher are for writing data into the write buffer. The confirm command (D0h) is expected after exactly N + 1 write cycles; any other command at that point in the sequence will prevent the transfer of the buffer to the array (the write will be aborted)."
Instead of starting to write the data in a buffer, we write it directly to the block backend.
Instead of starting to write from cycle 3+, we write now in 2, and keep cycle count == 2 (pfl->wcycle) until all data is written, where we increment at 3.
3/ Cycles 3+
- address = word index (relative to the page address)
- data = word value
We check for the CONFIRM command, and switch the device back to READ mode (setting Status), or reset the device (which is modelled the same way).
Very silly: If the guest cancelled and never sent the CONFIRM command, the data is already written/flushed back.
So back to the previous code snippet, regardless the value, this is neither a hw_error() nor a GUEST_ERROR. This code is simply not correct. Eventually the proper (polite) error message should be:
qemu_log_mask(LOG_UNIMP, "MULTI_WRITE: Abort not implemented,"
" the data is already written" " on storage!\n" "Nevertheless resetting the flash" " into READ mode.\n");
Regards,
Phil.
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 67 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Peter Maydell
Review static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 13 lines · Markus Armbruster
Double-checking... you want me to keep goto
reset_flash, like this:(quoted diff) +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle = 0; pfl->status |= 0x80; } else { - DPRINTF("%s: unknown command for \"write block\"\n", __func__); - PFLASH_BUG("Write block confirm"); + qemu_log_mask(LOG_GUEST_ERROR, + "unknown command for \"write block\"\n"); goto reset_flash; } break;Yes. (We seem to handle most kinds of guest errors in programming the flash by
reset_flash.)Oh I missed the context of the patch here.
So for the case of the Multi-WRITE command (
0xe8):1/ On first write cycle we have
- address =
flash_page_address(we store it inpfl->counter)
- data =flash_command(0xe8: enter Multi-WRITE)2/ Second cycle:
- address =
flash_page_address
We should check it matchesflash_page_address
of cycle 1/, but we don't.
- data: N"N is the number of elements (bytes / words / double words), minus one, to be written to the write buffer. Expected count ranges are N = 00h to N = 7Fh (e.g., 1 to 128 bytes) in 8-bit mode, N = 00h to N = 003Fh in 16-bit mode, and N = 00h to N = 1Fh in 32-bit mode. Bus cycles 3 and higher are for writing data into the write buffer. The confirm command (D0h) is expected after exactly N + 1 write cycles; any other command at that point in the sequence will prevent the transfer of the buffer to the array (the write will be aborted)."
Instead of starting to write the data in a buffer, we write it directly to the block backend.
Instead of starting to write from cycle 3+, we write now in 2, and keep cycle count == 2 (pfl->wcycle) until all data is written, where we increment at 3.3/ Cycles 3+
- address = word index (relative to the page address)
- data = word valueWe check for the CONFIRM command, and switch the device back to READ mode (setting Status), or reset the device (which is modelled the same way).
Very silly: If the guest cancelled and never sent the CONFIRM command, the data is already written/flushed back.
So back to the previous code snippet, regardless the value, this is neither a
hw_error()nor aGUEST_ERROR. This code is simply not correct. Eventually the proper (polite) error message should be:
Quoted 5 lines
qemu_log_mask(LOG_UNIMP, "
MULTI_WRITE: Abort not implemented,"
" the data is already written" " on storage!\n" "Nevertheless resetting the flash" " into READ mode.\n");
Oww.
This code is a swamp.
Peter, Alex, do you agree with Phil's analysis? If yes, I'll update my patch once more.
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
Quoted 75 lines · Markus Armbruster
Quoted 67 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Peter Maydell
Review static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 13 lines · Markus Armbruster
Double-checking... you want me to keep goto
reset_flash, like this:(quoted diff) +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle = 0; pfl->status |= 0x80; } else { - DPRINTF("%s: unknown command for \"write block\"\n", __func__); - PFLASH_BUG("Write block confirm"); + qemu_log_mask(LOG_GUEST_ERROR, + "unknown command for \"write block\"\n"); goto reset_flash; } break;Yes. (We seem to handle most kinds of guest errors in programming the flash by
reset_flash.)Oh I missed the context of the patch here.
So for the case of the Multi-WRITE command (
0xe8):1/ On first write cycle we have
- address =
flash_page_address(we store it inpfl->counter)
- data =flash_command(0xe8: enter Multi-WRITE)2/ Second cycle:
- address =
flash_page_address
We should check it matchesflash_page_address
of cycle 1/, but we don't.
- data: N"N is the number of elements (bytes / words / double words), minus one, to be written to the write buffer. Expected count ranges are N = 00h to N = 7Fh (e.g., 1 to 128 bytes) in 8-bit mode, N = 00h to N = 003Fh in 16-bit mode, and N = 00h to N = 1Fh in 32-bit mode. Bus cycles 3 and higher are for writing data into the write buffer. The confirm command (D0h) is expected after exactly N + 1 write cycles; any other command at that point in the sequence will prevent the transfer of the buffer to the array (the write will be aborted)."
Instead of starting to write the data in a buffer, we write it directly to the block backend.
Instead of starting to write from cycle 3+, we write now in 2, and keep cycle count == 2 (pfl->wcycle) until all data is written, where we increment at 3.3/ Cycles 3+
- address = word index (relative to the page address)
- data = word valueWe check for the CONFIRM command, and switch the device back to READ mode (setting Status), or reset the device (which is modelled the same way).
Very silly: If the guest cancelled and never sent the CONFIRM command, the data is already written/flushed back.
So back to the previous code snippet, regardless the value, this is neither a
hw_error()nor aGUEST_ERROR. This code is simply not correct. Eventually the proper (polite) error message should be:Quoted 5 lines
qemu_log_mask(LOG_UNIMP, "
MULTI_WRITE: Abort not implemented,"
" the data is already written" " on storage!\n" "Nevertheless resetting the flash" " into READ mode.\n");
Quoted 6 lines
Oww.
This code is a swamp.
Peter, Alex, do you agree with Phil's analysis? If yes, I'll update my patch once more.
I'm happy to defer to Phil's obvious expertise here ;-)
--
Alex Bennée
Re: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
In reply to Philippe Mathieu-DaudéQuoted 19 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Peter Maydell
Review static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 13 lines · Markus Armbruster
Double-checking... you want me to keep goto
reset_flash, like this:(quoted diff) +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle = 0; pfl->status |= 0x80; } else { - DPRINTF("%s: unknown command for \"write block\"\n", __func__); - PFLASH_BUG("Write block confirm"); + qemu_log_mask(LOG_GUEST_ERROR, + "unknown command for \"write block\"\n"); goto reset_flash; } break;Yes. (We seem to handle most kinds of guest errors in programming the flash by
reset_flash.)
Quoted 3 lines
Oh I missed the context of the patch here.
So for the case of the Multi-WRITE command (
0xe8):
Since I'm a clueless idiot on pflash, I need to process your argument real slow, so I can write a commit message that doesn't document my cluelessness forever.
We have a little state machine, and its state is encoded in pfl->wcycle. pfl->cmd, pfl->counter. I'm going to show it as
(value of pfl->wcycle, value of pfl->cmd, value of pfl->counter)
for brevity.
We start with (0, don't care, don't care).
A guest write sends us a width, an address, and a value. pflash_mem_write_with_attrs() does permission checking, and pflash_write() the actual work. We enter it with @offset, @value and @width holding the message.
cmd = value;
trace_pflash_write(offset, value, width, pfl->wcycle);
if (!pfl->wcycle) {
/* Set the device in I/O access mode */
memory_region_rom_device_set_romd(&pfl->mem, false);
}@cmd is @value truncated to 8 bits.
Quoted 4 lines
1/ On first write cycle we have
- address =
flash_page_address(we store it inpfl->counter)
- data =flash_command(0xe8: enter Multi-WRITE)
switch (pfl->wcycle) {
case 0:
/* read mode */
switch (cmd) {
[...]
case 0xe8: /* Write to buffer */
DPRINTF("%s: Write to buffer\n", __func__);
pfl->status |= 0x80; /* Ready! */
break;
[...]
pfl->wcycle++;
pfl->cmd = cmd;
break;Transition from (0, don't care, don't care) to (1, 0xE8, don't care).
I can't see "we store it in pfl->counter".
Note that the address (passed in @offset) is entirely ignored.
Quoted 17 lines
2/ Second cycle:
- address =
flash_page_address
We should check it matchesflash_page_address
of cycle 1/, but we don't.
- data: N"N is the number of elements (bytes / words / double words), minus one, to be written to the write buffer. Expected count ranges are N = 00h to N = 7Fh (e.g., 1 to 128 bytes) in 8-bit mode, N = 00h to N = 003Fh in 16-bit mode, and N = 00h to N = 1Fh in 32-bit mode. Bus cycles 3 and higher are for writing data into the write buffer. The confirm command (D0h) is expected after exactly N + 1 write cycles; any other command at that point in the sequence will prevent the transfer of the buffer to the array (the write will be aborted)."
Quoted 2 lines
Instead of starting to write the data in a buffer, we write it directly to the block backend.
case 1:
switch (pfl->cmd) {
[...]
case 0xe8:
/* Mask writeblock size based on device width, or bank width if
* device width not specified.
*/
if (pfl->device_width) {
value = extract32(value, 0, pfl->device_width * 8);
} else {
value = extract32(value, 0, pfl->bank_width * 8);
}
DPRINTF("%s: block write of %x bytes\n", __func__, value);
pfl->counter = value;
pfl->wcycle++;
break;
[...]
}
break;Transition from (1, 0xE8, don't care) to (2, 0xE8, N), where N is passed in @value.
Again, the address (passed in @offset) is ignored.
Nothing is written to the block backend, yet.
Quoted 3 lines
Instead of starting to write from cycle 3+, we write now in 2, and keep cycle count == 2 (
pfl->wcycle) until all data is written, where we increment at 3.
case 2:
switch (pfl->cmd) {
case 0xe8: /* Block write */
if (!pfl->ro) {
pflash_data_write(pfl, offset, value, width, be);
} else {
pfl->status |= 0x10; /* Programming error */
}Write to memory, with pflash_data_write(), but don't flush to the backend, yet. This is (guest-visibly!) wrong. It's not quite "instead of starting to write the data in a buffer, we write it directly to the block backend."
Note that we happily accept any address and width. I suspect we should only accept consecutive addresses and consistent width.
pfl->status |= 0x80;
if (!pfl->counter) {
hwaddr mask = pfl->writeblock_size - 1;
mask = ~mask;
DPRINTF("%s: block write finished\n", __func__);
pfl->wcycle++;
if (!pfl->ro) {
/* Flush the entire write buffer onto backing storage. */
pflash_update(pfl, offset & mask, pfl->writeblock_size);
} else {
pfl->status |= 0x10; /* Programming error */
}
}If this is the multi-write's last write, flush the entire write block to the backend *boggle*.
pfl->counter--;
break;
[...]
}
break;Transition from (2, 0xE8, N) to
(2, 0xE8, N-1) if N>0
(3, 0xE8, don't care) if N==0Quoted 11 lines
3/ Cycles 3+
- address = word index (relative to the page address)
- data = word valueWe check for the CONFIRM command, and switch the device back to READ mode (setting Status), or reset the device (which is modelled the same way).
Very silly: If the guest cancelled and never sent the CONFIRM command, the data is already written/flushed back.
case 3: /* Confirm mode */
switch (pfl->cmd) {
case 0xe8: /* Block write */
if (cmd == 0xd0) {
pfl->wcycle = 0;
pfl->status |= 0x80;On CONFIRM, transition from (3, 0xE8, don't care) back to the intial state (0, don't care, don't care).
} else {
DPRINTF("%s: unknown command for \"write block\"\n", __func__);
PFLASH_BUG("Write block confirm");
goto reset_flash;
}On anything else, pea brain implodes, and we exit(1).
break;
The fact that we let a hack job like this anywhere near "secure boot" is either frightening or amusing, depending on one's level of cynicism towards virtual secure boot.
Quoted 9 lines
So back to the previous code snippet, regardless the value, this is neither a
hw_error()nor aGUEST_ERROR. This code is simply not correct. Eventually the proper (polite) error message should be:qemu_log_mask(LOG_UNIMP, "
MULTI_WRITE: Abort not implemented,"
" the data is already written" " on storage!\n" "Nevertheless resetting the flash" " into READ mode.\n");
Yup, makes sense.
Perhaps we should also LOG_UNIMP on the first write of a multi-write already, because the guest-visible wrongness starts right there. You tell me.
Two things left to do for this series: FIXME comments, and a commit message. Before I tackle them, I'll give you a chance to correct misunderstandings in my reasoning.
Alex Bennée
Reviewed-byRe: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand
In reply to Markus ArmbrusterQuoted 61 lines · Markus Armbruster
Quoted 50 lines · Markus Armbruster
Quoted 48 lines · Peter Maydell
Quoted 41 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Markus Armbruster
PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto
reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)hw/block/pflash_cfi01.c +0
-6@@ -49,12 +49,6 @@#include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG (fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) -/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF (fmt, ...) \hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 622
Quoted 7 lines
hw/block/pflash_cfi01.c +2
-2@@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |=0x80 ; }else {DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); - goto reset_flash; +fprintf (stderr,"PFLASH: Possible BUG - Write block confirm" ); +exit (1 );Don't you want to use
hw_errorhere?Quoted 1 line
hw_error("PFLASH: Possible BUG - Write block confirm");This should just be
qemu_log_mask(LOG_GUEST_ERROR, ...);
(replacing both the DPRINTF and thePFLASH_BUG()).Quoted 5 lines
Quoted 3 lines
It's triggerable by a guest (if it puts the device into write-block mode and then feeds it a bogus command byte), so it's just a guest error, not an issue with our model of the pflash.
I can do that. Thanks!
Double-checking... you want me to keep goto
reset_flash, like this:
hw/block/pflash_cfi01.c static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, · line 624
Quoted 10 lines
hw/block/pflash_cfi01.c +2
-2@@ -623,8 +617,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle =0 ; pfl->status |=0x80 ; }else { -DPRINTF ("%s: unknown command for \"write block\"\n" , __func__); -PFLASH_BUG ("Write block confirm" ); +qemu_log_mask (LOG_GUEST_ERROR , +"unknown command for \"write block\"\n" ); goto reset_flash; }break ;
With this change:
--
Alex Bennée
PATCH 3/10 hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}
In reply to Markus ArmbrusterWe have two open-coded copies of macro CFI_PFLASH01(). Move the macro to the header, so we can ditch the copies. Move CFI_PFLASH02() to the header for symmetry.
We define macros TYPE_CFI_PFLASH01 and TYPE_CFI_PFLASH02 for type name strings, then mostly use the strings. If the macros are worth defining, they are worth using. Replace the strings by the macros.
--- hw/arm/vexpress.c | 4 ++-- hw/arm/virt.c | 3 ++- hw/block/pflash_cfi01.c | 3 --- hw/block/pflash_cfi02.c | 3 --- hw/xtensa/xtfpga.c | 4 ++-- include/hw/block/flash.h | 4 ++++ 6 files changed, 10 insertions(+), 11 deletions(-)
hw/arm/vexpress.c +2 -2
@@ -515,7 +515,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );if (di) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(di),
@@ -536,7 +536,7 @@ static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static void vexpress_common_init (MachineState *machine)
hw/arm/virt.c +2 -1
@@ -34,6 +34,7 @@#include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" +#include "hw/block/flash.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" #include "hw/display/ramfb.h"
@@ -874,7 +875,7 @@ static void create_one_flash(const char *name, hwaddr flashbase,* parameters as the flash devices on the Versatile Express board. */ DriveInfo *dinfo =drive_get_next (IF_PFLASH ); -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );SysBusDevice *sbd =SYS_BUS_DEVICE (dev);const uint64_t sectorlength =256 *1024 ;
hw/block/pflash_cfi01.c +0 -3
@@ -59,9 +59,6 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01) -#define PFLASH_BE 0#define PFLASH_SECURE 1
hw/block/pflash_cfi02.c +0 -3
@@ -57,9 +57,6 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) -struct PFlashCFI02 {/*< private >*/ SysBusDevice parent_obj;
hw/xtensa/xtfpga.c +2 -2
@@ -167,7 +167,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, DriveInfo *dinfo, int be) {SysBusDevice *s; -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_abort);
@@ -181,7 +181,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)
include/hw/block/flash.h +4 -0
@@ -8,6 +8,8 @@/* pflash_cfi01.c */ #define TYPE_CFI_PFLASH01 "cfi.pflash01" +#define CFI_PFLASH01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)typedef struct PFlashCFI01 PFlashCFI01 ;
@@ -25,6 +27,8 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);/* pflash_cfi02.c */ #define TYPE_CFI_PFLASH02 "cfi.pflash02" +#define CFI_PFLASH02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02)typedef struct PFlashCFI02 PFlashCFI02 ;
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 03/10] hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}
Quoted 126 lines · Markus Armbruster
We have two open-coded copies of macro
CFI_PFLASH01(). Move the macro to the header, so we can ditch the copies. MoveCFI_PFLASH02()to the header for symmetry.We define macros
TYPE_CFI_PFLASH01andTYPE_CFI_PFLASH02for type name strings, then mostly use the strings. If the macros are worth defining, they are worth using. Replace the strings by the macros.Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 4 ++-- hw/arm/virt.c | 3 ++- hw/block/pflash_cfi01.c | 3 --- hw/block/pflash_cfi02.c | 3 --- hw/xtensa/xtfpga.c | 4 ++-- include/hw/block/flash.h | 4 ++++ 6 files changed, 10 insertions(+), 11 deletions(-)hw/arm/vexpress.c +2
-2@@ -515,7 +515,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );if (di) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(di),@@ -536,7 +536,7 @@ static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static void vexpress_common_init (MachineState *machine)hw/arm/virt.c +2
-1@@ -34,6 +34,7 @@#include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" +#include "hw/block/flash.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" #include "hw/display/ramfb.h" @@ -874,7 +875,7 @@ static void create_one_flash(const char *name, hwaddr flashbase,* parameters as the flash devices on the Versatile Express board. */ DriveInfo *dinfo =drive_get_next (IF_PFLASH ); -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );SysBusDevice *sbd =SYS_BUS_DEVICE (dev);const uint64_t sectorlength =256 *1024 ;hw/block/pflash_cfi01.c +0
-3@@ -59,9 +59,6 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01) -#define PFLASH_BE 0#define PFLASH_SECURE 1hw/block/pflash_cfi02.c +0
-3@@ -57,9 +57,6 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) -struct PFlashCFI02 {/*< private >*/ SysBusDevice parent_obj;hw/xtensa/xtfpga.c +2
-2@@ -167,7 +167,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, DriveInfo *dinfo, int be) {SysBusDevice *s; -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_abort);@@ -181,7 +181,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)include/hw/block/flash.h +2
-0@@ -8,6 +8,8 @@/* pflash_cfi01.c */ #define TYPE_CFI_PFLASH01 "cfi.pflash01" +#define CFI_PFLASH01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)typedef struct PFlashCFI01 PFlashCFI01 ;
include/hw/block/flash.h MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl); · line 34
Quoted 8 lines
include/hw/block/flash.h +2
-0@@ -25,6 +27,8 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);/* pflash_cfi02.c */ #define TYPE_CFI_PFLASH02 "cfi.pflash02" +#define CFI_PFLASH02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02)typedef struct PFlashCFI02 PFlashCFI02 ;
Re: [Qemu-devel] [PATCH 03/10] hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}
In reply to Markus ArmbrusterQuoted 9 lines · Markus Armbruster
We have two open-coded copies of macro
CFI_PFLASH01(). Move the macro to the header, so we can ditch the copies. MoveCFI_PFLASH02()to the header for symmetry.We define macros
TYPE_CFI_PFLASH01andTYPE_CFI_PFLASH02for type name strings, then mostly use the strings. If the macros are worth defining, they are worth using. Replace the strings by the macros.Signed-off-by Markus Armbruster <[email protected]>
Quoted 125 lines
--- hw/arm/vexpress.c | 4 ++-- hw/arm/virt.c | 3 ++- hw/block/pflash_cfi01.c | 3 --- hw/block/pflash_cfi02.c | 3 --- hw/xtensa/xtfpga.c | 4 ++-- include/hw/block/flash.h | 4 ++++ 6 files changed, 10 insertions(+), 11 deletions(-)hw/arm/vexpress.c +2
-2@@ -515,7 +515,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );if (di) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(di),@@ -536,7 +536,7 @@ static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static void vexpress_common_init (MachineState *machine)hw/arm/virt.c +2
-1@@ -34,6 +34,7 @@#include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" +#include "hw/block/flash.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" #include "hw/display/ramfb.h" @@ -874,7 +875,7 @@ static void create_one_flash(const char *name, hwaddr flashbase,* parameters as the flash devices on the Versatile Express board. */ DriveInfo *dinfo =drive_get_next (IF_PFLASH ); -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );SysBusDevice *sbd =SYS_BUS_DEVICE (dev);const uint64_t sectorlength =256 *1024 ;hw/block/pflash_cfi01.c +0
-3@@ -59,9 +59,6 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01) -#define PFLASH_BE 0#define PFLASH_SECURE 1hw/block/pflash_cfi02.c +0
-3@@ -57,9 +57,6 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) -struct PFlashCFI02 {/*< private >*/ SysBusDevice parent_obj;hw/xtensa/xtfpga.c +2
-2@@ -167,7 +167,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, DriveInfo *dinfo, int be) {SysBusDevice *s; -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_abort);@@ -181,7 +181,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)include/hw/block/flash.h +4
-0@@ -8,6 +8,8 @@/* pflash_cfi01.c */ #define TYPE_CFI_PFLASH01 "cfi.pflash01" +#define CFI_PFLASH01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)typedef struct PFlashCFI01 PFlashCFI01 ;@@ -25,6 +27,8 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);/* pflash_cfi02.c */ #define TYPE_CFI_PFLASH02 "cfi.pflash02" +#define CFI_PFLASH02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02)typedef struct PFlashCFI02 PFlashCFI02 ;
Re: [Qemu-devel] [PATCH 03/10] hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}
In reply to Markus ArmbrusterQuoted 9 lines · Markus Armbruster
We have two open-coded copies of macro
CFI_PFLASH01(). Move the macro to the header, so we can ditch the copies. MoveCFI_PFLASH02()to the header for symmetry.We define macros
TYPE_CFI_PFLASH01andTYPE_CFI_PFLASH02for type name strings, then mostly use the strings. If the macros are worth defining, they are worth using. Replace the strings by the macros.Signed-off-by Markus Armbruster <[email protected]>
Quoted 116 lines
--- hw/arm/vexpress.c | 4 ++-- hw/arm/virt.c | 3 ++- hw/block/pflash_cfi01.c | 3 --- hw/block/pflash_cfi02.c | 3 --- hw/xtensa/xtfpga.c | 4 ++-- include/hw/block/flash.h | 4 ++++ 6 files changed, 10 insertions(+), 11 deletions(-)hw/arm/vexpress.c +2
-2@@ -515,7 +515,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );if (di) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(di),@@ -536,7 +536,7 @@ static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static void vexpress_common_init (MachineState *machine)hw/arm/virt.c +2
-1@@ -34,6 +34,7 @@#include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" +#include "hw/block/flash.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" #include "hw/display/ramfb.h" @@ -874,7 +875,7 @@ static void create_one_flash(const char *name, hwaddr flashbase,* parameters as the flash devices on the Versatile Express board. */ DriveInfo *dinfo =drive_get_next (IF_PFLASH ); -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );SysBusDevice *sbd =SYS_BUS_DEVICE (dev);const uint64_t sectorlength =256 *1024 ;hw/block/pflash_cfi01.c +0
-3@@ -59,9 +59,6 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01) -#define PFLASH_BE 0#define PFLASH_SECURE 1hw/block/pflash_cfi02.c +0
-3@@ -57,9 +57,6 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) -struct PFlashCFI02 {/*< private >*/ SysBusDevice parent_obj;hw/xtensa/xtfpga.c +2
-2@@ -167,7 +167,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, DriveInfo *dinfo, int be) {SysBusDevice *s; -DeviceState *dev =qdev_create (NULL ,"cfi.pflash01" ); +DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_abort);@@ -181,7 +181,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return OBJECT_CHECK (PFlashCFI01, (dev),"cfi.pflash01" ); +return CFI_PFLASH01 (dev); }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)include/hw/block/flash.h +2
-0@@ -8,6 +8,8 @@/* pflash_cfi01.c */ #define TYPE_CFI_PFLASH01 "cfi.pflash01" +#define CFI_PFLASH01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)typedef struct PFlashCFI01 PFlashCFI01 ;
include/hw/block/flash.h MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl); · line 33
Quoted 7 lines
include/hw/block/flash.h +2
-0@@ -25,6 +27,8 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);/* pflash_cfi02.c */ #define TYPE_CFI_PFLASH02 "cfi.pflash02" +#define CFI_PFLASH02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02)typedef struct PFlashCFI02 PFlashCFI02 ;
--
Alex Bennée
PATCH 4/10 sam460ex: Don't size flash memory to match backing image
In reply to Markus ArmbrusterMachine "sam460ex" maps its flash memory at address 0xFFF00000. When no image is supplied, its size is 1MiB (0x100000). Else, it's the size of the image rounded up to the next multiple of 64KiB.
The rounding is actually useless: pflash_cfi01_realize() fails with "failed to read the initial flash content" unless it's a no-op.
I have no idea what happens when the pflash's size exceeds 1MiB. Useful outcomes seem unlikely.
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
Set the flash memory size to 1MiB regardless of image size, to match the physical hardware.
--- hw/ppc/sam460ex.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
hw/ppc/sam460ex.c +8 -15
@@ -92,31 +92,24 @@ struct boot_info {static int sam460ex_load_uboot (void ) {DriveInfo *dinfo; -BlockBackend *blk =NULL ; -hwaddr base =FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -long bios_size =FLASH_SIZE ; -int fl_sectors; dinfo =drive_get (IF_PFLASH ,0 ,0 ); -if (dinfo) { - blk =blk_by_legacy_dinfo (dinfo); - bios_size =blk_getlength (blk); - } - fl_sectors = (bios_size +65535 ) >>16 ; - -if (!pflash_cfi01_register (base,NULL ,"sam460ex.flash" , bios_size, - blk,64 * KiB, fl_sectors, +if (!pflash_cfi01_register (FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ), +NULL ,"sam460ex.flash" ,FLASH_SIZE , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 ,FLASH_SIZE /65536 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ exit (1 ); } -if (!blk) { +if (!dinfo) {/*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ - base =UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -rom_add_file_fixed (UBOOT_FILENAME , base,-1 ); +rom_add_file_fixed (UBOOT_FILENAME , +UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ), +-1 ); }return 0 ;
Signature · 1 line
2.17.2
Re: [Qemu-devel] [Qemu-ppc] [PATCH 04/10] sam460ex: Don't size flash memory to match backing image
Hello,
Quoted 4 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000). Else, it's the size of the image rounded up to the next multiple of 64KiB.
Quoted 8 lines
The rounding is actually useless:
pflash_cfi01_realize()fails with "failed to read the initial flash content" unless it's a no-op.I have no idea what happens when the pflash's size exceeds 1MiB. Useful outcomes seem unlikely.
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
I'm not sure where this was coming from but it predates my changes so no idea either.
Quoted 2 lines
Set the flash memory size to 1MiB regardless of image size, to match the physical hardware.
Actually the real hardware seems to have a 512 kB flash chip:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdf
so while you're at it you could change FLASH_SIZE to match that.
Quoted 13 lines
Cc BALATON Zoltan <[email protected]>Signed-off-by Markus Armbruster <[email protected]>---
hw/ppc/sam460ex.c| 23 ++++++++---------------1 file changed, 8 insertions(+), 15 deletions(-)hw/ppc/sam460ex.c +0
-0@@ -92,31 +92,24 @@ struct boot_info {static int sam460ex_load_uboot (void ) {
hw/ppc/sam460ex.c struct boot_info { · line 103
Quoted 10 lines
hw/ppc/sam460ex.c +0
-7DriveInfo *dinfo; -BlockBackend *blk =NULL ; -hwaddr base =FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -long bios_size =FLASH_SIZE ; -int fl_sectors; dinfo =drive_get (IF_PFLASH ,0 ,0 ); -if (dinfo) { - blk =blk_by_legacy_dinfo (dinfo); - bios_size =blk_getlength (blk);
After this maybe the
#include "sysemu/block-backend.h"
can also be dropped from the includes?
hw/ppc/sam460ex.c struct boot_info { · line 100
Quoted 9 lines
hw/ppc/sam460ex.c +4
-5- } - fl_sectors = (bios_size +65535 ) >>16 ; - - if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size, - blk, 64 * KiB, fl_sectors, + if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), + NULL, "sam460ex.flash", FLASH_SIZE, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, FLASH_SIZE / 65536,
Could you keep 64 * KiB instead of 65536 here to match other places?
Regards,
BALATON Zoltan
Quoted 19 lines
hw/ppc/sam460ex.c +4
-31, 0x89, 0x18, 0x0000, 0x0, 1)) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ exit (1 ); } -if (!blk) { +if (!dinfo) {/*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ - base =UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -rom_add_file_fixed (UBOOT_FILENAME , base,-1 ); +rom_add_file_fixed (UBOOT_FILENAME , +UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ), +-1 ); }return 0 ;
Re: [Qemu-devel] [Qemu-ppc] [PATCH 04/10] sam460ex: Don't size flash memory to match backing image
Quoted 16 lines · BALATON Zoltan
Hello,
Quoted 4 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000). Else, it's the size of the image rounded up to the next multiple of 64KiB.Quoted 8 lines
The rounding is actually useless:
pflash_cfi01_realize()fails with "failed to read the initial flash content" unless it's a no-op.I have no idea what happens when the pflash's size exceeds 1MiB. Useful outcomes seem unlikely.
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
Quoted 8 lines
I'm not sure where this was coming from but it predates my changes so no idea either.
Quoted 2 lines
Set the flash memory size to 1MiB regardless of image size, to match the physical hardware.
Actually the real hardware seems to have a 512 kB flash chip:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdf
Fascinating.
<http://www.sam4x0.com/sam460ex.html> confirms.
Quoted 1 line
so while you're at it you could change
FLASH_SIZEto match that.
Leads to more questions, below.
Quoted 19 lines
Quoted 19 lines
Cc BALATON Zoltan <[email protected]>Signed-off-by Markus Armbruster <[email protected]>---
hw/ppc/sam460ex.c| 23 ++++++++---------------1 file changed, 8 insertions(+), 15 deletions(-)hw/ppc/sam460ex.c +0
-4@@ -92,31 +92,24 @@ struct boot_info {static int sam460ex_load_uboot (void ) {DriveInfo *dinfo; -BlockBackend *blk =NULL ; -hwaddr base =FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -long bios_size =FLASH_SIZE ; -int fl_sectors;
Quoted 8 lines
hw/ppc/sam460ex.c struct boot_info { · line 103
Quoted 4 lines
hw/ppc/sam460ex.c +0
-3dinfo =drive_get (IF_PFLASH ,0 ,0 ); -if (dinfo) { - blk =blk_by_legacy_dinfo (dinfo); - bios_size =blk_getlength (blk);After this maybe the
#include "sysemu/block-backend.h"
can also be dropped from the includes?
I'll try.
Quoted 11 lines
hw/ppc/sam460ex.c struct boot_info { · line 100
Quoted 9 lines
hw/ppc/sam460ex.c +4
-5- } - fl_sectors = (bios_size +65535 ) >>16 ; - - if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size, - blk, 64 * KiB, fl_sectors, + if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), + NULL, "sam460ex.flash", FLASH_SIZE, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, FLASH_SIZE / 65536,Could you keep 64 * KiB instead of 65536 here to match other places?
Sure (editing accident).
Quoted 21 lines
Regards,
BALATON ZoltanQuoted 18 lines
hw/ppc/sam460ex.c +4
-31, 0x89, 0x18, 0x0000, 0x0, 1)) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ exit (1 ); } -if (!blk) { +if (!dinfo) {/*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ - base =UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -rom_add_file_fixed (UBOOT_FILENAME , base,-1 ); +rom_add_file_fixed (UBOOT_FILENAME , +UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ), +-1 ); }return 0 ;
Let's have a look at the resulting function:
static int sam460ex_load_uboot(void)
{
DriveInfo *dinfo;
dinfo = drive_get(IF_PFLASH, 0, 0);
if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32),
"sam460ex.flash", FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
65536,
1, 0x89, 0x18, 0x0000, 0x0, 1)) {
error_report("Error registering flash memory");
/* XXX: return an error instead? */
exit(1);
}
if (!dinfo) {
/*error_report("No flash image given with the 'pflash' parameter,"
" using default u-boot image");*/
rom_add_file_fixed(UBOOT_FILENAME,
UBOOT_LOAD_BASE | ((hwaddr)FLASH_BASE_H << 32),
-1);
}
return 0;
}This first creates 1MiB of flash memory mapped at the end of the 32-bit address space (0xFFF00000..0xFFFFFFFF).
If_PFLASH unit 0 is defined, the flash memory is initialized from that block backend.
Else, it's initialized to zero. And then 512KiB of ROM gets mapped on top of its second half (0xFFF80000..0xFFFFFFFF), initialized from u-boot-sam460-20100605.bin (which we build).
This doesn't smell right.
I propose to do the following: if IF_PFLASH unit 0 is defined, create 512KiB of flash memory mapped at the end of the 32-bit address space, else, create 512KiB of ROM there.
Okay?
Re: [Qemu-devel] [Qemu-ppc] [PATCH 04/10] sam460ex: Don't size flash memory to match backing image
Quoted 100 lines · Markus Armbruster
Quoted 14 lines · BALATON Zoltan
Quoted 4 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000). Else, it's the size of the image rounded up to the next multiple of 64KiB.Quoted 8 lines
The rounding is actually useless:
pflash_cfi01_realize()fails with "failed to read the initial flash content" unless it's a no-op.I have no idea what happens when the pflash's size exceeds 1MiB. Useful outcomes seem unlikely.
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
Quoted 8 lines
I'm not sure where this was coming from but it predates my changes so no idea either.
Quoted 2 lines
Set the flash memory size to 1MiB regardless of image size, to match the physical hardware.
Actually the real hardware seems to have a 512 kB flash chip:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdfFascinating.
<http://www.sam4x0.com/sam460ex.html> confirms.
Quoted 1 line
so while you're at it you could change
FLASH_SIZEto match that.Leads to more questions, below.
Quoted 19 lines
Quoted 19 lines
Cc BALATON Zoltan <[email protected]>Signed-off-by Markus Armbruster <[email protected]>---
hw/ppc/sam460ex.c| 23 ++++++++---------------1 file changed, 8 insertions(+), 15 deletions(-)hw/ppc/sam460ex.c +0
-4@@ -92,31 +92,24 @@ struct boot_info {static int sam460ex_load_uboot (void ) {DriveInfo *dinfo; -BlockBackend *blk =NULL ; -hwaddr base =FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -long bios_size =FLASH_SIZE ; -int fl_sectors;Quoted 8 lines
hw/ppc/sam460ex.c struct boot_info { · line 103
Quoted 4 lines
hw/ppc/sam460ex.c +0
-3dinfo =drive_get (IF_PFLASH ,0 ,0 ); -if (dinfo) { - blk =blk_by_legacy_dinfo (dinfo); - bios_size =blk_getlength (blk);After this maybe the
#include "sysemu/block-backend.h"
can also be dropped from the includes?I'll try.
Quoted 11 lines
hw/ppc/sam460ex.c struct boot_info { · line 100
Quoted 9 lines
hw/ppc/sam460ex.c +4
-5- } - fl_sectors = (bios_size +65535 ) >>16 ; - - if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size, - blk, 64 * KiB, fl_sectors, + if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), + NULL, "sam460ex.flash", FLASH_SIZE, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, FLASH_SIZE / 65536,Could you keep 64 * KiB instead of 65536 here to match other places?
Sure (editing accident).
Quoted 21 lines
Regards,
BALATON ZoltanQuoted 18 lines
hw/ppc/sam460ex.c +4
-31, 0x89, 0x18, 0x0000, 0x0, 1)) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ exit (1 ); } -if (!blk) { +if (!dinfo) {/*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ - base =UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ); -rom_add_file_fixed (UBOOT_FILENAME , base,-1 ); +rom_add_file_fixed (UBOOT_FILENAME , +UBOOT_LOAD_BASE | ((hwaddr )FLASH_BASE_H <<32 ), +-1 ); }return 0 ;Let's have a look at the resulting function:
Quoted 8 lines
static int sam460ex_load_uboot(void) { DriveInfo *dinfo;dinfo = drive_get(IF_PFLASH, 0, 0); if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
There's still a blk_* function here which I did not notice so the "sysemu/block-backend.h" is probably still needed.
Quoted 21 lines
65536, 1, 0x89, 0x18, 0x0000, 0x0, 1)) { error_report("Error registering flash memory"); /* XXX: return an error instead? */ exit(1); } if (!dinfo) { /*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ rom_add_file_fixed(UBOOT_FILENAME, UBOOT_LOAD_BASE | ((hwaddr)FLASH_BASE_H << 32), -1); } return 0;}
This first creates 1MiB of flash memory mapped at the end of the 32-bit address space (0xFFF00000..0xFFFFFFFF).
Quoted 8 lines
If_PFLASHunit 0 is defined, the flash memory is initialized from that block backend.Else, it's initialized to zero. And then 512KiB of ROM gets mapped on top of its second half (0xFFF80000..0xFFFFFFFF), initialized from u-boot-sam460-20100605.bin (which we build).
This doesn't smell right.
Unfortunately I don't know much about how this should work. Maybe François can remember where this comes from, this was already there when I started working on it, but I suspect maybe he's copied it from some other board in QEMU as well. The sam460ex was based on ppc440_bamboo but that does not seem to have flash ROM. Memory SPD EEPROM came from mips_malta (cleaned up since but it shows that that was also used as inspiration) but that's also not the same so maybe it was adapted for sam460ex or came from some other example in QEMU. This was already there in François's initial commit:
and later was slightly modified (maybe to rebase for changes in QEMU):
The comment says these values come from U-Boot:
and that indeed has flash size of 1 MB but then builds an image that's exactly 512 kB which should be mapped at end of 4GB because the initial program counter of the CPU is 0xfffffffc and board has a 512kB flash chip as well.
Quoted 5 lines
I propose to do the following: if
IF_PFLASHunit 0 is defined, create 512KiB of flash memory mapped at the end of the 32-bit address space, else, create 512KiB of ROM there.Okay?
AFAIU the above U-Boot could handle up to 1MB of ROM but board has a 512kB chip so probably it makes sense to use 512k here. However since this is not well understood (at least by me) I'm not asking you to do that and maybe just leave it as it is now. This can be revisited when NVRAM is implemented later as this may be related to that (or not) this would need understanding of some details I don't have yet. But if you feel confident enough to clean this up feel free to go ahead.
Thank you,
BALATON Zoltan
Re: [Qemu-devel] [Qemu-ppc] [PATCH 04/10] sam460ex: Don't size flash memory to match backing image
Quoted 32 lines · BALATON Zoltan
Quoted 31 lines · Markus Armbruster
Quoted 14 lines · BALATON Zoltan
Quoted 4 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000). Else, it's the size of the image rounded up to the next multiple of 64KiB.Quoted 8 lines
The rounding is actually useless:
pflash_cfi01_realize()fails with "failed to read the initial flash content" unless it's a no-op.I have no idea what happens when the pflash's size exceeds 1MiB. Useful outcomes seem unlikely.
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
Quoted 8 lines
I'm not sure where this was coming from but it predates my changes so no idea either.
Quoted 2 lines
Set the flash memory size to 1MiB regardless of image size, to match the physical hardware.
Actually the real hardware seems to have a 512 kB flash chip:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdfFascinating.
<http://www.sam4x0.com/sam460ex.html> confirms.
Quoted 1 line
so while you're at it you could change
FLASH_SIZEto match that.Leads to more questions, below.
[...]
Quoted 10 lines
Quoted 10 lines
Let's have a look at the resulting function:
static int sam460ex_load_uboot(void) { DriveInfo *dinfo;dinfo = drive_get(IF_PFLASH, 0, 0); if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
[...]
Quoted 61 lines
Quoted 21 lines
65536, 1, 0x89, 0x18, 0x0000, 0x0, 1)) { error_report("Error registering flash memory"); /* XXX: return an error instead? */ exit(1); } if (!dinfo) { /*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ rom_add_file_fixed(UBOOT_FILENAME, UBOOT_LOAD_BASE | ((hwaddr)FLASH_BASE_H << 32), -1); } return 0;}
This first creates 1MiB of flash memory mapped at the end of the 32-bit address space (0xFFF00000..0xFFFFFFFF).
Quoted 8 lines
If_PFLASHunit 0 is defined, the flash memory is initialized from that block backend.Else, it's initialized to zero. And then 512KiB of ROM gets mapped on top of its second half (0xFFF80000..0xFFFFFFFF), initialized from u-boot-sam460-20100605.bin (which we build).
This doesn't smell right.
Unfortunately I don't know much about how this should work. Maybe François can remember where this comes from, this was already there when I started working on it, but I suspect maybe he's copied it from some other board in QEMU as well. The sam460ex was based on
ppc440_bamboobut that does not seem to have flash ROM. Memory SPD EEPROM came frommips_malta(cleaned up since but it shows that that was also used as inspiration) but that's also not the same so maybe it was adapted for sam460ex or came from some other example in QEMU. This was already there in François's initial commit:and later was slightly modified (maybe to rebase for changes in QEMU):
The comment says these values come from U-Boot:
and that indeed has flash size of 1 MB but then builds an image that's exactly 512 kB which should be mapped at end of 4GB because the initial program counter of the CPU is
0xfffffffcand board has a 512kB flash chip as well.Quoted 5 lines
I propose to do the following: if
IF_PFLASHunit 0 is defined, create 512KiB of flash memory mapped at the end of the 32-bit address space, else, create 512KiB of ROM there.Okay?
Quoted 7 lines
AFAIU the above U-Boot could handle up to 1MB of ROM but board has a 512kB chip so probably it makes sense to use 512k here. However since this is not well understood (at least by me) I'm not asking you to do that and maybe just leave it as it is now. This can be revisited when NVRAM is implemented later as this may be related to that (or not) this would need understanding of some details I don't have yet. But if you feel confident enough to clean this up feel free to go ahead.
Then let's use my patch as is, plus a FIXME comment explaining the situation. Okay?
Re: [Qemu-devel] [Qemu-ppc] [PATCH 04/10] sam460ex: Don't size flash memory to match backing image
Quoted 114 lines · Markus Armbruster
Quoted 32 lines · BALATON Zoltan
Quoted 31 lines · Markus Armbruster
Quoted 14 lines · BALATON Zoltan
Quoted 4 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000). Else, it's the size of the image rounded up to the next multiple of 64KiB.Quoted 8 lines
The rounding is actually useless:
pflash_cfi01_realize()fails with "failed to read the initial flash content" unless it's a no-op.I have no idea what happens when the pflash's size exceeds 1MiB. Useful outcomes seem unlikely.
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
Quoted 8 lines
I'm not sure where this was coming from but it predates my changes so no idea either.
Quoted 2 lines
Set the flash memory size to 1MiB regardless of image size, to match the physical hardware.
Actually the real hardware seems to have a 512 kB flash chip:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdfFascinating.
<http://www.sam4x0.com/sam460ex.html> confirms.
Quoted 1 line
so while you're at it you could change
FLASH_SIZEto match that.Leads to more questions, below.
[...]
Quoted 10 lines
Quoted 10 lines
Let's have a look at the resulting function:
static int sam460ex_load_uboot(void) { DriveInfo *dinfo;dinfo = drive_get(IF_PFLASH, 0, 0); if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,[...]
Quoted 61 lines
Quoted 21 lines
65536, 1, 0x89, 0x18, 0x0000, 0x0, 1)) { error_report("Error registering flash memory"); /* XXX: return an error instead? */ exit(1); } if (!dinfo) { /*error_report("No flash image given with the 'pflash' parameter," " using default u-boot image");*/ rom_add_file_fixed(UBOOT_FILENAME, UBOOT_LOAD_BASE | ((hwaddr)FLASH_BASE_H << 32), -1); } return 0;}
This first creates 1MiB of flash memory mapped at the end of the 32-bit address space (0xFFF00000..0xFFFFFFFF).
Quoted 8 lines
If_PFLASHunit 0 is defined, the flash memory is initialized from that block backend.Else, it's initialized to zero. And then 512KiB of ROM gets mapped on top of its second half (0xFFF80000..0xFFFFFFFF), initialized from u-boot-sam460-20100605.bin (which we build).
This doesn't smell right.
Unfortunately I don't know much about how this should work. Maybe François can remember where this comes from, this was already there when I started working on it, but I suspect maybe he's copied it from some other board in QEMU as well. The sam460ex was based on
ppc440_bamboobut that does not seem to have flash ROM. Memory SPD EEPROM came frommips_malta(cleaned up since but it shows that that was also used as inspiration) but that's also not the same so maybe it was adapted for sam460ex or came from some other example in QEMU. This was already there in François's initial commit:and later was slightly modified (maybe to rebase for changes in QEMU):
The comment says these values come from U-Boot:
and that indeed has flash size of 1 MB but then builds an image that's exactly 512 kB which should be mapped at end of 4GB because the initial program counter of the CPU is
0xfffffffcand board has a 512kB flash chip as well.Quoted 5 lines
I propose to do the following: if
IF_PFLASHunit 0 is defined, create 512KiB of flash memory mapped at the end of the 32-bit address space, else, create 512KiB of ROM there.Okay?
Quoted 7 lines
AFAIU the above U-Boot could handle up to 1MB of ROM but board has a 512kB chip so probably it makes sense to use 512k here. However since this is not well understood (at least by me) I'm not asking you to do that and maybe just leave it as it is now. This can be revisited when NVRAM is implemented later as this may be related to that (or not) this would need understanding of some details I don't have yet. But if you feel confident enough to clean this up feel free to go ahead.
Quoted 2 lines
Then let's use my patch as is, plus a FIXME comment explaining the situation. Okay?
Yes, that would be fine.
Thank you,
BALATON Zoltan
PATCH 5/10 ppc405_boards: Don't size flash memory to match backing image
In reply to Markus ArmbrusterMachine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because pflash_cfi02_realize() fails with "failed to read the initial flash content" unless the rounding is a no-op.
If the image size exceeds 0x80000 Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.
Map the flash memory at fixed address 0xFFF80000 with size 512KiB, regardless of image size, to match the physical hardware.
Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that pflash_cfi02_realize() fails with "failed to read the initial flash content" for images smaller than 32MiB.
Map the boot flash memory at fixed address 0xFFE00000 with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.
--- hw/ppc/ppc405_boards.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)
hw/ppc/ppc405_boards.c +16 -37
@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();
@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register parallel flash\n" );#endif -pflash_cfi02_register ((uint32_t )(-bios_size), + bios_size =0x80000 ; +pflash_cfi02_register (0xFFF80000 ,NULL ,"ef405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,2 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); - fl_idx++; } else#endif {
@@ -455,7 +448,7 @@ static void taihu_405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors; +int fl_idx;DriveInfo *dinfo;/* RAM is soldered to the board so the size cannot be changed */
@@ -486,21 +479,14 @@ static void taihu_405ep_init(MachineState *machine)#if defined(USE_FLASH_BIOS ) dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 2MB */ -// bios_size = 2 * 1024 * 1024; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register boot flash\n" );#endif -pflash_cfi02_register ((uint32_t )(-bios_size), + bios_size =2 * MiB; +pflash_cfi02_register (0xFFE00000 ,NULL ,"taihu_405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;
@@ -536,20 +522,13 @@ static void taihu_405ep_init(MachineState *machine)/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 32MB */ bios_size =32 * MiB; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr " TARGET_FMT_lx" '%s'\n" , - fl_idx, bios_size, (target_ulong )0xfc000000 , -blk_name (blk)); +printf ("Register application flash\n" #endif pflash_cfi02_register(0xfc000000 ,NULL ,"taihu_405ep.flash" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
Quoted 21 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that
pflash_cfi02_realize()fails with "failed to read the initial flash content" for images smaller than 32MiB.
Quoted 6 lines
Map the boot flash memory at fixed address
0xFFE00000with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 110 lines
--- hw/ppc/ppc405_boards.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)hw/ppc/ppc405_boards.c +16
-37@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register parallel flash\n" );#endif -pflash_cfi02_register ((uint32_t )(-bios_size), + bios_size =0x80000 ; +pflash_cfi02_register (0xFFF80000 ,NULL ,"ef405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,2 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); - fl_idx++; } else#endif {@@ -455,7 +448,7 @@ static void taihu_405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors; +int fl_idx;DriveInfo *dinfo;/* RAM is soldered to the board so the size cannot be changed */ @@ -486,21 +479,14 @@ static void taihu_405ep_init(MachineState *machine)#if defined(USE_FLASH_BIOS ) dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 2MB */ -// bios_size = 2 * 1024 * 1024; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register boot flash\n" );#endif -pflash_cfi02_register ((uint32_t )(-bios_size), + bios_size =2 * MiB; +pflash_cfi02_register (0xFFE00000 ,NULL ,"taihu_405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;@@ -536,20 +522,13 @@ static void taihu_405ep_init(MachineState *machine)/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 32MB */ bios_size =32 * MiB; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr " TARGET_FMT_lx" '%s'\n" , - fl_idx, bios_size, (target_ulong )0xfc000000 , -blk_name (blk)); +printf ("Register application flash\n" #endif pflash_cfi02_register(0xfc000000 ,NULL ,"taihu_405ep.flash" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [Qemu-ppc] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
In reply to Markus ArmbrusterQuoted 11 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.
If PPC405 behaves the same as PPC440 and starts at 0xfffffffc then this won't boot. It's maybe better to keep 2^32 - image_size but assert image is not bigger than 512kB. But I don't know anything about these boards so just sharing this comment for your consideration. I'm fine with any decision you take.
Regards,
BALATON Zoltan
Quoted 126 lines
Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that
pflash_cfi02_realize()fails with "failed to read the initial flash content" for images smaller than 32MiB.Map the boot flash memory at fixed address
0xFFE00000with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>---
hw/ppc/ppc405_boards.c| 53 +++++++++++++-----------------------------1 file changed, 16 insertions(+), 37 deletions(-)hw/ppc/ppc405_boards.c +16
-37@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register parallel flash\n" );#endif -pflash_cfi02_register ((uint32_t )(-bios_size), + bios_size =0x80000 ; +pflash_cfi02_register (0xFFF80000 ,NULL ,"ef405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,2 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); - fl_idx++; } else#endif {@@ -455,7 +448,7 @@ static void taihu_405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors; +int fl_idx;DriveInfo *dinfo;/* RAM is soldered to the board so the size cannot be changed */ @@ -486,21 +479,14 @@ static void taihu_405ep_init(MachineState *machine)#if defined(USE_FLASH_BIOS ) dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 2MB */ -// bios_size = 2 * 1024 * 1024; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register boot flash\n" );#endif -pflash_cfi02_register ((uint32_t )(-bios_size), + bios_size =2 * MiB; +pflash_cfi02_register (0xFFE00000 ,NULL ,"taihu_405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;@@ -536,20 +522,13 @@ static void taihu_405ep_init(MachineState *machine)/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 32MB */ bios_size =32 * MiB; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr " TARGET_FMT_lx" '%s'\n" , - fl_idx, bios_size, (target_ulong )0xfc000000 , -blk_name (blk)); +printf ("Register application flash\n" #endif pflash_cfi02_register(0xfc000000 ,NULL ,"taihu_405ep.flash" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +65536 , bios_size /65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;
Re: [Qemu-devel] [Qemu-ppc] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
Quoted 10 lines · BALATON Zoltan
Quoted 9 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.
Quoted 8 lines
Quoted 2 lines
Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.If PPC405 behaves the same as PPC440 and starts at
0xfffffffcthen this won't boot. It's maybe better to keep 2^32 -image_sizebut assert image is not bigger than 512kB. But I don't know anything about these boards so just sharing this comment for your consideration. I'm fine with any decision you take.
If the image is smaller than 512KiB, pflash_cfi02_realize() fails with "failed to read the initial flash content".
Alex Bennée has a patch that'll make it fail for any size mismatch, with a much nicer error message. I like it; silently truncating firmware images is unlikely to be useful.
For what it's worth, my patch brings this board into line with most other boards: create flash memory of fixed size at a fixed address, matching the physical machine we emulate.
Re: [Qemu-devel] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
In reply to Markus ArmbrusterQuoted 56 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that
pflash_cfi02_realize()fails with "failed to read the initial flash content" for images smaller than 32MiB.Map the boot flash memory at fixed address
0xFFE00000with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/ppc/ppc405_boards.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)hw/ppc/ppc405_boards.c +2
-6@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk);
hw/ppc/ppc405_boards.c static void ref405ep_init(MachineState *machine) · line 194
Quoted 10 lines
hw/ppc/ppc405_boards.c +2
-6- fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT -printf ("Register parallel flash %d size %lx" -" at addr %lx '%s' %d\n" , - fl_idx, bios_size, -bios_size, -blk_name (blk), fl_sectors); +printf ("Register parallel flash\n" );#endif - pflash_cfi02_register((uint32_t)(-bios_size), + bios_size =0x80000 ;
bios_size = 8 * MiB?
hw/ppc/ppc405_boards.c static void ref405ep_init(MachineState *machine) · line 198
Quoted 5 lines
hw/ppc/ppc405_boards.c +3
-1+ pflash_cfi02_register(0xFFF80000, NULL, "ef405ep.bios", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,
64 * KiB?
Quoted 29 lines
hw/ppc/ppc405_boards.c +1
-112 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); - fl_idx++; } else#endif {@@ -455,7 +448,7 @@ static void taihu_405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors; +int fl_idx;DriveInfo *dinfo;/* RAM is soldered to the board so the size cannot be changed */ @@ -486,21 +479,14 @@ static void taihu_405ep_init(MachineState *machine)#if defined(USE_FLASH_BIOS ) dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 2MB */ -// bios_size = 2 * 1024 * 1024; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT - printf("Register parallel flash %d size %lx" - " at addr %lx '%s' %d\n", - fl_idx, bios_size, -bios_size,
hw/ppc/ppc405_boards.c static void taihu_405ep_init(MachineState *machine) · line 489
Quoted 10 lines
hw/ppc/ppc405_boards.c +5
-3- blk_name(blk), fl_sectors); +printf ("Register boot flash\n" );#endif - pflash_cfi02_register((uint32_t)(-bios_size), + bios_size =2 * MiB; + pflash_cfi02_register(0xFFE00000, NULL, "taihu_405ep.bios", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,
64 * KiB
Quoted 14 lines
hw/ppc/ppc405_boards.c +0
-54 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;@@ -536,20 +522,13 @@ static void taihu_405ep_init(MachineState *machine)/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 32MB */ bios_size =32 * MiB; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT
hw/ppc/ppc405_boards.c static void taihu_405ep_init(MachineState *machine) · line 531
Quoted 10 lines
hw/ppc/ppc405_boards.c +3
-5-printf ("Register parallel flash %d size %lx" -" at addr " TARGET_FMT_lx" '%s'\n" , - fl_idx, bios_size, (target_ulong )0xfc000000 , -blk_name (blk)); + printf("Register application flash\n" #endif pflash_cfi02_register(0xfc000000, NULL, "taihu_405ep.flash", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,
64 * KiB
hw/ppc/ppc405_boards.c static void taihu_405ep_init(MachineState *machine) · line 492
Quoted 3 lines
hw/ppc/ppc405_boards.c +0
-04 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;
--
Alex Bennée
Re: [Qemu-devel] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
Quoted 62 lines · Alex Bennée
Quoted 60 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that
pflash_cfi02_realize()fails with "failed to read the initial flash content" for images smaller than 32MiB.Map the boot flash memory at fixed address
0xFFE00000with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/ppc/ppc405_boards.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)hw/ppc/ppc405_boards.c +2
-9@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT - printf("Register parallel flash %d size %lx" - " at addr %lx '%s' %d\n",
Quoted 8 lines
hw/ppc/ppc405_boards.c static void ref405ep_init(MachineState *machine) · line 194
Quoted 6 lines
hw/ppc/ppc405_boards.c +2
-3- fl_idx, bios_size, -bios_size, - blk_name(blk), fl_sectors); +printf ("Register parallel flash\n" );#endif - pflash_cfi02_register((uint32_t)(-bios_size), + bios_size =0x80000 ;
bios_size= 8 * MiB?
The next line has base address 0xFFF80000. I picked 0x80000 to make 0xFFF80000 + 0x80000 == 0 mod 2^32 more obvious.
If I change 0x80000 to 8 * MiB, the size is more obvious, but "at end of 32 bit address space" less so.
If I additionally change the base address back to ((uint32_t)-bios_size, "at end of 32 bit address space" is obvious again, but the actual base address less so.
I don't really care myself. David, you're the maintainer, do you have a preference?
Quoted 7 lines
hw/ppc/ppc405_boards.c static void ref405ep_init(MachineState *machine) · line 198
Quoted 5 lines
hw/ppc/ppc405_boards.c +3
-1+ pflash_cfi02_register(0xFFF80000, NULL, "ef405ep.bios", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,64 * KiB?
David, same question (two additional instances below).
Quoted 76 lines
Quoted 29 lines
hw/ppc/ppc405_boards.c +1
-112 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); - fl_idx++; } else#endif {@@ -455,7 +448,7 @@ static void taihu_405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors; +int fl_idx;DriveInfo *dinfo;/* RAM is soldered to the board so the size cannot be changed */ @@ -486,21 +479,14 @@ static void taihu_405ep_init(MachineState *machine)#if defined(USE_FLASH_BIOS ) dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 2MB */ -// bios_size = 2 * 1024 * 1024; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT - printf("Register parallel flash %d size %lx" - " at addr %lx '%s' %d\n", - fl_idx, bios_size, -bios_size,hw/ppc/ppc405_boards.c static void taihu_405ep_init(MachineState *machine) · line 489
Quoted 10 lines
hw/ppc/ppc405_boards.c +5
-3- blk_name(blk), fl_sectors); +printf ("Register boot flash\n" );#endif - pflash_cfi02_register((uint32_t)(-bios_size), + bios_size =2 * MiB; + pflash_cfi02_register(0xFFE00000, NULL, "taihu_405ep.bios", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,64 * KiB
Quoted 14 lines
hw/ppc/ppc405_boards.c +0
-54 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;@@ -536,20 +522,13 @@ static void taihu_405ep_init(MachineState *machine)/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); -/* XXX: should check that size is 32MB */ bios_size =32 * MiB; - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT hw/ppc/ppc405_boards.c static void taihu_405ep_init(MachineState *machine) · line 531
Quoted 10 lines
hw/ppc/ppc405_boards.c +3
-5-printf ("Register parallel flash %d size %lx" -" at addr " TARGET_FMT_lx" '%s'\n" , - fl_idx, bios_size, (target_ulong )0xfc000000 , -blk_name (blk)); + printf("Register application flash\n" #endif pflash_cfi02_register(0xfc000000, NULL, "taihu_405ep.flash", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,64 * KiB
hw/ppc/ppc405_boards.c static void taihu_405ep_init(MachineState *machine) · line 492
Quoted 3 lines
hw/ppc/ppc405_boards.c +0
-04 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;--
Alex Bennée
Re: [Qemu-devel] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
Quoted 76 lines · Markus Armbruster
Quoted 62 lines · Alex Bennée
Quoted 60 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that
pflash_cfi02_realize()fails with "failed to read the initial flash content" for images smaller than 32MiB.Map the boot flash memory at fixed address
0xFFE00000with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/ppc/ppc405_boards.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)hw/ppc/ppc405_boards.c +2
-9@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT - printf("Register parallel flash %d size %lx" - " at addr %lx '%s' %d\n",Quoted 8 lines
hw/ppc/ppc405_boards.c static void ref405ep_init(MachineState *machine) · line 194
Quoted 6 lines
hw/ppc/ppc405_boards.c +2
-3- fl_idx, bios_size, -bios_size, - blk_name(blk), fl_sectors); +printf ("Register parallel flash\n" );#endif - pflash_cfi02_register((uint32_t)(-bios_size), + bios_size =0x80000 ;
bios_size= 8 * MiB?The next line has base address
0xFFF80000. I picked0x80000to make0xFFF80000+0x80000== 0 mod 2^32 more obvious.
Quoted 6 lines
If I change
0x80000to 8 * MiB, the size is more obvious, but "at end of 32 bit address space" less so.If I additionally change the base address back to ((uint32_t)-bios_size, "at end of 32 bit address space" is obvious again, but the actual base address less so.
I have a weak preference for ((uint32_t)-bios_size), with bios_size = 8 * MiB.
Quoted 10 lines
I don't really care myself. David, you're the maintainer, do you have a preference?
Quoted 6 lines
Quoted 5 lines
hw/ppc/ppc405_boards.c +3
-1+ pflash_cfi02_register(0xFFF80000, NULL, "ef405ep.bios", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,
Quoted 3 lines
Quoted 1 line
64 * KiB?
David, same question (two additional instances below).
Here I think 64 * KiB would be nice in each of those places. Again, only a weak preference.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH 05/10] ppc405_boards: Don't size flash memory to match backing image
Quoted 97 lines · David Gibson
Quoted 76 lines · Markus Armbruster
Quoted 62 lines · Alex Bennée
Quoted 60 lines · Markus Armbruster
Machine "ref405ep" maps its flash memory at address 2^32 - image size. Image size is rounded up to the next multiple of 64KiB. Useless, because
pflash_cfi02_realize()fails with "failed to read the initial flash content" unless the rounding is a no-op.If the image size exceeds
0x80000Bytes, we overlap first SRAM, then other stuff. No idea how that would play out, but a useful outcomes seem unlikely.Map the flash memory at fixed address
0xFFF80000with size 512KiB, regardless of image size, to match the physical hardware.Machine "taihu" maps its boot flash memory similarly. The code even has a comment /* XXX: should check that size is 2MB */, followed by disabled code to adjust the size to 2MiB regardless of image size.
Its code to map its application flash memory looks the same, except there the XXX comment asks for 32MiB, and the code to adjust the size isn't disabled. Note that
pflash_cfi02_realize()fails with "failed to read the initial flash content" for images smaller than 32MiB.Map the boot flash memory at fixed address
0xFFE00000with size 2MiB, to match the physical hardware. Delete dead code from application flash mapping, and simplify some.Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/ppc/ppc405_boards.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)hw/ppc/ppc405_boards.c +2
-9@@ -158,7 +158,7 @@ static void ref405ep_init(MachineState *machine)target_ulong kernel_base, initrd_base;long kernel_size, initrd_size;int linux_boot; -int fl_idx, fl_sectors, len; +int len;DriveInfo *dinfo;MemoryRegion *sysmem =get_system_memory ();@@ -185,26 +185,19 @@ static void ref405ep_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT printf ("%s: register BIOS\n" , __func__);#endif - fl_idx =0 ;#ifdef USE_FLASH_BIOS - dinfo =drive_get (IF_PFLASH ,0 , fl_idx); + dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) { -BlockBackend *blk =blk_by_legacy_dinfo (dinfo); - - bios_size =blk_getlength (blk); - fl_sectors = (bios_size +65535 ) >>16 ;#ifdef DEBUG_BOARD_INIT - printf("Register parallel flash %d size %lx" - " at addr %lx '%s' %d\n",Quoted 8 lines
hw/ppc/ppc405_boards.c static void ref405ep_init(MachineState *machine) · line 194
Quoted 6 lines
hw/ppc/ppc405_boards.c +2
-3- fl_idx, bios_size, -bios_size, - blk_name(blk), fl_sectors); +printf ("Register parallel flash\n" );#endif - pflash_cfi02_register((uint32_t)(-bios_size), + bios_size =0x80000 ;
bios_size= 8 * MiB?The next line has base address
0xFFF80000. I picked0x80000to make0xFFF80000+0x80000== 0 mod 2^32 more obvious.Quoted 6 lines
If I change
0x80000to 8 * MiB, the size is more obvious, but "at end of 32 bit address space" less so.If I additionally change the base address back to ((uint32_t)-bios_size, "at end of 32 bit address space" is obvious again, but the actual base address less so.
I have a weak preference for ((uint32_t)-bios_size), with
bios_size= 8 * MiB.Quoted 10 lines
I don't really care myself. David, you're the maintainer, do you have a preference?
Quoted 6 lines
Quoted 5 lines
hw/ppc/ppc405_boards.c +3
-1+ pflash_cfi02_register(0xFFF80000, NULL, "ef405ep.bios", bios_size, - blk, 65536, fl_sectors, 1, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + 65536, bios_size / 65536, 1,
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
64 * KiB?
David, same question (two additional instances below).
Here I think 64 * KiB would be nice in each of those places. Again, only a weak preference.
Your weak preference is enough to tip my scales. Thanks!
PATCH 6/10 r2d: Flash memory creation is confused about size, mark FIXME
In reply to Markus Armbrusterpflash_cfi02_register() takes a size in bytes, a block size in bytes and a number of blocks. r2d_init() passes FLASH_SIZE, 16 * KiB, FLASH_SIZE >> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck.
For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
--- hw/sh4/r2d.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
hw/sh4/r2d.c +8 -1
@@ -290,7 +290,14 @@ static void r2d_init(MachineState *machine)/* onboard flash memory */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE, +/* +* FIXME The code is confused about the size of the flash. It +* used to pass FLASH_SIZE bytes, in FLASH_SIZE >> 16 blocks of +* 16KiB each, which does not compute, but creates one of +* FLASH_SIZE / 4 bytes anyway. The current code does so too, but +* whether it's the right size is anybody's guess. +*/ + pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE / 4, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 16 * KiB, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 9 lines · Markus Armbruster
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck.For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
I'm pretty sure that FLASH_SIZE here is supposed to be a byte count of the size of the pflash. That matches what Linux has in arch/sh/boards/mach-r2d/setup.c where it sets up the flash_resource struct.
The r2dplus board is also I think known as RTS7751R2D. That takes us to https://elinux.org/RTS7751R2D_Handling_Manual
(sadly the link to the "hardware manual" is broken).
No idea what the block size would be.
thanks
-- PMM
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 8 lines · Peter Maydell
Quoted 7 lines · Markus Armbruster
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck.
Quoted 7 lines
Quoted 2 lines
For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
I'm pretty sure that
FLASH_SIZEhere is supposed to be a byte count of the size of the pflash. That matches what Linux has inarch/sh/boards/mach-r2d/setup.cwhere it sets up theflash_resourcestruct.
Okay, that's some evidence for size 0x02000000 (32MiB).
However, we've created size (16 * KiB) * (FLASH_SIZE >> 16), i.e. 8MiB, since at least commit 368a354f02b (v1.3.0), possibly since forever.
Quoted 3 lines
The r2dplus board is also I think known as RTS7751R2D. That takes us to https://elinux.org/RTS7751R2D_Handling_Manual
(sadly the link to the "hardware manual" is broken).
Quote section Flash ROM Mapping:
Currently, MTD device mapping on Flash ROM is set as below.
0x00000000-0x00020000 "bootloader"
0x00020000-0x00320000 "mtdblock1" XIP kernel
0x00320000-0x00520000 "mtdblock2"
0x00520000-0x01000000 "mtdblock3" Suggests a size of 0x01000000 (16MiB). Now we have three candidates.
Pick one, any one, and I'll adjust my patch. All I really care about is getting argument @size consistent with arguments @sector_len and @nb_blocs, so I can ditch @nb_blocs in PATCH 09.
Quoted 1 line
No idea what the block size would be.
As long as that's the case, inertia wins by default.
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 9 lines · Markus Armbruster
Quoted 7 lines · Peter Maydell
Quoted 6 lines · Markus Armbruster
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck.
"physical"
Quoted 28 lines
Quoted 8 lines
Quoted 3 lines
For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
I'm pretty sure that
FLASH_SIZEhere is supposed to be a byte count of the size of the pflash. That matches what Linux has inarch/sh/boards/mach-r2d/setup.cwhere it sets up theflash_resourcestruct.Okay, that's some evidence for size
0x02000000(32MiB).However, we've created size (16 * KiB) * (
FLASH_SIZE>> 16), i.e. 8MiB, since at least commit368a354f02b(v1.3.0), possibly since forever.Quoted 3 lines
The r2dplus board is also I think known as RTS7751R2D. That takes us to https://elinux.org/RTS7751R2D_Handling_Manual
(sadly the link to the "hardware manual" is broken).Quote section Flash ROM Mapping:
Currently, MTD device mapping on Flash ROM is set as below. 0x00000000-0x00020000 "bootloader" 0x00020000-0x00320000 "mtdblock1" XIP kernel 0x00320000-0x00520000 "mtdblock2" 0x00520000-0x01000000 "mtdblock3"Suggests a size of
0x01000000(16MiB). Now we have three candidates.
Quoted 7 lines
Pick one, any one, and I'll adjust my patch. All I really care about is getting argument @size consistent with arguments @sector_len and @nb_blocs, so I can ditch @nb_blocs in PATCH 09.
Quoted 1 line
No idea what the block size would be.
As long as that's the case, inertia wins by default.
There is also a paper [*]:
The Renesas Technology R0P751RLC001RL (R2DPLUS) board was used as our target device.
This board is often used to evaluate software for CE devices. The specification is shown below.
CPU: SH7751R(SH4) 240Mhz
RAM: 64Mbyte
Compact flash: 512Mbyte
Flash ROM: 64Mbyte (32Mbyte available for root file system)
Let's use at least 16MB to be able to run the elinux cited kernel.
[*] https://www.kernel.org/doc/ols/2008/ols2008v2-pages-125-134.pdf
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 5 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Markus Armbruster
Quoted 2 lines · Peter Maydell
Quoted 1 line · Markus Armbruster
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck."physical"
Thanks, will fix.
Quoted 38 lines
Quoted 28 lines
Quoted 8 lines
Quoted 3 lines
For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
I'm pretty sure that
FLASH_SIZEhere is supposed to be a byte count of the size of the pflash. That matches what Linux has inarch/sh/boards/mach-r2d/setup.cwhere it sets up theflash_resourcestruct.Okay, that's some evidence for size
0x02000000(32MiB).However, we've created size (16 * KiB) * (
FLASH_SIZE>> 16), i.e. 8MiB, since at least commit368a354f02b(v1.3.0), possibly since forever.Quoted 3 lines
The r2dplus board is also I think known as RTS7751R2D. That takes us to https://elinux.org/RTS7751R2D_Handling_Manual
(sadly the link to the "hardware manual" is broken).Quote section Flash ROM Mapping:
Currently, MTD device mapping on Flash ROM is set as below. 0x00000000-0x00020000 "bootloader" 0x00020000-0x00320000 "mtdblock1" XIP kernel 0x00320000-0x00520000 "mtdblock2" 0x00520000-0x01000000 "mtdblock3"Suggests a size of
0x01000000(16MiB). Now we have three candidates.Quoted 7 lines
Pick one, any one, and I'll adjust my patch. All I really care about is getting argument @size consistent with arguments @sector_len and @nb_blocs, so I can ditch @nb_blocs in PATCH 09.
Quoted 1 line
No idea what the block size would be.
As long as that's the case, inertia wins by default.
There is also a paper [*]:
Quoted 8 lines
The Renesas Technology R0P751RLC001RL (R2DPLUS) board was used as our target device.
This board is often used to evaluate software for CE devices. The specification is shown below.
CPU: SH7751R(SH4) 240Mhz
RAM: 64Mbyte
Compact flash: 512Mbyte
Flash ROM: 64Mbyte (32Mbyte available for root file system)
Candidate #4: 64MiB. Bring 'em on!
Quoted 4 lines
Let's use at least 16MB to be able to run the elinux cited kernel.
[*] https://www.kernel.org/doc/ols/2008/ols2008v2-pages-125-134.pdf
That's a vote for changing the status quo (8 MiB).
Perhaps Magnus, who maintains the machine, can pick a new value for us.
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Hi guys,
Quoted 68 lines · Markus Armbruster
Quoted 5 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Markus Armbruster
Quoted 2 lines · Peter Maydell
Quoted 1 line · Markus Armbruster
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck."physical"
Thanks, will fix.
Quoted 38 lines
Quoted 28 lines
Quoted 8 lines
Quoted 3 lines
For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
I'm pretty sure that
FLASH_SIZEhere is supposed to be a byte count of the size of the pflash. That matches what Linux has inarch/sh/boards/mach-r2d/setup.cwhere it sets up theflash_resourcestruct.Okay, that's some evidence for size
0x02000000(32MiB).However, we've created size (16 * KiB) * (
FLASH_SIZE>> 16), i.e. 8MiB, since at least commit368a354f02b(v1.3.0), possibly since forever.Quoted 3 lines
The r2dplus board is also I think known as RTS7751R2D. That takes us to https://elinux.org/RTS7751R2D_Handling_Manual
(sadly the link to the "hardware manual" is broken).Quote section Flash ROM Mapping:
Currently, MTD device mapping on Flash ROM is set as below. 0x00000000-0x00020000 "bootloader" 0x00020000-0x00320000 "mtdblock1" XIP kernel 0x00320000-0x00520000 "mtdblock2" 0x00520000-0x01000000 "mtdblock3"Suggests a size of
0x01000000(16MiB). Now we have three candidates.Quoted 7 lines
Pick one, any one, and I'll adjust my patch. All I really care about is getting argument @size consistent with arguments @sector_len and @nb_blocs, so I can ditch @nb_blocs in PATCH 09.
Quoted 1 line
No idea what the block size would be.
As long as that's the case, inertia wins by default.
There is also a paper [*]:
Quoted 8 lines
The Renesas Technology R0P751RLC001RL (R2DPLUS) board was used as our target device.
This board is often used to evaluate software for CE devices. The specification is shown below.
CPU: SH7751R(SH4) 240Mhz
RAM: 64Mbyte
Compact flash: 512Mbyte
Flash ROM: 64Mbyte (32Mbyte available for root file system)Candidate #4: 64MiB. Bring 'em on!
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Let's use at least 16MB to be able to run the elinux cited kernel.
[*] https://www.kernel.org/doc/ols/2008/ols2008v2-pages-125-134.pdf
That's a vote for changing the status quo (8 MiB).
Perhaps Magnus, who maintains the machine, can pick a new value for us.
According to the old board user document in Japanese (under NDA) what is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 to CN8. The docs mention s29pl127j60tfi130 but since I don't have the board handy ATM I don't know how the chips are connected.
Hope this helps,
/ magnus
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 77 lines · Magnus Damm
Hi guys,
Quoted 74 lines · Markus Armbruster
Quoted 5 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Markus Armbruster
Quoted 2 lines · Peter Maydell
Quoted 1 line · Markus Armbruster
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck."physical"
Thanks, will fix.
Quoted 38 lines
Quoted 28 lines
Quoted 8 lines
Quoted 3 lines
For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
I'm pretty sure that
FLASH_SIZEhere is supposed to be a byte count of the size of the pflash. That matches what Linux has inarch/sh/boards/mach-r2d/setup.cwhere it sets up theflash_resourcestruct.Okay, that's some evidence for size
0x02000000(32MiB).However, we've created size (16 * KiB) * (
FLASH_SIZE>> 16), i.e. 8MiB, since at least commit368a354f02b(v1.3.0), possibly since forever.Quoted 3 lines
The r2dplus board is also I think known as RTS7751R2D. That takes us to https://elinux.org/RTS7751R2D_Handling_Manual
(sadly the link to the "hardware manual" is broken).Quote section Flash ROM Mapping:
Currently, MTD device mapping on Flash ROM is set as below. 0x00000000-0x00020000 "bootloader" 0x00020000-0x00320000 "mtdblock1" XIP kernel 0x00320000-0x00520000 "mtdblock2" 0x00520000-0x01000000 "mtdblock3"Suggests a size of
0x01000000(16MiB). Now we have three candidates.Quoted 7 lines
Pick one, any one, and I'll adjust my patch. All I really care about is getting argument @size consistent with arguments @sector_len and @nb_blocs, so I can ditch @nb_blocs in PATCH 09.
Quoted 1 line
No idea what the block size would be.
As long as that's the case, inertia wins by default.
There is also a paper [*]:
Quoted 8 lines
The Renesas Technology R0P751RLC001RL (R2DPLUS) board was used as our target device.
This board is often used to evaluate software for CE devices. The specification is shown below.
CPU: SH7751R(SH4) 240Mhz
RAM: 64Mbyte
Compact flash: 512Mbyte
Flash ROM: 64Mbyte (32Mbyte available for root file system)Candidate #4: 64MiB. Bring 'em on!
Quoted 4 lines
Let's use at least 16MB to be able to run the elinux cited kernel.
[*] https://www.kernel.org/doc/ols/2008/ols2008v2-pages-125-134.pdf
That's a vote for changing the status quo (8 MiB).
Quoted 8 lines
Quoted 1 line
Perhaps Magnus, who maintains the machine, can pick a new value for us.
According to the old board user document in Japanese (under NDA) what is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 to CN8. The docs mention s29pl127j60tfi130 but since I don't have the board handy ATM I don't know how the chips are connected.
Hope this helps,
If you want me to change our emulated flash memory's size, please give me a number.
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 9 lines · Markus Armbruster
Quoted 8 lines · Magnus Damm
Quoted 1 line · Markus Armbruster
Perhaps Magnus, who maintains the machine, can pick a new value for us.
According to the old board user document in Japanese (under NDA) what is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 to CN8. The docs mention s29pl127j60tfi130 but since I don't have the board handy ATM I don't know how the chips are connected.
Quoted 4 lines
Quoted 1 line
Hope this helps,
If you want me to change our emulated flash memory's size, please give me a number.
datasheet "S29PL-J 002-00615 Rev. *E":
https://www.cypress.com/file/207091/download
The S29PL127J60TFI130 is a 128Mbit NOR pflash addressable in words of 16bit.
128Mbit = 16 MiB
At least it matches the "RTS7751R2D Handling Manual"!
https://elinux.org/RTS7751R2D_Handling_Manual#Kernel_start_from_FROM_extension_card_.28Kernel_space_XIP.29
PL127J:
- 4 Banks
-> we don't model banks.
- sectors of 4Kw and 32Kw
-> we don't model different sector size and only use the
biggest available
sector_size = 32Kw = 64KiB // sector_len
(naive) sector_count = 256 // nb_blocs
ManufID: 0001h DeviceID: 227Eh 2220h 2200h
I understand "connected via a 32-bit bus and CS0 to CN8" as the full device wordsize is addressable, so this device
So in pflash_cfi02_register() format:
- name = "FROM (Area0)"
- size = 16 * MiB
- sector_len = 64 * KiB
- nb_blocs = 256
- nb_mappings = 1? /* Machine specific... */
- width = 2
- id0 = 0x0001
- id1 = 0x227e
- id2 = 0x2220
- id3 = 0x2200
- unlock_addr0 = 0x555,
- unlock_addr1 = 0x2aa
- be = 0 /* Arch specific... */
Which hopefully is very similar to what we currently use :)
Regards,
Phil.
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 57 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Markus Armbruster
Quoted 8 lines · Magnus Damm
Quoted 1 line · Markus Armbruster
Perhaps Magnus, who maintains the machine, can pick a new value for us.
According to the old board user document in Japanese (under NDA) what is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 to CN8. The docs mention s29pl127j60tfi130 but since I don't have the board handy ATM I don't know how the chips are connected.
Quoted 4 lines
Quoted 1 line
Hope this helps,
If you want me to change our emulated flash memory's size, please give me a number.
datasheet "S29PL-J 002-00615 Rev. *E":
https://www.cypress.com/file/207091/downloadThe S29PL127J60TFI130 is a 128Mbit NOR pflash addressable in words of 16bit.
128Mbit = 16 MiB
At least it matches the "RTS7751R2D Handling Manual"!
https://elinux.org/RTS7751R2D_Handling_Manual#Kernel_start_from_FROM_extension_card_.28Kernel_space_XIP.29PL127J:
- 4 Banks
-> we don't model banks.
- sectors of 4Kw and 32Kw
-> we don't model different sector size and only use the
biggest available
sector_size= 32Kw = 64KiB //sector_len
(naive)sector_count= 256 //nb_blocsManufID: 0001h DeviceID: 227Eh 2220h 2200hI understand "connected via a 32-bit bus and CS0 to CN8" as the full device wordsize is addressable, so this device
So in
pflash_cfi02_register()format:- name = "FROM (Area0)"
- size = 16 * MiB
-sector_len= 64 * KiB
-nb_blocs= 256
-nb_mappings= 1? /* Machine specific... */
- width = 2
- id0 =0x0001
- id1 =0x227e
- id2 =0x2220
- id3 =0x2200
-unlock_addr0=0x555,
-unlock_addr1=0x2aa
- be = 0 /* Arch specific... */
Quoted 1 line
Which hopefully is very similar to what we currently use :)
'fraid not:
$ qemu-system-sh4 -M r2d -display none -S -monitor stdio
QEMU 3.1.50 monitor - type 'help' for more information
(qemu) info qtree
[...]
dev: cfi.pflash02, id ""
drive = ""
num-blocks = 512 (0x200) <--- instead of 256
sector-length = 16384 (0x4000) <--- instead of 65536
width = 4 (0x4) <--- instead of 2
mappings = 1 (0x1)
big-endian = 0 (0x0)
id0 = 0 (0x0) <--- instead of 0x0001
id1 = 0 (0x0) <--- instead of 0x227e
id2 = 0 (0x0) <--- instead of 0x2220
id3 = 0 (0x0) <--- instead of 0x2200
unlock-addr0 = 1365 (0x555)
unlock-addr1 = 682 (0x2aa)
name = "r2d.flash" <--- instead of "FROM (Area0)"
mmio 0000000000000000/0000000000800000Not shown: size is num-blocks * sector-length = 512 * 16384 = 8MiB instead of 16MiB.
Which properties would you like me to change, and how?
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 58 lines · Markus Armbruster
Quoted 57 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Markus Armbruster
Quoted 8 lines · Magnus Damm
Quoted 1 line · Markus Armbruster
Perhaps Magnus, who maintains the machine, can pick a new value for us.
According to the old board user document in Japanese (under NDA) what is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 to CN8. The docs mention s29pl127j60tfi130 but since I don't have the board handy ATM I don't know how the chips are connected.
Quoted 4 lines
Quoted 1 line
Hope this helps,
If you want me to change our emulated flash memory's size, please give me a number.
datasheet "S29PL-J 002-00615 Rev. *E":
https://www.cypress.com/file/207091/downloadThe S29PL127J60TFI130 is a 128Mbit NOR pflash addressable in words of 16bit.
128Mbit = 16 MiB
At least it matches the "RTS7751R2D Handling Manual"!
https://elinux.org/RTS7751R2D_Handling_Manual#Kernel_start_from_FROM_extension_card_.28Kernel_space_XIP.29PL127J:
- 4 Banks
-> we don't model banks.
- sectors of 4Kw and 32Kw
-> we don't model different sector size and only use the
biggest available
sector_size= 32Kw = 64KiB //sector_len
(naive)sector_count= 256 //nb_blocsManufID: 0001h DeviceID: 227Eh 2220h 2200hI understand "connected via a 32-bit bus and CS0 to CN8" as the full device wordsize is addressable, so this device
So in
pflash_cfi02_register()format:- name = "FROM (Area0)"
- size = 16 * MiB
-sector_len= 64 * KiB
-nb_blocs= 256
-nb_mappings= 1? /* Machine specific... */
- width = 2
- id0 =0x0001
- id1 =0x227e
- id2 =0x2220
- id3 =0x2200
-unlock_addr0=0x555,
-unlock_addr1=0x2aa
- be = 0 /* Arch specific... */
Quoted 3 lines
Quoted 1 line
Which hopefully is very similar to what we currently use :)
'fraid not:
I was trying to be sarcastic :/
Quoted 21 lines
$ qemu-system-sh4 -M r2d -display none -S -monitor stdio
QEMU 3.1.50 monitor - type 'help' for more information
(qemu) info qtree
[...]
dev: cfi.pflash02, id ""
drive = ""
num-blocks = 512 (0x200) <--- instead of 256
sector-length = 16384 (0x4000) <--- instead of 65536
width = 4 (0x4) <--- instead of 2
mappings = 1 (0x1)
big-endian = 0 (0x0)
id0 = 0 (0x0) <--- instead of 0x0001
id1 = 0 (0x0) <--- instead of 0x227e
id2 = 0 (0x0) <--- instead of 0x2220
id3 = 0 (0x0) <--- instead of 0x2200
unlock-addr0 = 1365 (0x555)
unlock-addr1 = 682 (0x2aa)
name = "r2d.flash" <--- instead of "FROM (Area0)"
mmio 0000000000000000/0000000000800000Quoted 4 lines
Not shown: size is num-blocks * sector-length = 512 * 16384 = 8MiB instead of 16MiB.
Which properties would you like me to change, and how?
The simpler change for correctness is to fix the FLASH_SIZE:
-#define FLASH_SIZE 0x02000000
+#define FLASH_SIZE (16 * MiB)
+ /*
+ * According to the old board user document in Japanese (under NDA) what + * is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 + * to CN8. The docs mention a Cypress S29PL127J60TFI130 chipsset. + * Per the 'S29PL-J 002-00615 Rev. *E' datasheet, it is a 128Mbit NOR + * parallel flash addressable in words of 16bit. + */
pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
- 16 * KiB, FLASH_SIZE >> 16,
+ 16 * KiB, FLASH_SIZE >> 14 /* will get removed
later */,
1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
0x555, 0x2aa, 0);
1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
0x555, 0x2aa, 0);Now fixing the sector size:
pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
- 16 * KiB, FLASH_SIZE >> 16,
- 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
+ 64 * KiB, FLASH_SIZE >> 16 /* will get removed
later */,
+ 1, 4, 0x0001, 0x227e, 0x2220, 0x2200
0x555, 0x2aa, 0);But I'd recommend changing/fixing the sector size during the next dev cycle, so we have more time for testing.
Regards,
Phil.
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 2 lines · Philippe Mathieu-Daudé
But I'd recommend changing/fixing the sector size during the next dev cycle, so we have more time for testing.
Nobody in the upstream dev community is using or testing this board. The only way we'll find out if there's a problem with changing the sector size is to put the change in and get it into a release. I would vote for just making the change now.
thanks
-- PMM
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 5 lines · Peter Maydell
Quoted 2 lines · Philippe Mathieu-Daudé
But I'd recommend changing/fixing the sector size during the next dev cycle, so we have more time for testing.
Nobody in the upstream dev community is using or testing this board.
Well I submitted a Avocado test last year:
https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02749.html
And I rebase/run it from time to time.
Quoted 3 lines
The only way we'll find out if there's a problem with changing the sector size is to put the change in and get it into a release. I would vote for just making the change now.
I'm happy with this vote, and am sure Markus will be too :)
Markus: the last field I wasn't sure about without double checking the code is the @width one. I find it misleading, is that the size of the data bus or the size of the flash words? Answer: this is the size of the words in byte. NOR flash devices can not write less data than their word boundary.
The S29PL127J60TFI130 only support 16bit words, so using @width=2 is correct.
And the winner is.... ta-da!
pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
- 16 * KiB, FLASH_SIZE >> 16,
- 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
+ 64 * KiB, FLASH_SIZE >> 16 /* will get removed
later */,
+ 1, 2, 0x0001, 0x227e, 0x2220, 0x2200
0x555, 0x2aa, 0);Quoted 3 lines
thanks
-- PMM
Thanks for your support!
Phil.
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 36 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Peter Maydell
Quoted 2 lines · Philippe Mathieu-Daudé
But I'd recommend changing/fixing the sector size during the next dev cycle, so we have more time for testing.
Nobody in the upstream dev community is using or testing this board.
Well I submitted a Avocado test last year:
https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02749.htmlAnd I rebase/run it from time to time.
Quoted 3 lines
The only way we'll find out if there's a problem with changing the sector size is to put the change in and get it into a release. I would vote for just making the change now.
I'm happy with this vote, and am sure Markus will be too :)
Markus: the last field I wasn't sure about without double checking the code is the @width one. I find it misleading, is that the size of the data bus or the size of the flash words? Answer: this is the size of the words in byte. NOR flash devices can not write less data than their word boundary.
The S29PL127J60TFI130 only support 16bit words, so using @width=2 is correct.
And the winner is.... ta-da!
pflash_cfi02_register(0x0, NULL, "r2d.flash",
FLASH_SIZE,
dinfo ?blk_by_legacy_dinfo(dinfo): NULL,(quoted diff) +1
-2- 16 * KiB, FLASH_SIZE >> 16, - 1, 4, 0x0000, 0x0000, 0x0000, 0x0000, + 64 * KiB, FLASH_SIZE >> 16 /* will get removedlater */,
+ 1, 2,0x0001,0x227e,0x2220,0x2200
Quoted 1 line
0x555, 0x2aa, 0);
Sold!
[...]
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
In reply to Philippe Mathieu-DaudéQuoted 59 lines · Philippe Mathieu-Daudé
Quoted 58 lines · Markus Armbruster
Quoted 57 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Markus Armbruster
Quoted 8 lines · Magnus Damm
Quoted 1 line · Markus Armbruster
Perhaps Magnus, who maintains the machine, can pick a new value for us.
According to the old board user document in Japanese (under NDA) what is referred to as FROM (Area0) is connected via a 32-bit bus and CS0 to CN8. The docs mention s29pl127j60tfi130 but since I don't have the board handy ATM I don't know how the chips are connected.
Quoted 4 lines
Quoted 1 line
Hope this helps,
If you want me to change our emulated flash memory's size, please give me a number.
datasheet "S29PL-J 002-00615 Rev. *E":
https://www.cypress.com/file/207091/downloadThe S29PL127J60TFI130 is a 128Mbit NOR pflash addressable in words of 16bit.
128Mbit = 16 MiB
At least it matches the "RTS7751R2D Handling Manual"!
https://elinux.org/RTS7751R2D_Handling_Manual#Kernel_start_from_FROM_extension_card_.28Kernel_space_XIP.29PL127J:
- 4 Banks
-> we don't model banks.
- sectors of 4Kw and 32Kw
-> we don't model different sector size and only use the
biggest available
sector_size= 32Kw = 64KiB //sector_len
(naive)sector_count= 256 //nb_blocsManufID: 0001h DeviceID: 227Eh 2220h 2200hI understand "connected via a 32-bit bus and CS0 to CN8" as the full device wordsize is addressable, so this device
So in
pflash_cfi02_register()format:- name = "FROM (Area0)"
- size = 16 * MiB
-sector_len= 64 * KiB
-nb_blocs= 256
-nb_mappings= 1? /* Machine specific... */
- width = 2
- id0 =0x0001
- id1 =0x227e
- id2 =0x2220
- id3 =0x2200
-unlock_addr0=0x555,
-unlock_addr1=0x2aa
- be = 0 /* Arch specific... */
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Which hopefully is very similar to what we currently use :)
'fraid not:
I was trying to be sarcastic :/
And I fell for it, should've known better %-}
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
In reply to Markus ArmbrusterQuoted 25 lines · Markus Armbruster
pflash_cfi02_register()takes a size in bytes, a block size in bytes and a number of blocks.r2d_init()passesFLASH_SIZE, 16 * KiB,FLASH_SIZE>> 16. Does not compute: size doesn't match block size * number of blocks. The latter happens to win. I tried to find documentation on the physcial hardware, no luck.For now, adjust the byte size passed to match the actual size created, and add a FIXME comment.
Cc Magnus Damm <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/sh4/r2d.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)hw/sh4/r2d.c +1
-1@@ -290,7 +290,14 @@ static void r2d_init(MachineState *machine)/* onboard flash memory */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE, +/*
hw/sh4/r2d.c static void r2d_init(MachineState *machine) · line 303
Quoted 10 lines
hw/sh4/r2d.c +7
-0+* FIXME The code is confused about the size of the flash. It +* used to pass FLASH_SIZE bytes, in FLASH_SIZE >> 16 blocks of +* 16KiB each, which does not compute, but creates one of +* FLASH_SIZE / 4 bytes anyway. The current code does so too, but +* whether it's the right size is anybody's guess. +*/ + pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE / 4, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 16 * KiB, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
Good news: when you read (0x0000, 0x0000, 0x0000, 0x0000) pflash IDs, that means the code uses the "Virt PFlash". IOW this is not a physical model, since the guest obviously doesn't care about checking the flash model.
The "VirtPFlash" only has 64KiB sectors.
I suggest we add a pflash_cfi02_create_virt(reduced args) helper to make this obvious:
pflash_cfi02_create_virt(paddr, name, size_bytes, mapping?).
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 8 lines · Philippe Mathieu-Daudé
On 2/18/19 1:56 PM, Markus Armbruster wrote:
Good news: when you read (0x0000,0x0000,0x0000,0x0000) pflash IDs, that means the code uses the "Virt PFlash". IOW this is not a physical model, since the guest obviously doesn't care about checking the flash model.
The "VirtPFlash" only has 64KiB sectors.
Quoted 4 lines
I suggest we add a
pflash_cfi02_create_virt(reduced args)helper to make this obvious:
pflash_cfi02_create_virt(paddr, name, size_bytes, mapping?).
What would this be, and when would you use it without a /* FIXME this is not what the real hardware does */ ?
The real problem with most of these pflash creation calls is that they're using bogus data for the flash device (wrong IDs, wrong width, using the legacy weird implementation, etc etc) because nobody cares much about the boards or has real hardware to see what the hardware really is doing.
thanks
-- PMM
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 5 lines · Peter Maydell
Quoted 4 lines · Philippe Mathieu-Daudé
On 2/18/19 1:56 PM, Markus Armbruster wrote:
Good news: when you read (0x0000,0x0000,0x0000,0x0000) pflash IDs, that means the code uses the "Virt PFlash".
Which code?
Quoted 5 lines
Quoted 5 lines
IOW this is not a physical
model, since the guest obviously doesn't care about checking the flash model.
The "VirtPFlash" only has 64KiB sectors.
Quoted 7 lines
Quoted 4 lines
I suggest we add a
pflash_cfi02_create_virt(reduced args)helper to make this obvious:
pflash_cfi02_create_virt(paddr, name, size_bytes, mapping?).What would this be, and when would you use it without a /* FIXME this is not what the real hardware does */ ?
For a purely virtual machine such as ARM virt, perhaps?
Funnily, we use IDs 0x89, 0x18, 0x00, 0x00 there. Which first appeared in the microblaze petalogix-s3adsp1800 machine (commit 2548de3a343, Jan 2010), then got copied to ppc virtex-ml507 (commit 2c50e26efdb, Sep 2010), microblaze petalogix-ml605 (commit 00914b7d970, Mar 2011), ppc sam460ex (commit 4b387f9ee16, Feb 2018), arm vexpress-* in different form (commit b8433303fbc and 0163a2dc80, Dec 2013), and finally arm virt (commit acf82361c61, Sep 2014). Which ones match physical hardware is anybody's guess.
Quoted 4 lines
The real problem with most of these pflash creation calls is that they're using bogus data for the flash device (wrong IDs, wrong width, using the legacy weird implementation, etc etc)
Even better news: when we replace the helper function by longhand, many of the (bogus) qdev_prop_set_FOO() become no-ops (because the default is identically bogus), so we can sweep more of this under the carpet!
Quoted 2 lines
because nobody cares much about the boards or has
real hardware to see what the hardware really is doing.
Remind me, why are we shipping stuff nobody cares much about?
Re: [Qemu-devel] [PATCH 06/10] r2d: Flash memory creation is confused about size, mark FIXME
Quoted 8 lines · Markus Armbruster
Quoted 2 lines · Peter Maydell
What would this be, and when would you use it without a /* FIXME this is not what the real hardware does */ ?
For a purely virtual machine such as ARM virt, perhaps?
Funnily, we use IDs
0x89,0x18,0x00,0x00there.
FWIW, this is "Manufacturer: Intel" and whatever device 0x18 is for Intel. IDs 2 and 3 are used by the pflash_cfi01 code only if we're using the bogus backward-compatibility "act like a bad emulation of two 16-bit devices making up a 32-bit wide device", in which case they're the ID values for the second of the two devices. (Or it might be that the ident values then are "manuf-id manuf-id device-id device-id", and with the not-bogus setup they're "manuf-id device-id unused unused".)
I'm not sure whether the chips on any of these boards really are Intel ones :-)
thanks
-- PMM
PATCH 7/10 mips_malta: Clean up definition of flash memory size somewhat
In reply to Markus Armbrusterpflash_cfi01_register() takes a size in bytes, a block size in bytes and a number of blocks. mips_malta_init() passes BIOS_SIZE, 65536, FLASH_SIZE >> 16. Actually consistent only because BIOS_SIZE (defined in include/hw/mips/bios.h as (4 * MiB)) matches FLASH_SIZE (defined locally as 0x400000). Confusing all the same.
Pass FLASH_SIZE instead of BIOS_SIZE.
There are more uses of BIOS_SIZE, but I don't sufficiently understand them to attempt cleanup.
--- hw/mips/mips_malta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/mips/mips_malta.c +2 -2
@@ -1269,12 +1269,12 @@ void mips_malta_init(MachineState *machine)if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " "addr %08llx '%s' %x\n" , - fl_idx, bios_size,FLASH_ADDRESS , + fl_idx,FLASH_SIZE ,FLASH_ADDRESS ,blk_name (dinfo->bdrv), fl_sectors); }#endif fl =pflash_cfi01_register (FLASH_ADDRESS ,NULL ,"mips_malta.bios" , -BIOS_SIZE , +FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 , fl_sectors,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be);
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 07/10] mips_malta: Clean up definition of flash memory size somewhat
Quoted 7 lines · Markus Armbruster
pflash_cfi01_register()takes a size in bytes, a block size in bytes and a number of blocks.mips_malta_init()passesBIOS_SIZE, 65536,FLASH_SIZE>> 16. Actually consistent only becauseBIOS_SIZE(defined ininclude/hw/mips/bios.has (4 * MiB)) matchesFLASH_SIZE(defined locally as0x400000). Confusing all the same.Pass
FLASH_SIZEinstead ofBIOS_SIZE.
Your cleanup is correct.
Quoted 3 lines
There are more uses of
BIOS_SIZE, but I don't sufficiently understand them to attempt cleanup.
BIOS_SIZE is a MIPS architecture definition, incorrectly used around. This simply means "Top of 32bit address space - Boot Vector address". There is nothing wrong in plugging bigger/smaller flashes around the boot vector.
(I have a series cleaning this definition, but I'm throttling my MIPS apports).
Quoted 18 lines
Cc Aurelien Jarno <[email protected]>Cc Aleksandar Rikalo <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/mips/mips_malta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/mips/mips_malta.c +0
-1@@ -1269,12 +1269,12 @@ void mips_malta_init(MachineState *machine)if (dinfo) { printf("Register parallel flash %d size " TARGET_FMT_lx " at " "addr %08llx '%s' %x\n", - fl_idx, bios_size, FLASH_ADDRESS,
hw/mips/mips_malta.c void mips_malta_init(MachineState *machine) · line 1280
Quoted 10 lines
hw/mips/mips_malta.c +2
-1+ fl_idx,FLASH_SIZE ,FLASH_ADDRESS , blk_name(dinfo->bdrv), fl_sectors); }#endif fl =pflash_cfi01_register (FLASH_ADDRESS ,NULL ,"mips_malta.bios" , -BIOS_SIZE , +FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 , fl_sectors,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be);
Does that mean you can remove the "hw/mips/bios.h" include now?
Re: [Qemu-devel] [PATCH 07/10] mips_malta: Clean up definition of flash memory size somewhat
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Markus Armbruster
pflash_cfi01_register()takes a size in bytes, a block size in bytes and a number of blocks.mips_malta_init()passesBIOS_SIZE, 65536,FLASH_SIZE>> 16. Actually consistent only becauseBIOS_SIZE(defined ininclude/hw/mips/bios.has (4 * MiB)) matchesFLASH_SIZE(defined locally as0x400000). Confusing all the same.Pass
FLASH_SIZEinstead ofBIOS_SIZE.Your cleanup is correct.
Quoted 3 lines
There are more uses of
BIOS_SIZE, but I don't sufficiently understand them to attempt cleanup.
BIOS_SIZEis a MIPS architecture definition, incorrectly used around. This simply means "Top of 32bit address space - Boot Vector address". There is nothing wrong in plugging bigger/smaller flashes around the boot vector.
(I have a series cleaning this definition, but I'm throttling my MIPS apports).Quoted 22 lines
Cc Aurelien Jarno <[email protected]>Cc Aleksandar Rikalo <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/mips/mips_malta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/mips/mips_malta.c +1
-1@@ -1269,12 +1269,12 @@ void mips_malta_init(MachineState *machine)if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " "addr %08llx '%s' %x\n" , - fl_idx, bios_size,FLASH_ADDRESS , + fl_idx,FLASH_SIZE ,FLASH_ADDRESS ,blk_name (dinfo->bdrv), fl_sectors); }#endif fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
Quoted 8 lines
hw/mips/mips_malta.c void mips_malta_init(MachineState *machine) · line 1280
Quoted 6 lines
hw/mips/mips_malta.c +1
-1-BIOS_SIZE , +FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 , fl_sectors, 4, 0x0000, 0x0000, 0x0000, 0x0000, be);Does that mean you can remove the "
hw/mips/bios.h" include now?
No, since there are more uses of BIOS_SIZE in this file. They feel inappropriate to me, but I don't feel confident enough to attempt cleanup.
Quoted 1 line
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
Re: [Qemu-devel] [PATCH 07/10] mips_malta: Clean up definition of flash memory size somewhat
Quoted 55 lines · Markus Armbruster
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Markus Armbruster
pflash_cfi01_register()takes a size in bytes, a block size in bytes and a number of blocks.mips_malta_init()passesBIOS_SIZE, 65536,FLASH_SIZE>> 16. Actually consistent only becauseBIOS_SIZE(defined ininclude/hw/mips/bios.has (4 * MiB)) matchesFLASH_SIZE(defined locally as0x400000). Confusing all the same.Pass
FLASH_SIZEinstead ofBIOS_SIZE.Your cleanup is correct.
Quoted 3 lines
There are more uses of
BIOS_SIZE, but I don't sufficiently understand them to attempt cleanup.
BIOS_SIZEis a MIPS architecture definition, incorrectly used around. This simply means "Top of 32bit address space - Boot Vector address". There is nothing wrong in plugging bigger/smaller flashes around the boot vector.
(I have a series cleaning this definition, but I'm throttling my MIPS apports).Quoted 22 lines
Cc Aurelien Jarno <[email protected]>Cc Aleksandar Rikalo <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/mips/mips_malta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/mips/mips_malta.c +1
-1@@ -1269,12 +1269,12 @@ void mips_malta_init(MachineState *machine)if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " "addr %08llx '%s' %x\n" , - fl_idx, bios_size,FLASH_ADDRESS , + fl_idx,FLASH_SIZE ,FLASH_ADDRESS ,blk_name (dinfo->bdrv), fl_sectors); }#endif fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",Quoted 8 lines
hw/mips/mips_malta.c void mips_malta_init(MachineState *machine) · line 1280
Quoted 6 lines
hw/mips/mips_malta.c +1
-1-BIOS_SIZE , +FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 , fl_sectors, 4, 0x0000, 0x0000, 0x0000, 0x0000, be);Does that mean you can remove the "
hw/mips/bios.h" include now?
Quoted 3 lines
No, since there are more uses of
BIOS_SIZEin this file. They feel inappropriate to me, but I don't feel confident enough to attempt cleanup.
OK, since I already did it twice, I'll do it once your work get merged.
Quoted 5 lines
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Thanks!
Re: [Qemu-devel] [PATCH 07/10] mips_malta: Clean up definition of flash memory size somewhat
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster
pflash_cfi01_register()takes a size in bytes, a block size in bytes and a number of blocks.mips_malta_init()passesBIOS_SIZE, 65536,FLASH_SIZE>> 16. Actually consistent only becauseBIOS_SIZE(defined ininclude/hw/mips/bios.has (4 * MiB)) matchesFLASH_SIZE(defined locally as0x400000). Confusing all the same.
Quoted 8 lines
Pass
FLASH_SIZEinstead ofBIOS_SIZE.There are more uses of
BIOS_SIZE, but I don't sufficiently understand them to attempt cleanup.Cc Aurelien Jarno <[email protected]>Cc Aleksandar Rikalo <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 13 lines
--- hw/mips/mips_malta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/mips/mips_malta.c +0
-1@@ -1269,12 +1269,12 @@ void mips_malta_init(MachineState *machine)if (dinfo) { printf("Register parallel flash %d size " TARGET_FMT_lx " at " "addr %08llx '%s' %x\n", - fl_idx, bios_size, FLASH_ADDRESS,
hw/mips/mips_malta.c void mips_malta_init(MachineState *machine) · line 1280
Quoted 10 lines
hw/mips/mips_malta.c +2
-1+ fl_idx,FLASH_SIZE ,FLASH_ADDRESS , blk_name(dinfo->bdrv), fl_sectors); }#endif fl =pflash_cfi01_register (FLASH_ADDRESS ,NULL ,"mips_malta.bios" , -BIOS_SIZE , +FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 , fl_sectors,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be);
--
Alex Bennée
PATCH 8/10 pflash: Clean up after commit 368a354f02b part 1
In reply to Markus ArmbrusterQOMification left parameter @qdev unused in pflash_cfi01_register() and pflash_cfi02_register(). All callers pass NULL. Remove.
--- hw/arm/collie.c | 4 ++-- hw/arm/digic_boards.c | 2 +- hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 3 +-- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 3 +-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 31 insertions(+), 33 deletions(-)
hw/arm/collie.c +2 -2
@@ -36,12 +36,12 @@ static void collie_init(MachineState *machine) s =sa1110_init (sysmem, collie_binfo.ram_size, machine->cpu_type); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (SA_CS0 ,NULL ,"collie.fl1" ,0x02000000 , +pflash_cfi01_register (SA_CS0 ,"collie.fl1" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); dinfo =drive_get (IF_PFLASH ,0 ,1 ); -pflash_cfi01_register (SA_CS1 ,NULL ,"collie.fl2" ,0x02000000 , +pflash_cfi01_register (SA_CS1 ,"collie.fl2" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 );
hw/arm/digic_boards.c +1 -1
@@ -129,7 +129,7 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr,#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024)#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) - pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE, + pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE, DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,
hw/arm/gumstix.c +2 -2
@@ -72,7 +72,7 @@ static void connex_init(MachineState *machine)#else be =0 ;#endif -if (!pflash_cfi01_register (0x00000000 ,NULL ,"connext.rom" , connex_rom, +if (!pflash_cfi01_register (0x00000000 ,"connext.rom" , connex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len, connex_rom / sector_len,2 ,0 ,0 ,0 ,0 , be)) {
@@ -109,7 +109,7 @@ static void verdex_init(MachineState *machine)#else be =0 ;#endif -if (!pflash_cfi01_register (0x00000000 ,NULL ,"verdex.rom" , verdex_rom, +if (!pflash_cfi01_register (0x00000000 ,"verdex.rom" , verdex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len, verdex_rom / sector_len,2 ,0 ,0 ,0 ,0 , be)) {
hw/arm/mainstone.c +1 -1
@@ -148,7 +148,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,exit (1 ); } - if (!pflash_cfi01_register(mainstone_flash_base[i], NULL, + if (!pflash_cfi01_register(mainstone_flash_base[i], i ? "mainstone.flash1" : "mainstone.flash0", MAINSTONE_FLASH, blk_by_legacy_dinfo(dinfo),
hw/arm/musicpal.c +2 -2
@@ -1636,14 +1636,14 @@ static void musicpal_init(MachineState *machine)* image is smaller than 32 MB. */ #ifdef TARGET_WORDS_BIGENDIAN -pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,NULL , +pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, blk,0x10000 , (flash_size +0xffff ) >>16 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,1 );#else - pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, NULL, + pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, "musicpal.flash", flash_size, blk, 0x10000, (flash_size + 0xffff) >> 16, MP_FLASH_SIZE_MAX / flash_size,
hw/arm/omap_sx1.c +2 -2
@@ -152,7 +152,7 @@ static void sx1_init(MachineState *machine, const int version)#endif if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { - if (!pflash_cfi01_register(OMAP_CS0_BASE, NULL, + if (!pflash_cfi01_register(OMAP_CS0_BASE, "omap_sx1.flash0-1", flash_size, blk_by_legacy_dinfo(dinfo), sector_size, flash_size / sector_size,
@@ -176,7 +176,7 @@ static void sx1_init(MachineState *machine, const int version)memory_region_add_subregion (address_space,OMAP_CS1_BASE + flash1_size, &cs[1 ]); - if (!pflash_cfi01_register(OMAP_CS1_BASE, NULL, + if (!pflash_cfi01_register(OMAP_CS1_BASE, "omap_sx1.flash1-1", flash1_size, blk_by_legacy_dinfo(dinfo), sector_size, flash1_size / sector_size,
hw/arm/versatilepb.c +1 -1
@@ -365,7 +365,7 @@ static void versatile_init(MachineState *machine, int board_id)/* 0x34000000 NOR Flash */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - if (!pflash_cfi01_register(VERSATILE_FLASH_ADDR, NULL, "versatile.flash", + if (!pflash_cfi01_register(VERSATILE_FLASH_ADDR, "versatile.flash", VERSATILE_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, VERSATILE_FLASH_SECT_SIZE,
hw/arm/xilinx_zynq.c +1 -1
@@ -205,7 +205,7 @@ static void zynq_init(MachineState *machine)DriveInfo *dinfo =drive_get (IF_PFLASH ,0 ,0 );/* AMD */ - pflash_cfi02_register(0xe2000000, NULL, "zynq.pflash", FLASH_SIZE, + pflash_cfi02_register(0xe2000000, "zynq.pflash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, FLASH_SECTOR_SIZE, FLASH_SIZE/FLASH_SECTOR_SIZE, 1,
hw/arm/z2.c +1 -2
@@ -324,8 +324,7 @@ static void z2_init(MachineState *machine)exit (1 ); } -if (!pflash_cfi01_register (Z2_FLASH_BASE , -NULL ,"z2.flash0" ,Z2_FLASH_SIZE , +if (!pflash_cfi01_register (Z2_FLASH_BASE ,"z2.flash0" ,Z2_FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len,Z2_FLASH_SIZE / sector_len,4 ,0 ,0 ,0 ,0 , be)) {
hw/block/pflash_cfi01.c +1 -1
@@ -921,7 +921,7 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) PFlashCFI01 *pflash_cfi01_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
hw/block/pflash_cfi02.c +1 -1
@@ -717,7 +717,7 @@ static void pflash_cfi02_register_types(void)type_init (pflash_cfi02_register_types) PFlashCFI02 *pflash_cfi02_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
hw/i386/pc_sysfw.c +1 -1
@@ -160,7 +160,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)/* pflash_cfi01_register() creates a deep copy of the name */ snprintf (name,sizeof name,"system.flash%d" , unit); - system_flash = pflash_cfi01_register(phys_addr, NULL /* qdev */, name, + system_flash = pflash_cfi01_register(phys_addr, name, size, blk, sector_size, size >> sector_bits, 1 /* width */,
hw/lm32/lm32_boards.c +2 -2
@@ -114,7 +114,7 @@ static void lm32_evr_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Spansion S29NS128P */ -pflash_cfi02_register (flash_base,NULL ,"lm32_evr.flash" , flash_size, +pflash_cfi02_register (flash_base,"lm32_evr.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );
@@ -207,7 +207,7 @@ static void lm32_uclinux_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Spansion S29NS128P */ -pflash_cfi02_register (flash_base,NULL ,"lm32_uclinux.flash" , flash_size, +pflash_cfi02_register (flash_base,"lm32_uclinux.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );
hw/lm32/milkymist.c +1 -1
@@ -121,7 +121,7 @@ milkymist_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Numonyx JS28F256J3F105 */ -pflash_cfi01_register (flash_base,NULL ,"milkymist.flash" , flash_size, +pflash_cfi01_register (flash_base,"milkymist.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 );
hw/microblaze/petalogix_ml605_mmu.c +1 -2
@@ -107,8 +107,7 @@ petalogix_ml605_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* 5th parameter 2 means bank-width * 10th paremeter 0 means little-endian */ -pflash_cfi01_register (FLASH_BASEADDR , -NULL ,"petalogix_ml605.flash" ,FLASH_SIZE , +pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_ml605.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 );
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
@@ -88,7 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (FLASH_BASEADDR , -NULL ,"petalogix_s3adsp1800.flash" ,FLASH_SIZE , +"petalogix_s3adsp1800.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );
hw/mips/mips_malta.c +1 -1
@@ -1273,7 +1273,7 @@ void mips_malta_init(MachineState *machine) blk_name(dinfo->bdrv), fl_sectors); }#endif - fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios", + fl = pflash_cfi01_register(FLASH_ADDRESS, "mips_malta.bios", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, fl_sectors,
hw/mips/mips_r4k.c +1 -1
@@ -235,7 +235,7 @@ void mips_r4k_init(MachineState *machine)load_image_targphys (filename,0x1fc00000 ,BIOS_SIZE ); }else if ((dinfo =drive_get (IF_PFLASH ,0 ,0 )) !=NULL ) {uint32_t mips_rom =0x00400000 ; -if (!pflash_cfi01_register (0x1fc00000 ,NULL ,"mips_r4k.bios" , mips_rom, +if (!pflash_cfi01_register (0x1fc00000 ,"mips_r4k.bios" , mips_rom,blk_by_legacy_dinfo (dinfo), sector_len, mips_rom / sector_len,4 ,0 ,0 ,0 ,0 , be)) {
hw/ppc/ppc405_boards.c +3 -3
@@ -193,7 +193,7 @@ static void ref405ep_init(MachineState *machine)#endif bios_size =0x80000 ; pflash_cfi02_register(0xFFF80000, - NULL, "ef405ep.bios", bios_size, + "ef405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
@@ -484,7 +484,7 @@ static void taihu_405ep_init(MachineState *machine)#endif bios_size =2 * MiB; pflash_cfi02_register(0xFFE00000, - NULL, "taihu_405ep.bios", bios_size, + "taihu_405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
@@ -526,7 +526,7 @@ static void taihu_405ep_init(MachineState *machine) #ifdef DEBUG_BOARD_INIT printf("Register application flash\n" #endif - pflash_cfi02_register(0xfc000000, NULL, "taihu_405ep.flash", bios_size, + pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
hw/ppc/sam460ex.c +1 -1
@@ -95,7 +95,7 @@ static int sam460ex_load_uboot(void) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!pflash_cfi01_register (FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ), -NULL ,"sam460ex.flash" ,FLASH_SIZE , +"sam460ex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 ,FLASH_SIZE /65536 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {
hw/ppc/virtex_ml507.c +1 -1
@@ -227,7 +227,7 @@ static void virtex_init(MachineState *machine)memory_region_add_subregion (address_space_mem, ram_base, phys_ram); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (PFLASH_BASEADDR ,NULL ,"virtex.flash" ,FLASH_SIZE , +pflash_cfi01_register (PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );
hw/sh4/r2d.c +1 -1
@@ -297,7 +297,7 @@ static void r2d_init(MachineState *machine)* FLASH_SIZE / 4 bytes anyway. The current code does so too, but * whether it's the right size is anybody's guess. */ - pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE / 4, + pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE / 4, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 16 * KiB, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
include/hw/block/flash.h +2 -2
@@ -14,7 +14,7 @@typedef struct PFlashCFI01 PFlashCFI01 ; PFlashCFI01 *pflash_cfi01_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
@@ -33,7 +33,7 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);typedef struct PFlashCFI02 PFlashCFI02 ; PFlashCFI02 *pflash_cfi02_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 08/10] pflash: Clean up after commit 368a354f02b part 1
Quoted 21 lines · Markus Armbruster
QOMification left parameter @qdev unused in
pflash_cfi01_register()andpflash_cfi02_register(). All callers pass NULL. Remove.Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/collie.c | 4 ++-- hw/arm/digic_boards.c | 2 +- hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 3 +-- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 3 +-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
Quoted 8 lines
hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 31 insertions(+), 33 deletions(-)
Re: [Qemu-devel] [PATCH 08/10] pflash: Clean up after commit 368a354f02b part 1
In reply to Markus ArmbrusterQuoted 2 lines · Markus Armbruster
QOMification left parameter @qdev unused in
pflash_cfi01_register()andpflash_cfi02_register(). All callers pass NULL. Remove.
Good patch to discretly include a "rename to pflash_cfi01_create()" :P
Quoted 1 line
Signed-off-by Markus Armbruster <[email protected]>
Quoted 396 lines
--- hw/arm/collie.c | 4 ++-- hw/arm/digic_boards.c | 2 +- hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 3 +-- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 3 +-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 31 insertions(+), 33 deletions(-)hw/arm/collie.c +2
-2@@ -36,12 +36,12 @@ static void collie_init(MachineState *machine) s =sa1110_init (sysmem, collie_binfo.ram_size, machine->cpu_type); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (SA_CS0 ,NULL ,"collie.fl1" ,0x02000000 , +pflash_cfi01_register (SA_CS0 ,"collie.fl1" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); dinfo =drive_get (IF_PFLASH ,0 ,1 ); -pflash_cfi01_register (SA_CS1 ,NULL ,"collie.fl2" ,0x02000000 , +pflash_cfi01_register (SA_CS1 ,"collie.fl2" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 );hw/arm/digic_boards.c +1
-1@@ -129,7 +129,7 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr,#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024)#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) - pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE, + pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE, DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,hw/arm/gumstix.c +2
-2@@ -72,7 +72,7 @@ static void connex_init(MachineState *machine)#else be =0 ;#endif -if (!pflash_cfi01_register (0x00000000 ,NULL ,"connext.rom" , connex_rom, +if (!pflash_cfi01_register (0x00000000 ,"connext.rom" , connex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len, connex_rom / sector_len,2 ,0 ,0 ,0 ,0 , be)) {@@ -109,7 +109,7 @@ static void verdex_init(MachineState *machine)#else be =0 ;#endif -if (!pflash_cfi01_register (0x00000000 ,NULL ,"verdex.rom" , verdex_rom, +if (!pflash_cfi01_register (0x00000000 ,"verdex.rom" , verdex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len, verdex_rom / sector_len,2 ,0 ,0 ,0 ,0 , be)) {hw/arm/mainstone.c +1
-1@@ -148,7 +148,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,exit (1 ); } - if (!pflash_cfi01_register(mainstone_flash_base[i], NULL, + if (!pflash_cfi01_register(mainstone_flash_base[i], i ? "mainstone.flash1" : "mainstone.flash0", MAINSTONE_FLASH, blk_by_legacy_dinfo(dinfo),hw/arm/musicpal.c +2
-2@@ -1636,14 +1636,14 @@ static void musicpal_init(MachineState *machine)* image is smaller than 32 MB. */ #ifdef TARGET_WORDS_BIGENDIAN -pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,NULL , +pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, blk,0x10000 , (flash_size +0xffff ) >>16 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,1 );#else - pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, NULL, + pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, "musicpal.flash", flash_size, blk, 0x10000, (flash_size + 0xffff) >> 16, MP_FLASH_SIZE_MAX / flash_size,hw/arm/omap_sx1.c +2
-2@@ -152,7 +152,7 @@ static void sx1_init(MachineState *machine, const int version)#endif if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { - if (!pflash_cfi01_register(OMAP_CS0_BASE, NULL, + if (!pflash_cfi01_register(OMAP_CS0_BASE, "omap_sx1.flash0-1", flash_size, blk_by_legacy_dinfo(dinfo), sector_size, flash_size / sector_size,@@ -176,7 +176,7 @@ static void sx1_init(MachineState *machine, const int version)memory_region_add_subregion (address_space,OMAP_CS1_BASE + flash1_size, &cs[1 ]); - if (!pflash_cfi01_register(OMAP_CS1_BASE, NULL, + if (!pflash_cfi01_register(OMAP_CS1_BASE, "omap_sx1.flash1-1", flash1_size, blk_by_legacy_dinfo(dinfo), sector_size, flash1_size / sector_size,hw/arm/versatilepb.c +1
-1@@ -365,7 +365,7 @@ static void versatile_init(MachineState *machine, int board_id)/* 0x34000000 NOR Flash */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - if (!pflash_cfi01_register(VERSATILE_FLASH_ADDR, NULL, "versatile.flash", + if (!pflash_cfi01_register(VERSATILE_FLASH_ADDR, "versatile.flash", VERSATILE_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, VERSATILE_FLASH_SECT_SIZE,hw/arm/xilinx_zynq.c +1
-1@@ -205,7 +205,7 @@ static void zynq_init(MachineState *machine)DriveInfo *dinfo =drive_get (IF_PFLASH ,0 ,0 );/* AMD */ - pflash_cfi02_register(0xe2000000, NULL, "zynq.pflash", FLASH_SIZE, + pflash_cfi02_register(0xe2000000, "zynq.pflash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, FLASH_SECTOR_SIZE, FLASH_SIZE/FLASH_SECTOR_SIZE, 1,hw/arm/z2.c +1
-2@@ -324,8 +324,7 @@ static void z2_init(MachineState *machine)exit (1 ); } -if (!pflash_cfi01_register (Z2_FLASH_BASE , -NULL ,"z2.flash0" ,Z2_FLASH_SIZE , +if (!pflash_cfi01_register (Z2_FLASH_BASE ,"z2.flash0" ,Z2_FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len,Z2_FLASH_SIZE / sector_len,4 ,0 ,0 ,0 ,0 , be)) {hw/block/pflash_cfi01.c +1
-1@@ -921,7 +921,7 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) PFlashCFI01 *pflash_cfi01_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,hw/block/pflash_cfi02.c +1
-1@@ -717,7 +717,7 @@ static void pflash_cfi02_register_types(void)type_init (pflash_cfi02_register_types) PFlashCFI02 *pflash_cfi02_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,hw/i386/pc_sysfw.c +1
-1@@ -160,7 +160,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)/* pflash_cfi01_register() creates a deep copy of the name */ snprintf (name,sizeof name,"system.flash%d" , unit); - system_flash = pflash_cfi01_register(phys_addr, NULL /* qdev */, name, + system_flash = pflash_cfi01_register(phys_addr, name, size, blk, sector_size, size >> sector_bits, 1 /* width */,hw/lm32/lm32_boards.c +2
-2@@ -114,7 +114,7 @@ static void lm32_evr_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Spansion S29NS128P */ -pflash_cfi02_register (flash_base,NULL ,"lm32_evr.flash" , flash_size, +pflash_cfi02_register (flash_base,"lm32_evr.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );@@ -207,7 +207,7 @@ static void lm32_uclinux_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Spansion S29NS128P */ -pflash_cfi02_register (flash_base,NULL ,"lm32_uclinux.flash" , flash_size, +pflash_cfi02_register (flash_base,"lm32_uclinux.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );hw/lm32/milkymist.c +1
-1@@ -121,7 +121,7 @@ milkymist_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Numonyx JS28F256J3F105 */ -pflash_cfi01_register (flash_base,NULL ,"milkymist.flash" , flash_size, +pflash_cfi01_register (flash_base,"milkymist.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 );hw/microblaze/petalogix_ml605_mmu.c +1
-2@@ -107,8 +107,7 @@ petalogix_ml605_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* 5th parameter 2 means bank-width * 10th paremeter 0 means little-endian */ -pflash_cfi01_register (FLASH_BASEADDR , -NULL ,"petalogix_ml605.flash" ,FLASH_SIZE , +pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_ml605.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 );hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-1@@ -88,7 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (FLASH_BASEADDR , -NULL ,"petalogix_s3adsp1800.flash" ,FLASH_SIZE , +"petalogix_s3adsp1800.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );hw/mips/mips_malta.c +1
-1@@ -1273,7 +1273,7 @@ void mips_malta_init(MachineState *machine) blk_name(dinfo->bdrv), fl_sectors); }#endif - fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios", + fl = pflash_cfi01_register(FLASH_ADDRESS, "mips_malta.bios", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, fl_sectors,hw/mips/mips_r4k.c +1
-1@@ -235,7 +235,7 @@ void mips_r4k_init(MachineState *machine)load_image_targphys (filename,0x1fc00000 ,BIOS_SIZE ); }else if ((dinfo =drive_get (IF_PFLASH ,0 ,0 )) !=NULL ) {uint32_t mips_rom =0x00400000 ; -if (!pflash_cfi01_register (0x1fc00000 ,NULL ,"mips_r4k.bios" , mips_rom, +if (!pflash_cfi01_register (0x1fc00000 ,"mips_r4k.bios" , mips_rom,blk_by_legacy_dinfo (dinfo), sector_len, mips_rom / sector_len,4 ,0 ,0 ,0 ,0 , be)) {hw/ppc/ppc405_boards.c +3
-3@@ -193,7 +193,7 @@ static void ref405ep_init(MachineState *machine)#endif bios_size =0x80000 ; pflash_cfi02_register(0xFFF80000, - NULL, "ef405ep.bios", bios_size, + "ef405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,@@ -484,7 +484,7 @@ static void taihu_405ep_init(MachineState *machine)#endif bios_size =2 * MiB; pflash_cfi02_register(0xFFE00000, - NULL, "taihu_405ep.bios", bios_size, + "taihu_405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,@@ -526,7 +526,7 @@ static void taihu_405ep_init(MachineState *machine) #ifdef DEBUG_BOARD_INIT printf("Register application flash\n" #endif - pflash_cfi02_register(0xfc000000, NULL, "taihu_405ep.flash", bios_size, + pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,hw/ppc/sam460ex.c +1
-1@@ -95,7 +95,7 @@ static int sam460ex_load_uboot(void) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!pflash_cfi01_register (FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ), -NULL ,"sam460ex.flash" ,FLASH_SIZE , +"sam460ex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 ,FLASH_SIZE /65536 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {hw/ppc/virtex_ml507.c +1
-1@@ -227,7 +227,7 @@ static void virtex_init(MachineState *machine)memory_region_add_subregion (address_space_mem, ram_base, phys_ram); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (PFLASH_BASEADDR ,NULL ,"virtex.flash" ,FLASH_SIZE , +pflash_cfi01_register (PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );hw/sh4/r2d.c +1
-1@@ -297,7 +297,7 @@ static void r2d_init(MachineState *machine)* FLASH_SIZE / 4 bytes anyway. The current code does so too, but * whether it's the right size is anybody's guess. */ - pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE / 4, + pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE / 4, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 16 * KiB, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,include/hw/block/flash.h +2
-2@@ -14,7 +14,7 @@typedef struct PFlashCFI01 PFlashCFI01 ; PFlashCFI01 *pflash_cfi01_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,@@ -33,7 +33,7 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);typedef struct PFlashCFI02 PFlashCFI02 ; PFlashCFI02 *pflash_cfi02_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
Re: [Qemu-devel] [PATCH 08/10] pflash: Clean up after commit 368a354f02b part 1
In reply to Markus ArmbrusterQuoted 4 lines · Markus Armbruster
QOMification left parameter @qdev unused in
pflash_cfi01_register()andpflash_cfi02_register(). All callers pass NULL. Remove.Signed-off-by Markus Armbruster <[email protected]>
Quoted 387 lines
--- hw/arm/collie.c | 4 ++-- hw/arm/digic_boards.c | 2 +- hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 3 +-- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 3 +-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 31 insertions(+), 33 deletions(-)hw/arm/collie.c +2
-2@@ -36,12 +36,12 @@ static void collie_init(MachineState *machine) s =sa1110_init (sysmem, collie_binfo.ram_size, machine->cpu_type); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (SA_CS0 ,NULL ,"collie.fl1" ,0x02000000 , +pflash_cfi01_register (SA_CS0 ,"collie.fl1" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); dinfo =drive_get (IF_PFLASH ,0 ,1 ); -pflash_cfi01_register (SA_CS1 ,NULL ,"collie.fl2" ,0x02000000 , +pflash_cfi01_register (SA_CS1 ,"collie.fl2" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 );hw/arm/digic_boards.c +1
-1@@ -129,7 +129,7 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr,#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024)#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) - pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE, + pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE, DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,hw/arm/gumstix.c +2
-2@@ -72,7 +72,7 @@ static void connex_init(MachineState *machine)#else be =0 ;#endif -if (!pflash_cfi01_register (0x00000000 ,NULL ,"connext.rom" , connex_rom, +if (!pflash_cfi01_register (0x00000000 ,"connext.rom" , connex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len, connex_rom / sector_len,2 ,0 ,0 ,0 ,0 , be)) {@@ -109,7 +109,7 @@ static void verdex_init(MachineState *machine)#else be =0 ;#endif -if (!pflash_cfi01_register (0x00000000 ,NULL ,"verdex.rom" , verdex_rom, +if (!pflash_cfi01_register (0x00000000 ,"verdex.rom" , verdex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len, verdex_rom / sector_len,2 ,0 ,0 ,0 ,0 , be)) {hw/arm/mainstone.c +1
-1@@ -148,7 +148,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,exit (1 ); } - if (!pflash_cfi01_register(mainstone_flash_base[i], NULL, + if (!pflash_cfi01_register(mainstone_flash_base[i], i ? "mainstone.flash1" : "mainstone.flash0", MAINSTONE_FLASH, blk_by_legacy_dinfo(dinfo),hw/arm/musicpal.c +2
-2@@ -1636,14 +1636,14 @@ static void musicpal_init(MachineState *machine)* image is smaller than 32 MB. */ #ifdef TARGET_WORDS_BIGENDIAN -pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,NULL , +pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, blk,0x10000 , (flash_size +0xffff ) >>16 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,1 );#else - pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, NULL, + pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, "musicpal.flash", flash_size, blk, 0x10000, (flash_size + 0xffff) >> 16, MP_FLASH_SIZE_MAX / flash_size,hw/arm/omap_sx1.c +2
-2@@ -152,7 +152,7 @@ static void sx1_init(MachineState *machine, const int version)#endif if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { - if (!pflash_cfi01_register(OMAP_CS0_BASE, NULL, + if (!pflash_cfi01_register(OMAP_CS0_BASE, "omap_sx1.flash0-1", flash_size, blk_by_legacy_dinfo(dinfo), sector_size, flash_size / sector_size,@@ -176,7 +176,7 @@ static void sx1_init(MachineState *machine, const int version)memory_region_add_subregion (address_space,OMAP_CS1_BASE + flash1_size, &cs[1 ]); - if (!pflash_cfi01_register(OMAP_CS1_BASE, NULL, + if (!pflash_cfi01_register(OMAP_CS1_BASE, "omap_sx1.flash1-1", flash1_size, blk_by_legacy_dinfo(dinfo), sector_size, flash1_size / sector_size,hw/arm/versatilepb.c +1
-1@@ -365,7 +365,7 @@ static void versatile_init(MachineState *machine, int board_id)/* 0x34000000 NOR Flash */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - if (!pflash_cfi01_register(VERSATILE_FLASH_ADDR, NULL, "versatile.flash", + if (!pflash_cfi01_register(VERSATILE_FLASH_ADDR, "versatile.flash", VERSATILE_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, VERSATILE_FLASH_SECT_SIZE,hw/arm/xilinx_zynq.c +1
-1@@ -205,7 +205,7 @@ static void zynq_init(MachineState *machine)DriveInfo *dinfo =drive_get (IF_PFLASH ,0 ,0 );/* AMD */ - pflash_cfi02_register(0xe2000000, NULL, "zynq.pflash", FLASH_SIZE, + pflash_cfi02_register(0xe2000000, "zynq.pflash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, FLASH_SECTOR_SIZE, FLASH_SIZE/FLASH_SECTOR_SIZE, 1,hw/arm/z2.c +1
-2@@ -324,8 +324,7 @@ static void z2_init(MachineState *machine)exit (1 ); } -if (!pflash_cfi01_register (Z2_FLASH_BASE , -NULL ,"z2.flash0" ,Z2_FLASH_SIZE , +if (!pflash_cfi01_register (Z2_FLASH_BASE ,"z2.flash0" ,Z2_FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , sector_len,Z2_FLASH_SIZE / sector_len,4 ,0 ,0 ,0 ,0 , be)) {hw/block/pflash_cfi01.c +1
-1@@ -921,7 +921,7 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) PFlashCFI01 *pflash_cfi01_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,hw/block/pflash_cfi02.c +1
-1@@ -717,7 +717,7 @@ static void pflash_cfi02_register_types(void)type_init (pflash_cfi02_register_types) PFlashCFI02 *pflash_cfi02_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,hw/i386/pc_sysfw.c +1
-1@@ -160,7 +160,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)/* pflash_cfi01_register() creates a deep copy of the name */ snprintf (name,sizeof name,"system.flash%d" , unit); - system_flash = pflash_cfi01_register(phys_addr, NULL /* qdev */, name, + system_flash = pflash_cfi01_register(phys_addr, name, size, blk, sector_size, size >> sector_bits, 1 /* width */,hw/lm32/lm32_boards.c +2
-2@@ -114,7 +114,7 @@ static void lm32_evr_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Spansion S29NS128P */ -pflash_cfi02_register (flash_base,NULL ,"lm32_evr.flash" , flash_size, +pflash_cfi02_register (flash_base,"lm32_evr.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );@@ -207,7 +207,7 @@ static void lm32_uclinux_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Spansion S29NS128P */ -pflash_cfi02_register (flash_base,NULL ,"lm32_uclinux.flash" , flash_size, +pflash_cfi02_register (flash_base,"lm32_uclinux.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );hw/lm32/milkymist.c +1
-1@@ -121,7 +121,7 @@ milkymist_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* Numonyx JS28F256J3F105 */ -pflash_cfi01_register (flash_base,NULL ,"milkymist.flash" , flash_size, +pflash_cfi01_register (flash_base,"milkymist.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , flash_sector_size, flash_size / flash_sector_size,2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 );hw/microblaze/petalogix_ml605_mmu.c +1
-2@@ -107,8 +107,7 @@ petalogix_ml605_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* 5th parameter 2 means bank-width * 10th paremeter 0 means little-endian */ -pflash_cfi01_register (FLASH_BASEADDR , -NULL ,"petalogix_ml605.flash" ,FLASH_SIZE , +pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_ml605.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 );hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-1@@ -88,7 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (FLASH_BASEADDR , -NULL ,"petalogix_s3adsp1800.flash" ,FLASH_SIZE , +"petalogix_s3adsp1800.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );hw/mips/mips_malta.c +1
-1@@ -1273,7 +1273,7 @@ void mips_malta_init(MachineState *machine) blk_name(dinfo->bdrv), fl_sectors); }#endif - fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios", + fl = pflash_cfi01_register(FLASH_ADDRESS, "mips_malta.bios", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, fl_sectors,hw/mips/mips_r4k.c +1
-1@@ -235,7 +235,7 @@ void mips_r4k_init(MachineState *machine)load_image_targphys (filename,0x1fc00000 ,BIOS_SIZE ); }else if ((dinfo =drive_get (IF_PFLASH ,0 ,0 )) !=NULL ) {uint32_t mips_rom =0x00400000 ; -if (!pflash_cfi01_register (0x1fc00000 ,NULL ,"mips_r4k.bios" , mips_rom, +if (!pflash_cfi01_register (0x1fc00000 ,"mips_r4k.bios" , mips_rom,blk_by_legacy_dinfo (dinfo), sector_len, mips_rom / sector_len,4 ,0 ,0 ,0 ,0 , be)) {hw/ppc/ppc405_boards.c +3
-3@@ -193,7 +193,7 @@ static void ref405ep_init(MachineState *machine)#endif bios_size =0x80000 ; pflash_cfi02_register(0xFFF80000, - NULL, "ef405ep.bios", bios_size, + "ef405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,@@ -484,7 +484,7 @@ static void taihu_405ep_init(MachineState *machine)#endif bios_size =2 * MiB; pflash_cfi02_register(0xFFE00000, - NULL, "taihu_405ep.bios", bios_size, + "taihu_405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,@@ -526,7 +526,7 @@ static void taihu_405ep_init(MachineState *machine) #ifdef DEBUG_BOARD_INIT printf("Register application flash\n" #endif - pflash_cfi02_register(0xfc000000, NULL, "taihu_405ep.flash", bios_size, + pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, bios_size / 65536, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,hw/ppc/sam460ex.c +1
-1@@ -95,7 +95,7 @@ static int sam460ex_load_uboot(void) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!pflash_cfi01_register (FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ), -NULL ,"sam460ex.flash" ,FLASH_SIZE , +"sam460ex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,65536 ,FLASH_SIZE /65536 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {hw/ppc/virtex_ml507.c +1
-1@@ -227,7 +227,7 @@ static void virtex_init(MachineState *machine)memory_region_add_subregion (address_space_mem, ram_base, phys_ram); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (PFLASH_BASEADDR ,NULL ,"virtex.flash" ,FLASH_SIZE , +pflash_cfi01_register (PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,FLASH_SIZE >>16 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );hw/sh4/r2d.c +1
-1@@ -297,7 +297,7 @@ static void r2d_init(MachineState *machine)* FLASH_SIZE / 4 bytes anyway. The current code does so too, but * whether it's the right size is anybody's guess. */ - pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE / 4, + pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE / 4, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 16 * KiB, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000,include/hw/block/flash.h +1
-1@@ -14,7 +14,7 @@typedef struct PFlashCFI01 PFlashCFI01 ; PFlashCFI01 *pflash_cfi01_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
include/hw/block/flash.h MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl); · line 39
Quoted 8 lines
include/hw/block/flash.h +1
-1@@ -33,7 +33,7 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);typedef struct PFlashCFI02 PFlashCFI02 ; PFlashCFI02 *pflash_cfi02_register(hwaddr base, - DeviceState *qdev, const char *name, + const char *name, hwaddr size, BlockBackend *blk, uint32_t sector_len, int nb_blocs,
--
Alex Bennée
PATCH 9/10 pflash: Clean up after commit 368a354f02b part 2
In reply to Markus ArmbrusterQOMification left parameter @size unused in pflash_cfi01_register() and pflash_cfi02_register(). register(). Obviously, @size should match @sector_len and @nb_blocs, i.e. size == sector_len * nb_blocs. All callers satisfy this.
Remove @nb_blocs and compute it from @size and @sector_len.
--- hw/arm/collie.c | 5 +++-- hw/arm/digic_boards.c | 1 - hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 1 - hw/arm/xilinx_zynq.c | 3 +-- hw/arm/z2.c | 2 +- hw/block/pflash_cfi01.c | 5 +++-- hw/block/pflash_cfi02.c | 5 +++-- hw/i386/pc_sysfw.c | 6 +----- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 7 +++---- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 36 insertions(+), 41 deletions(-)
hw/arm/collie.c +3 -2
@@ -9,6 +9,7 @@* GNU GPL, version 2 or (at your option) any later version. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h"
@@ -38,12 +39,12 @@ static void collie_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (SA_CS0 ,"collie.fl1" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); +64 * KiB,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); dinfo =drive_get (IF_PFLASH ,0 ,1 );pflash_cfi01_register (SA_CS1 ,"collie.fl2" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); +64 * KiB,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 );sysbus_create_simple ("scoop" ,0x40800000 ,NULL );
hw/arm/digic_boards.c +0 -1
@@ -131,7 +131,6 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, - FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE, DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE, 4, 0x00EC, 0x007E, 0x0003, 0x0001,
hw/arm/gumstix.c +2 -2
@@ -74,7 +74,7 @@ static void connex_init(MachineState *machine)#endif if (!pflash_cfi01_register (0x00000000 ,"connext.rom" , connex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - sector_len, connex_rom / sector_len, + sector_len,2 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 );
@@ -111,7 +111,7 @@ static void verdex_init(MachineState *machine)#endif if (!pflash_cfi01_register (0x00000000 ,"verdex.rom" , verdex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - sector_len, verdex_rom / sector_len, + sector_len,2 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 );
hw/arm/mainstone.c +1 -1
@@ -152,7 +152,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, i ? "mainstone.flash1" : "mainstone.flash0", MAINSTONE_FLASH, blk_by_legacy_dinfo(dinfo), - sector_len, MAINSTONE_FLASH / sector_len, + sector_len, 4, 0, 0, 0, 0, be)) {error_report ("Error registering flash memory" );exit (1 );
hw/arm/musicpal.c +2 -2
@@ -1638,14 +1638,14 @@ static void musicpal_init(MachineState *machine)#ifdef TARGET_WORDS_BIGENDIAN pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, - blk,0x10000 , (flash_size +0xffff ) >>16 , + blk,0x10000 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,1 );#else pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, - blk,0x10000 , (flash_size +0xffff ) >>16 , + blk,0x10000 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,0 );
hw/arm/omap_sx1.c +2 -2
@@ -155,7 +155,7 @@ static void sx1_init(MachineState *machine, const int version)if (!pflash_cfi01_register (OMAP_CS0_BASE ,"omap_sx1.flash0-1" , flash_size,blk_by_legacy_dinfo (dinfo), - sector_size, flash_size / sector_size, + sector_size,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory %d.\n" , fl_idx);
@@ -179,7 +179,7 @@ static void sx1_init(MachineState *machine, const int version)if (!pflash_cfi01_register (OMAP_CS1_BASE ,"omap_sx1.flash1-1" , flash1_size,blk_by_legacy_dinfo (dinfo), - sector_size, flash1_size / sector_size, + sector_size,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory %d.\n" , fl_idx);
hw/arm/versatilepb.c +0 -1
@@ -369,7 +369,6 @@ static void versatile_init(MachineState *machine, int board_id) VERSATILE_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, VERSATILE_FLASH_SECT_SIZE, - VERSATILE_FLASH_SIZE / VERSATILE_FLASH_SECT_SIZE, 4, 0x0089, 0x0018, 0x0000, 0x0, 0)) {fprintf (stderr,"qemu: Error registering flash memory.\n" ); }
hw/arm/xilinx_zynq.c +1 -2
@@ -207,8 +207,7 @@ static void zynq_init(MachineState *machine)/* AMD */ pflash_cfi02_register (0xe2000000 ,"zynq.pflash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -FLASH_SECTOR_SIZE , -FLASH_SIZE /FLASH_SECTOR_SIZE ,1 , +FLASH_SECTOR_SIZE ,1 ,1 ,0x0066 ,0x0022 ,0x0000 ,0x0000 ,0x0555 ,0x2aa ,0 );
hw/arm/z2.c +1 -1
@@ -326,7 +326,7 @@ static void z2_init(MachineState *machine)if (!pflash_cfi01_register (Z2_FLASH_BASE ,"z2.flash0" ,Z2_FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - sector_len,Z2_FLASH_SIZE / sector_len, + sector_len,4 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 );
hw/block/pflash_cfi01.c +3 -2
@@ -924,7 +924,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int bank_width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3,
@@ -935,7 +935,8 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort); } -qdev_prop_set_uint32 (dev,"num-blocks" , nb_blocs); +assert (size % sector_len ==0 ); +qdev_prop_set_uint32 (dev,"num-blocks" , size / sector_len);qdev_prop_set_uint64 (dev,"sector-length" , sector_len);qdev_prop_set_uint8 (dev,"width" , bank_width);qdev_prop_set_bit (dev,"big-endian" , !!be);
hw/block/pflash_cfi02.c +3 -2
@@ -720,7 +720,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int nb_mappings, int width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3,
@@ -733,7 +733,8 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort); } -qdev_prop_set_uint32 (dev,"num-blocks" , nb_blocs); +assert (size % sector_len ==0 ); +qdev_prop_set_uint32 (dev,"num-blocks" , size / sector_len);qdev_prop_set_uint32 (dev,"sector-length" , sector_len);qdev_prop_set_uint8 (dev,"width" , width);qdev_prop_set_uint8 (dev,"mappings" , nb_mappings);
hw/i386/pc_sysfw.c +1 -5
@@ -110,16 +110,13 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)int64_t size;char *fatal_errmsg =NULL ;hwaddr phys_addr =0x100000000ULL ; -int sector_bits, sector_size; +uint32_t sector_size =4096 ;PFlashCFI01 *system_flash;MemoryRegion *flash_mem;char name[64 ];void *flash_ptr;int ret, flash_size; - sector_bits =12 ; - sector_size =1 << sector_bits; - for (unit = 0; (unit < FLASH_MAP_UNIT_MAX && (pflash_drv = drive_get(IF_PFLASH, 0, unit)) != NULL);
@@ -162,7 +159,6 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)snprintf (name,sizeof name,"system.flash%d" , unit); system_flash = pflash_cfi01_register(phys_addr, name, size, blk, sector_size, - size >> sector_bits, 1 /* width */, 0x0000 /* id0 */, 0x0000 /* id1 */,
hw/lm32/lm32_boards.c +2 -2
@@ -116,7 +116,7 @@ static void lm32_evr_init(MachineState *machine)/* Spansion S29NS128P */ pflash_cfi02_register (flash_base,"lm32_evr.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - flash_sector_size, flash_size / flash_sector_size, + flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );/* create irq lines */
@@ -209,7 +209,7 @@ static void lm32_uclinux_init(MachineState *machine)/* Spansion S29NS128P */ pflash_cfi02_register (flash_base,"lm32_uclinux.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - flash_sector_size, flash_size / flash_sector_size, + flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );/* create irq lines */
hw/lm32/milkymist.c +1 -1
@@ -123,7 +123,7 @@ milkymist_init(MachineState *machine)/* Numonyx JS28F256J3F105 */ pflash_cfi01_register (flash_base,"milkymist.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - flash_sector_size, flash_size / flash_sector_size, + flash_sector_size,2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 );/* create irq lines */
hw/microblaze/petalogix_ml605_mmu.c +1 -1
@@ -109,7 +109,7 @@ petalogix_ml605_init(MachineState *machine)* 10th paremeter 0 means little-endian */ pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_ml605.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , +64 * KiB,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 );
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
@@ -90,7 +90,7 @@ petalogix_s3adsp1800_init(MachineState *machine)pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_s3adsp1800.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); dev =qdev_create (NULL ,"xlnx.xps-intc" );
hw/mips/mips_malta.c +3 -4
@@ -1208,7 +1208,6 @@ void mips_malta_init(MachineState *machine)DriveInfo *dinfo;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int fl_idx =0 ; -int fl_sectors = bios_size >>16 ;int be;DeviceState *dev =qdev_create (NULL ,TYPE_MIPS_MALTA );
@@ -1268,15 +1267,15 @@ void mips_malta_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " -"addr %08llx '%s' %x\n" , +"addr %08llx '%s'\n" , fl_idx,FLASH_SIZE ,FLASH_ADDRESS , -blk_name (dinfo->bdrv), fl_sectors); +blk_name (dinfo->bdrv)); }#endif fl =pflash_cfi01_register (FLASH_ADDRESS ,"mips_malta.bios" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , fl_sectors, +65536 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be); bios =pflash_cfi01_get_memory (fl); fl_idx++;
hw/mips/mips_r4k.c +1 -1
@@ -237,7 +237,7 @@ void mips_r4k_init(MachineState *machine)uint32_t mips_rom =0x00400000 ;if (!pflash_cfi01_register (0x1fc00000 ,"mips_r4k.bios" , mips_rom,blk_by_legacy_dinfo (dinfo), - sector_len, mips_rom / sector_len, + sector_len,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory.\n" ); }
hw/ppc/ppc405_boards.c +3 -3
@@ -195,7 +195,7 @@ static void ref405ep_init(MachineState *machine)pflash_cfi02_register (0xFFF80000 ,"ef405ep.bios" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , bios_size /65536 ,1 , +65536 ,1 ,2 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); }else
@@ -486,7 +486,7 @@ static void taihu_405ep_init(MachineState *machine)pflash_cfi02_register (0xFFE00000 ,"taihu_405ep.bios" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , bios_size /65536 ,1 , +65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;
@@ -528,7 +528,7 @@ static void taihu_405ep_init(MachineState *machine)#endif pflash_cfi02_register (0xfc000000 ,"taihu_405ep.flash" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , bios_size /65536 ,1 , +65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;
hw/ppc/sam460ex.c +1 -1
@@ -97,7 +97,7 @@ static int sam460ex_load_uboot(void)if (!pflash_cfi01_register (FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ),"sam460ex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 ,FLASH_SIZE /65536 , +65536 ,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */
hw/ppc/virtex_ml507.c +1 -1
@@ -229,7 +229,7 @@ static void virtex_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];
hw/sh4/r2d.c +1 -1
@@ -299,7 +299,7 @@ static void r2d_init(MachineState *machine)*/ pflash_cfi02_register (0x0 ,"r2d.flash" ,FLASH_SIZE /4 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -16 * KiB,FLASH_SIZE >>16 , +16 * KiB,1 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x555 ,0x2aa ,0 );
include/hw/block/flash.h +2 -2
@@ -17,7 +17,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3,
@@ -36,7 +36,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int nb_mappings, int width, uint16_t id0, uint16_t id1,
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
Quoted 35 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size should match @sector_len and @nb_blocs, i.e. size ==sector_len*nb_blocs. All callers satisfy this.Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/collie.c | 5 +++-- hw/arm/digic_boards.c | 1 - hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 1 - hw/arm/xilinx_zynq.c | 3 +-- hw/arm/z2.c | 2 +- hw/block/pflash_cfi01.c | 5 +++-- hw/block/pflash_cfi02.c | 5 +++-- hw/i386/pc_sysfw.c | 6 +----- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 7 +++---- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 36 insertions(+), 41 deletions(-)
hw/mips/mips_malta.c void mips_malta_init(MachineState *machine) · line 1274
Quoted 10 lines
hw/mips/mips_malta.c +2
-2@@ -1268,15 +1267,15 @@ void mips_malta_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " -"addr %08llx '%s' %x\n" , +"addr %08llx '%s'\n" , fl_idx,FLASH_SIZE ,FLASH_ADDRESS , -blk_name (dinfo->bdrv), fl_sectors); +blk_name (dinfo->bdrv)); }#endif
This change is somewhat observable, but I guess it's harmless.
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
Quoted 3 lines · Laszlo Ersek
Quoted 2 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size should
I meant to point out the typo above, but I got distracted mid-review. Sorry!
Thanks
Laszlo
Quoted 48 lines
Quoted 33 lines
match @sector_len and @nb_blocs, i.e. size ==
sector_len*nb_blocs. All callers satisfy this.Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/collie.c | 5 +++-- hw/arm/digic_boards.c | 1 - hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 1 - hw/arm/xilinx_zynq.c | 3 +-- hw/arm/z2.c | 2 +- hw/block/pflash_cfi01.c | 5 +++-- hw/block/pflash_cfi02.c | 5 +++-- hw/i386/pc_sysfw.c | 6 +----- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 7 +++---- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 36 insertions(+), 41 deletions(-)hw/mips/mips_malta.c void mips_malta_init(MachineState *machine) · line 1274
Quoted 10 lines
hw/mips/mips_malta.c +2
-2@@ -1268,15 +1267,15 @@ void mips_malta_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " -"addr %08llx '%s' %x\n" , +"addr %08llx '%s'\n" , fl_idx,FLASH_SIZE ,FLASH_ADDRESS , -blk_name (dinfo->bdrv), fl_sectors); +blk_name (dinfo->bdrv)); }#endif This change is somewhat observable, but I guess it's harmless.
Reviewed-by Laszlo Ersek <[email protected]>
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
Quoted 6 lines · Laszlo Ersek
Quoted 3 lines · Laszlo Ersek
Quoted 2 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size shouldI meant to point out the typo above, but I got distracted mid-review. Sorry!
Will fix, thanks!
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
In reply to Markus ArmbrusterQuoted 407 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size should match @sector_len and @nb_blocs, i.e. size ==sector_len*nb_blocs. All callers satisfy this.Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/collie.c | 5 +++-- hw/arm/digic_boards.c | 1 - hw/arm/gumstix.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 1 - hw/arm/xilinx_zynq.c | 3 +-- hw/arm/z2.c | 2 +- hw/block/pflash_cfi01.c | 5 +++-- hw/block/pflash_cfi02.c | 5 +++-- hw/i386/pc_sysfw.c | 6 +----- hw/lm32/lm32_boards.c | 4 ++-- hw/lm32/milkymist.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 7 +++---- hw/mips/mips_r4k.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- include/hw/block/flash.h | 4 ++-- 23 files changed, 36 insertions(+), 41 deletions(-)hw/arm/collie.c +3
-2@@ -9,6 +9,7 @@* GNU GPL, version 2 or (at your option) any later version. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h" @@ -38,12 +39,12 @@ static void collie_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (SA_CS0 ,"collie.fl1" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); +64 * KiB,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); dinfo =drive_get (IF_PFLASH ,0 ,1 );pflash_cfi01_register (SA_CS1 ,"collie.fl2" ,0x02000000 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - (64 *1024 ),512 ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 ); +64 * KiB,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 );sysbus_create_simple ("scoop" ,0x40800000 ,NULL );hw/arm/digic_boards.c +0
-1@@ -131,7 +131,6 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, - FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE, DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE, 4, 0x00EC, 0x007E, 0x0003, 0x0001,hw/arm/gumstix.c +2
-2@@ -74,7 +74,7 @@ static void connex_init(MachineState *machine)#endif if (!pflash_cfi01_register (0x00000000 ,"connext.rom" , connex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - sector_len, connex_rom / sector_len, + sector_len,2 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 );@@ -111,7 +111,7 @@ static void verdex_init(MachineState *machine)#endif if (!pflash_cfi01_register (0x00000000 ,"verdex.rom" , verdex_rom, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - sector_len, verdex_rom / sector_len, + sector_len,2 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 );hw/arm/mainstone.c +1
-1@@ -152,7 +152,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, i ? "mainstone.flash1" : "mainstone.flash0", MAINSTONE_FLASH, blk_by_legacy_dinfo(dinfo), - sector_len, MAINSTONE_FLASH / sector_len, + sector_len, 4, 0, 0, 0, 0, be)) {error_report ("Error registering flash memory" );exit (1 );hw/arm/musicpal.c +2
-2@@ -1638,14 +1638,14 @@ static void musicpal_init(MachineState *machine)#ifdef TARGET_WORDS_BIGENDIAN pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, - blk,0x10000 , (flash_size +0xffff ) >>16 , + blk,0x10000 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,1 );#else pflash_cfi02_register (0x100000000ULL -MP_FLASH_SIZE_MAX ,"musicpal.flash" , flash_size, - blk,0x10000 , (flash_size +0xffff ) >>16 , + blk,0x10000 ,MP_FLASH_SIZE_MAX / flash_size,2 ,0x00BF ,0x236D ,0x0000 ,0x0000 ,0x5555 ,0x2AAA ,0 );hw/arm/omap_sx1.c +2
-2@@ -155,7 +155,7 @@ static void sx1_init(MachineState *machine, const int version)if (!pflash_cfi01_register (OMAP_CS0_BASE ,"omap_sx1.flash0-1" , flash_size,blk_by_legacy_dinfo (dinfo), - sector_size, flash_size / sector_size, + sector_size,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory %d.\n" , fl_idx);@@ -179,7 +179,7 @@ static void sx1_init(MachineState *machine, const int version)if (!pflash_cfi01_register (OMAP_CS1_BASE ,"omap_sx1.flash1-1" , flash1_size,blk_by_legacy_dinfo (dinfo), - sector_size, flash1_size / sector_size, + sector_size,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory %d.\n" , fl_idx);hw/arm/versatilepb.c +0
-1@@ -369,7 +369,6 @@ static void versatile_init(MachineState *machine, int board_id) VERSATILE_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, VERSATILE_FLASH_SECT_SIZE, - VERSATILE_FLASH_SIZE / VERSATILE_FLASH_SECT_SIZE, 4, 0x0089, 0x0018, 0x0000, 0x0, 0)) {fprintf (stderr,"qemu: Error registering flash memory.\n" ); }hw/arm/xilinx_zynq.c +1
-2@@ -207,8 +207,7 @@ static void zynq_init(MachineState *machine)/* AMD */ pflash_cfi02_register (0xe2000000 ,"zynq.pflash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -FLASH_SECTOR_SIZE , -FLASH_SIZE /FLASH_SECTOR_SIZE ,1 , +FLASH_SECTOR_SIZE ,1 ,1 ,0x0066 ,0x0022 ,0x0000 ,0x0000 ,0x0555 ,0x2aa ,0 );hw/arm/z2.c +1
-1@@ -326,7 +326,7 @@ static void z2_init(MachineState *machine)if (!pflash_cfi01_register (Z2_FLASH_BASE ,"z2.flash0" ,Z2_FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - sector_len,Z2_FLASH_SIZE / sector_len, + sector_len,4 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 );hw/block/pflash_cfi01.c +3
-2@@ -924,7 +924,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int bank_width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3,@@ -935,7 +935,8 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort); } -qdev_prop_set_uint32 (dev,"num-blocks" , nb_blocs); +assert (size % sector_len ==0 ); +qdev_prop_set_uint32 (dev,"num-blocks" , size / sector_len);qdev_prop_set_uint64 (dev,"sector-length" , sector_len);qdev_prop_set_uint8 (dev,"width" , bank_width);qdev_prop_set_bit (dev,"big-endian" , !!be);hw/block/pflash_cfi02.c +3
-2@@ -720,7 +720,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int nb_mappings, int width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3,@@ -733,7 +733,8 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort); } -qdev_prop_set_uint32 (dev,"num-blocks" , nb_blocs); +assert (size % sector_len ==0 ); +qdev_prop_set_uint32 (dev,"num-blocks" , size / sector_len);qdev_prop_set_uint32 (dev,"sector-length" , sector_len);qdev_prop_set_uint8 (dev,"width" , width);qdev_prop_set_uint8 (dev,"mappings" , nb_mappings);hw/i386/pc_sysfw.c +1
-5@@ -110,16 +110,13 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)int64_t size;char *fatal_errmsg =NULL ;hwaddr phys_addr =0x100000000ULL ; -int sector_bits, sector_size; +uint32_t sector_size =4096 ;PFlashCFI01 *system_flash;MemoryRegion *flash_mem;char name[64 ];void *flash_ptr;int ret, flash_size; - sector_bits =12 ; - sector_size =1 << sector_bits; - for (unit = 0; (unit < FLASH_MAP_UNIT_MAX && (pflash_drv = drive_get(IF_PFLASH, 0, unit)) != NULL);@@ -162,7 +159,6 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)snprintf (name,sizeof name,"system.flash%d" , unit); system_flash = pflash_cfi01_register(phys_addr, name, size, blk, sector_size, - size >> sector_bits, 1 /* width */, 0x0000 /* id0 */, 0x0000 /* id1 */,hw/lm32/lm32_boards.c +2
-2@@ -116,7 +116,7 @@ static void lm32_evr_init(MachineState *machine)/* Spansion S29NS128P */ pflash_cfi02_register (flash_base,"lm32_evr.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - flash_sector_size, flash_size / flash_sector_size, + flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );/* create irq lines */ @@ -209,7 +209,7 @@ static void lm32_uclinux_init(MachineState *machine)/* Spansion S29NS128P */ pflash_cfi02_register (flash_base,"lm32_uclinux.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - flash_sector_size, flash_size / flash_sector_size, + flash_sector_size,1 ,2 ,0x01 ,0x7e ,0x43 ,0x00 ,0x555 ,0x2aa ,1 );/* create irq lines */ hw/lm32/milkymist.c +1
-1@@ -123,7 +123,7 @@ milkymist_init(MachineState *machine)/* Numonyx JS28F256J3F105 */ pflash_cfi01_register (flash_base,"milkymist.flash" , flash_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , - flash_sector_size, flash_size / flash_sector_size, + flash_sector_size,2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 );/* create irq lines */ hw/microblaze/petalogix_ml605_mmu.c +1
-1@@ -109,7 +109,7 @@ petalogix_ml605_init(MachineState *machine)* 10th paremeter 0 means little-endian */ pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_ml605.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , +64 * KiB,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 );hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-1@@ -90,7 +90,7 @@ petalogix_s3adsp1800_init(MachineState *machine)pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_s3adsp1800.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); dev =qdev_create (NULL ,"xlnx.xps-intc" );hw/mips/mips_malta.c +3
-4@@ -1208,7 +1208,6 @@ void mips_malta_init(MachineState *machine)DriveInfo *dinfo;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int fl_idx =0 ; -int fl_sectors = bios_size >>16 ;int be;DeviceState *dev =qdev_create (NULL ,TYPE_MIPS_MALTA );@@ -1268,15 +1267,15 @@ void mips_malta_init(MachineState *machine)#ifdef DEBUG_BOARD_INIT if (dinfo) {printf ("Register parallel flash %d size " TARGET_FMT_lx" at " -"addr %08llx '%s' %x\n" , +"addr %08llx '%s'\n" , fl_idx,FLASH_SIZE ,FLASH_ADDRESS , -blk_name (dinfo->bdrv), fl_sectors); +blk_name (dinfo->bdrv)); }#endif fl =pflash_cfi01_register (FLASH_ADDRESS ,"mips_malta.bios" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , fl_sectors, +65536 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be); bios =pflash_cfi01_get_memory (fl); fl_idx++;hw/mips/mips_r4k.c +1
-1@@ -237,7 +237,7 @@ void mips_r4k_init(MachineState *machine)uint32_t mips_rom =0x00400000 ;if (!pflash_cfi01_register (0x1fc00000 ,"mips_r4k.bios" , mips_rom,blk_by_legacy_dinfo (dinfo), - sector_len, mips_rom / sector_len, + sector_len,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory.\n" ); }hw/ppc/ppc405_boards.c +3
-3@@ -195,7 +195,7 @@ static void ref405ep_init(MachineState *machine)pflash_cfi02_register (0xFFF80000 ,"ef405ep.bios" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , bios_size /65536 ,1 , +65536 ,1 ,2 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); }else @@ -486,7 +486,7 @@ static void taihu_405ep_init(MachineState *machine)pflash_cfi02_register (0xFFE00000 ,"taihu_405ep.bios" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , bios_size /65536 ,1 , +65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;@@ -528,7 +528,7 @@ static void taihu_405ep_init(MachineState *machine)#endif pflash_cfi02_register (0xfc000000 ,"taihu_405ep.flash" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -65536 , bios_size /65536 ,1 , +65536 ,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;hw/ppc/sam460ex.c +0
-0
hw/ppc/sam460ex.c static int sam460ex_load_uboot(void) · line 100
Quoted 5 lines
hw/ppc/sam460ex.c +1
-1@@ -97,7 +97,7 @@ static int sam460ex_load_uboot(void) if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - 65536, FLASH_SIZE / 65536, + 65536,
64 * KiB?
Quoted 43 lines
hw/ppc/sam460ex.c +0
-01, 0x89, 0x18, 0x0000, 0x0, 1)) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ hw/ppc/virtex_ml507.c +1
-1@@ -229,7 +229,7 @@ static void virtex_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi01_register (PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];hw/sh4/r2d.c +1
-1@@ -299,7 +299,7 @@ static void r2d_init(MachineState *machine)*/ pflash_cfi02_register (0x0 ,"r2d.flash" ,FLASH_SIZE /4 , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -16 * KiB,FLASH_SIZE >>16 , +16 * KiB,1 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x555 ,0x2aa ,0 );include/hw/block/flash.h +1
-1@@ -17,7 +17,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3,
include/hw/block/flash.h PFlashCFI02 *pflash_cfi02_register(hwaddr base, · line 42
Quoted 8 lines
include/hw/block/flash.h +1
-1@@ -36,7 +36,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,const char *name, hwaddr size, BlockBackend *blk, - uint32_t sector_len, int nb_blocs, + uint32_t sector_len, int nb_mappings, int width, uint16_t id0, uint16_t id1,
Otherwise:
--
Alex Bennée
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
Quoted 11 lines · Alex Bennée
Quoted 9 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size should match @sector_len and @nb_blocs, i.e. size ==sector_len*nb_blocs. All callers satisfy this.Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>---
[...]
Quoted 4 lines
Quoted 4 lines
hw/ppc/sam460ex.c +0
-0
Quoted 8 lines
hw/ppc/sam460ex.c static int sam460ex_load_uboot(void) · line 100
Quoted 6 lines
hw/ppc/sam460ex.c +1
-1@@ -97,7 +97,7 @@ static int sam460ex_load_uboot(void) if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - 65536, FLASH_SIZE / 65536, + 65536,64 * KiB?
I generally prefer to keep big, repetitive patches as mechanical as possible. But if it's desired, I'll make this change.
Zoltan, David, David, you're maintainers, do you have a preference?
Quoted 3 lines
Quoted 3 lines
hw/ppc/sam460ex.c +0
-01, 0x89, 0x18, 0x0000, 0x0, 1)) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */
[...]
Quoted 4 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>
Thanks!
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
Quoted 27 lines · Markus Armbruster
Quoted 11 lines · Alex Bennée
Quoted 9 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size should match @sector_len and @nb_blocs, i.e. size ==sector_len*nb_blocs. All callers satisfy this.Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>---
[...]
Quoted 4 lines
Quoted 4 lines
hw/ppc/sam460ex.c +0
-0Quoted 8 lines
hw/ppc/sam460ex.c static int sam460ex_load_uboot(void) · line 100
Quoted 6 lines
hw/ppc/sam460ex.c +1
-1@@ -97,7 +97,7 @@ static int sam460ex_load_uboot(void) if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - 65536, FLASH_SIZE / 65536, + 65536,64 * KiB?
Quoted 4 lines
I generally prefer to keep big, repetitive patches as mechanical as possible. But if it's desired, I'll make this change.
Zoltan, David, David, you're maintainers, do you have a preference?
For the sam460ex, this is 64 * KiB now before your patches which matches other similar numbers in this file. I've already said I prefer to keep it as 64 * KiB in reply to your [PATCH 04/10] which changed it and you've agreed to that a few days ago. If you fix that patch (04/10) this one remains mechanical.
Regards,
BALATON Zoltan
Quoted 13 lines
Quoted 4 lines
Quoted 4 lines
hw/ppc/sam460ex.c +0
-01, 0x89, 0x18, 0x0000, 0x0, 1)) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ [...]
Quoted 4 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>Thanks!
Re: [Qemu-devel] [PATCH 09/10] pflash: Clean up after commit 368a354f02b part 2
Quoted 31 lines · BALATON Zoltan
Quoted 30 lines · Markus Armbruster
Quoted 11 lines · Alex Bennée
Quoted 9 lines · Markus Armbruster
QOMification left parameter @size unused in
pflash_cfi01_register()andpflash_cfi02_register().register(). Obviously, @size should match @sector_len and @nb_blocs, i.e. size ==sector_len*nb_blocs. All callers satisfy this.Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>---
[...]
Quoted 4 lines
Quoted 4 lines
hw/ppc/sam460ex.c +0
-0Quoted 8 lines
hw/ppc/sam460ex.c static int sam460ex_load_uboot(void) · line 100
Quoted 6 lines
hw/ppc/sam460ex.c +1
-1@@ -97,7 +97,7 @@ static int sam460ex_load_uboot(void) if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32), "sam460ex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - 65536, FLASH_SIZE / 65536, + 65536,64 * KiB?
I generally prefer to keep big, repetitive patches as mechanical as possible. But if it's desired, I'll make this change.
Quoted 7 lines
Quoted 1 line
Zoltan, David, David, you're maintainers, do you have a preference?
For the sam460ex, this is 64 * KiB now before your patches which matches other similar numbers in this file. I've already said I prefer to keep it as 64 * KiB in reply to your [PATCH 04/10] which changed it and you've agreed to that a few days ago. If you fix that patch (04/10) this one remains mechanical.
You're 100% right. I failed to recall that detail from previous review when I wrote the reply above.
Thanks!
PATCH 10/10 hw/arm hw/xtensa: De-duplicate pflash creation code some
In reply to Markus Armbrusterpflash_cfi01_register() creates a TYPE_CFI_PFLASH01 device, sets properties, realizes, and wires up.
We have three modified copies of it, because their users need to set additional properties, or have the wiring done differently.
Factor out their common part into pflash_cfi01_create().
--- hw/arm/vexpress.c | 22 +++++----------------- hw/arm/virt.c | 26 +++++++++----------------- hw/block/pflash_cfi01.c | 39 +++++++++++++++++++++++++++------------ hw/xtensa/xtfpga.c | 18 +++++++----------- include/hw/block/flash.h | 8 ++++++++ 5 files changed, 56 insertions(+), 57 deletions(-)
hw/arm/vexpress.c +5 -17
@@ -515,26 +515,14 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); +DeviceState *dev; -if (di) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (di), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , -VEXPRESS_FLASH_SIZE /VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint64 (dev,"sector-length" ,VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint8 (dev,"width" ,4 ); + dev =DEVICE (pflash_cfi01_create (name,VEXPRESS_FLASH_SIZE , + di ?blk_by_legacy_dinfo (di) :NULL , +VEXPRESS_FLASH_SECT_SIZE , +4 ,0x89 ,0x18 ,0x00 ,0x00 , false));qdev_prop_set_uint8 (dev,"device-width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , false); -qdev_prop_set_uint16 (dev,"id0" ,0x89 ); -qdev_prop_set_uint16 (dev,"id1" ,0x18 ); -qdev_prop_set_uint16 (dev,"id2" ,0x00 ); -qdev_prop_set_uint16 (dev,"id3" ,0x00 ); -qdev_prop_set_string (dev,"name" , name);qdev_init_nofail (dev); -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return CFI_PFLASH01 (dev); }
hw/arm/virt.c +9 -17
@@ -48,6 +48,7 @@#include "exec/address-spaces.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/units.h" #include "hw/pci-host/gpex.h" #include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h"
@@ -875,29 +876,20 @@ static void create_one_flash(const char *name, hwaddr flashbase,* parameters as the flash devices on the Versatile Express board. */ DriveInfo *dinfo =drive_get_next (IF_PFLASH ); -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; +DeviceState *dev; +SysBusDevice *sbd; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } + dev =DEVICE (pflash_cfi01_create (name, flashsize, + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +256 * KiB, +4 ,0x89 ,0x18 ,0x00 ,0x00 , false)); -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); -qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , false); -qdev_prop_set_uint16 (dev,"id0" ,0x89 ); -qdev_prop_set_uint16 (dev,"id1" ,0x18 ); -qdev_prop_set_uint16 (dev,"id2" ,0x00 ); -qdev_prop_set_uint16 (dev,"id3" ,0x00 ); -qdev_prop_set_string (dev,"name" , name);qdev_init_nofail (dev); + sbd =SYS_BUS_DEVICE (dev);memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); +sysbus_mmio_get_region (sbd,0 ));if (file) {char *fn;
hw/block/pflash_cfi01.c +27 -12
@@ -920,15 +920,14 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) -PFlashCFI01 *pflash_cfi01_register(hwaddr base, -const char *name, -hwaddr size, -BlockBackend *blk, -uint32_t sector_len, -int bank_width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3, -int be) +PFlashCFI01 *pflash_cfi01_create(const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len, +int bank_width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be) {DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );
@@ -945,12 +944,28 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,qdev_prop_set_uint16 (dev,"id2" , id2);qdev_prop_set_uint16 (dev,"id3" , id3);qdev_prop_set_string (dev,"name" , name); -qdev_init_nofail (dev); - -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return CFI_PFLASH01 (dev); } +PFlashCFI01 *pflash_cfi01_register (hwaddr base, +const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len, +int bank_width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be) +{ +PFlashCFI01 *dev =pflash_cfi01_create (name, size, blk, + sector_len, bank_width, + id0, id1, id2, id3, be); + +qdev_init_nofail (DEVICE (dev)); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); +return dev; +} +MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl) {return &fl->mem;
hw/xtensa/xtfpga.c +7 -11
@@ -167,21 +167,17 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, DriveInfo *dinfo, int be) {SysBusDevice *s; -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); +PFlashCFI01 *dev =pflash_cfi01_create ("xtfpga.io.flash" , + board->flash->size, +blk_by_legacy_dinfo (dinfo), + board->flash->sector_size, +2 ,0 ,0 ,0 ,0 , be); -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); -qdev_prop_set_uint32 (dev,"num-blocks" , - board->flash->size / board->flash->sector_size); -qdev_prop_set_uint64 (dev,"sector-length" , board->flash->sector_size); -qdev_prop_set_uint8 (dev,"width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , be); -qdev_prop_set_string (dev,"name" ,"xtfpga.io.flash" ); -qdev_init_nofail (dev); +qdev_init_nofail (DEVICE (dev)); s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return CFI_PFLASH01 (dev); +return dev; }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)
include/hw/block/flash.h +8 -0
@@ -13,6 +13,14 @@typedef struct PFlashCFI01 PFlashCFI01 ; +PFlashCFI01 *pflash_cfi01_create (const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len, +int width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be); PFlashCFI01 *pflash_cfi01_register(hwaddr base, const char *name, hwaddr size,
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH 10/10] hw/arm hw/xtensa: De-duplicate pflash creation code some
Quoted 206 lines · Markus Armbruster
pflash_cfi01_register()creates aTYPE_CFI_PFLASH01device, sets properties, realizes, and wires up.We have three modified copies of it, because their users need to set additional properties, or have the wiring done differently.
Factor out their common part into
pflash_cfi01_create().Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 22 +++++----------------- hw/arm/virt.c | 26 +++++++++----------------- hw/block/pflash_cfi01.c | 39 +++++++++++++++++++++++++++------------ hw/xtensa/xtfpga.c | 18 +++++++----------- include/hw/block/flash.h | 8 ++++++++ 5 files changed, 56 insertions(+), 57 deletions(-)hw/arm/vexpress.c +5
-17@@ -515,26 +515,14 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); +DeviceState *dev; -if (di) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (di), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , -VEXPRESS_FLASH_SIZE /VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint64 (dev,"sector-length" ,VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint8 (dev,"width" ,4 ); + dev =DEVICE (pflash_cfi01_create (name,VEXPRESS_FLASH_SIZE , + di ?blk_by_legacy_dinfo (di) :NULL , +VEXPRESS_FLASH_SECT_SIZE , +4 ,0x89 ,0x18 ,0x00 ,0x00 , false));qdev_prop_set_uint8 (dev,"device-width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , false); -qdev_prop_set_uint16 (dev,"id0" ,0x89 ); -qdev_prop_set_uint16 (dev,"id1" ,0x18 ); -qdev_prop_set_uint16 (dev,"id2" ,0x00 ); -qdev_prop_set_uint16 (dev,"id3" ,0x00 ); -qdev_prop_set_string (dev,"name" , name);qdev_init_nofail (dev); -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return CFI_PFLASH01 (dev); }hw/arm/virt.c +9
-17@@ -48,6 +48,7 @@#include "exec/address-spaces.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/units.h" #include "hw/pci-host/gpex.h" #include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h" @@ -875,29 +876,20 @@ static void create_one_flash(const char *name, hwaddr flashbase,* parameters as the flash devices on the Versatile Express board. */ DriveInfo *dinfo =drive_get_next (IF_PFLASH ); -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; +DeviceState *dev; +SysBusDevice *sbd; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } + dev =DEVICE (pflash_cfi01_create (name, flashsize, + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +256 * KiB, +4 ,0x89 ,0x18 ,0x00 ,0x00 , false)); -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); -qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , false); -qdev_prop_set_uint16 (dev,"id0" ,0x89 ); -qdev_prop_set_uint16 (dev,"id1" ,0x18 ); -qdev_prop_set_uint16 (dev,"id2" ,0x00 ); -qdev_prop_set_uint16 (dev,"id3" ,0x00 ); -qdev_prop_set_string (dev,"name" , name);qdev_init_nofail (dev); + sbd =SYS_BUS_DEVICE (dev);memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); +sysbus_mmio_get_region (sbd,0 ));if (file) {char *fn;hw/block/pflash_cfi01.c +27
-12@@ -920,15 +920,14 @@ static void pflash_cfi01_register_types(void)type_init (pflash_cfi01_register_types) -PFlashCFI01 *pflash_cfi01_register(hwaddr base, -const char *name, -hwaddr size, -BlockBackend *blk, -uint32_t sector_len, -int bank_width, -uint16_t id0,uint16_t id1, -uint16_t id2,uint16_t id3, -int be) +PFlashCFI01 *pflash_cfi01_create(const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len, +int bank_width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be) {DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 );@@ -945,12 +944,28 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,qdev_prop_set_uint16 (dev,"id2" , id2);qdev_prop_set_uint16 (dev,"id3" , id3);qdev_prop_set_string (dev,"name" , name); -qdev_init_nofail (dev); - -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return CFI_PFLASH01 (dev); } +PFlashCFI01 *pflash_cfi01_register (hwaddr base, +const char *name, +hwaddr size, +BlockBackend *blk, +uint32_t sector_len, +int bank_width, +uint16_t id0,uint16_t id1, +uint16_t id2,uint16_t id3, +int be) +{ +PFlashCFI01 *dev =pflash_cfi01_create (name, size, blk, + sector_len, bank_width, + id0, id1, id2, id3, be); + +qdev_init_nofail (DEVICE (dev)); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); +return dev; +} +MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl) {return &fl->mem;hw/xtensa/xtfpga.c +7
-11@@ -167,21 +167,17 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, DriveInfo *dinfo, int be) {SysBusDevice *s; -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); +PFlashCFI01 *dev =pflash_cfi01_create ("xtfpga.io.flash" , + board->flash->size, +blk_by_legacy_dinfo (dinfo), + board->flash->sector_size, +2 ,0 ,0 ,0 ,0 , be); -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); -qdev_prop_set_uint32 (dev,"num-blocks" , - board->flash->size / board->flash->sector_size); -qdev_prop_set_uint64 (dev,"sector-length" , board->flash->sector_size); -qdev_prop_set_uint8 (dev,"width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , be); -qdev_prop_set_string (dev,"name" ,"xtfpga.io.flash" ); -qdev_init_nofail (dev); +qdev_init_nofail (DEVICE (dev)); s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 )); -return CFI_PFLASH01 (dev); +return dev; }static uint64_t translate_phys_addr (void *opaque,uint64_t addr)include/hw/block/flash.h +1
-0@@ -13,6 +13,14 @@typedef struct PFlashCFI01 PFlashCFI01 ; +PFlashCFI01 *pflash_cfi01_create(const char *name,
include/hw/block/flash.h line 26
Quoted 10 lines
include/hw/block/flash.h +7
-0+hwaddr size, + BlockBackend *blk, + uint32_t sector_len, + int width, + uint16_t id0, uint16_t id1, + uint16_t id2, uint16_t id3, + int be); PFlashCFI01 *pflash_cfi01_register(hwaddr base, const char *name, hwaddr size,
Writing this patch must have been "fun"; my eyes are bleeding from cross-referencing the new parameters with the removed properties. :/
I think the patch is correct.
Thanks
Laszlo
Re: [Qemu-devel] [PATCH 10/10] hw/arm hw/xtensa: De-duplicate pflash creation code some
In reply to Markus ArmbrusterQuoted 7 lines · Markus Armbruster
pflash_cfi01_register()creates aTYPE_CFI_PFLASH01device, sets properties, realizes, and wires up.We have three modified copies of it, because their users need to set additional properties, or have the wiring done differently.
Quoted 8 lines
Factor out their common part into
pflash_cfi01_create().Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 22 +++++----------------- hw/arm/virt.c | 26 +++++++++----------------- hw/block/pflash_cfi01.c | 39 +++++++++++++++++++++++++++------------ hw/xtensa/xtfpga.c | 18 +++++++-----------
I was told that it's better this way when I did that initially:
http://lists.gnu.org/archive/html/qemu-devel/2015-09/msg06927.html
Has the idea of "better" changed since then?
I'm fine with the code either way, just curious.
Signature · 2 lines
Thanks. -- Max
Re: [Qemu-devel] [PATCH 10/10] hw/arm hw/xtensa: De-duplicate pflash creation code some
Quoted 17 lines · Max Filippov
Quoted 7 lines · Markus Armbruster
pflash_cfi01_register()creates aTYPE_CFI_PFLASH01device, sets properties, realizes, and wires up.We have three modified copies of it, because their users need to set additional properties, or have the wiring done differently.
Quoted 8 lines
Factor out their common part into
pflash_cfi01_create().Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 22 +++++----------------- hw/arm/virt.c | 26 +++++++++----------------- hw/block/pflash_cfi01.c | 39 +++++++++++++++++++++++++++------------ hw/xtensa/xtfpga.c | 18 +++++++-----------
Quoted 5 lines
I was told that it's better this way when I did that initially:
http://lists.gnu.org/archive/html/qemu-devel/2015-09/msg06927.htmlHas the idea of "better" changed since then?
I'm fine with the code either way, just curious.
I'm not sure about our collective idea of "better". I simply saw a helper function duplicated with minor variations because it fails to capture what's truly common, so I fixed that.
If we think helper functions capturing device creation and property setting are bad, and open coding would be better. then we should get rid of pflash_cfi01_register() and pflash_cfi02_register() everywhere, not just avoid it in these three places.
Cc'ing the usual QOM suspects for guidance.
Re: [Qemu-devel] [PATCH 10/10] hw/arm hw/xtensa: De-duplicate pflash creation code some
In reply to Markus ArmbrusterQuoted 44 lines · Markus Armbruster
pflash_cfi01_register()creates aTYPE_CFI_PFLASH01device, sets properties, realizes, and wires up.We have three modified copies of it, because their users need to set additional properties, or have the wiring done differently.
Factor out their common part into
pflash_cfi01_create().Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 22 +++++----------------- hw/arm/virt.c | 26 +++++++++----------------- hw/block/pflash_cfi01.c | 39 +++++++++++++++++++++++++++------------ hw/xtensa/xtfpga.c | 18 +++++++----------- include/hw/block/flash.h | 8 ++++++++ 5 files changed, 56 insertions(+), 57 deletions(-)hw/arm/vexpress.c +5
-11@@ -515,26 +515,14 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); +DeviceState *dev; -if (di) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (di), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , -VEXPRESS_FLASH_SIZE /VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint64 (dev,"sector-length" ,VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint8 (dev,"width" ,4 ); + dev =DEVICE (pflash_cfi01_create (name,VEXPRESS_FLASH_SIZE , + di ?blk_by_legacy_dinfo (di) :NULL , +VEXPRESS_FLASH_SECT_SIZE , +4 ,0x89 ,0x18 ,0x00 ,0x00 , false));qdev_prop_set_uint8 (dev,"device-width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , false);
hw/arm/vexpress.c static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt) · line 528
Quoted 10 lines
hw/arm/vexpress.c +0
-6-qdev_prop_set_uint16 (dev,"id0" ,0x89 ); -qdev_prop_set_uint16 (dev,"id1" ,0x18 ); -qdev_prop_set_uint16 (dev,"id2" ,0x00 ); -qdev_prop_set_uint16 (dev,"id3" ,0x00 ); -qdev_prop_set_string (dev,"name" , name);qdev_init_nofail (dev); -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return CFI_PFLASH01 (dev); }
I prefer this code the way it stands. In particular the "call another function but then set the 'device-width' property here" looks dubious. But broadly speaking the "do all the property setting directly rather than calling a helper function" is the style choice I think we should be aiming for. (The prevalence of the other approach is due to a mix of (1) older code we haven't updated and
(2) property-setting being annoyingly heavyweight syntax.)
thanks
-- PMM
Re: [Qemu-devel] [PATCH 10/10] hw/arm hw/xtensa: De-duplicate pflash creation code some
Quoted 57 lines · Peter Maydell
Quoted 44 lines · Markus Armbruster
pflash_cfi01_register()creates aTYPE_CFI_PFLASH01device, sets properties, realizes, and wires up.We have three modified copies of it, because their users need to set additional properties, or have the wiring done differently.
Factor out their common part into
pflash_cfi01_create().Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/vexpress.c | 22 +++++----------------- hw/arm/virt.c | 26 +++++++++----------------- hw/block/pflash_cfi01.c | 39 +++++++++++++++++++++++++++------------ hw/xtensa/xtfpga.c | 18 +++++++----------- include/hw/block/flash.h | 8 ++++++++ 5 files changed, 56 insertions(+), 57 deletions(-)hw/arm/vexpress.c +5
-11@@ -515,26 +515,14 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH01 ); +DeviceState *dev; -if (di) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (di), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , -VEXPRESS_FLASH_SIZE /VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint64 (dev,"sector-length" ,VEXPRESS_FLASH_SECT_SIZE ); -qdev_prop_set_uint8 (dev,"width" ,4 ); + dev =DEVICE (pflash_cfi01_create (name,VEXPRESS_FLASH_SIZE , + di ?blk_by_legacy_dinfo (di) :NULL , +VEXPRESS_FLASH_SECT_SIZE , +4 ,0x89 ,0x18 ,0x00 ,0x00 , false));qdev_prop_set_uint8 (dev,"device-width" ,2 ); -qdev_prop_set_bit (dev,"big-endian" , false);hw/arm/vexpress.c static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt) · line 528
Quoted 10 lines
hw/arm/vexpress.c +0
-6-qdev_prop_set_uint16 (dev,"id0" ,0x89 ); -qdev_prop_set_uint16 (dev,"id1" ,0x18 ); -qdev_prop_set_uint16 (dev,"id2" ,0x00 ); -qdev_prop_set_uint16 (dev,"id3" ,0x00 ); -qdev_prop_set_string (dev,"name" , name);qdev_init_nofail (dev); -sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return CFI_PFLASH01 (dev); }I prefer this code the way it stands. In particular the
Quoted 8 lines
"call another function but then set the 'device-width' property here" looks dubious. But broadly speaking the "do all the property setting directly rather than calling a helper function" is the style choice I think we should be aiming for. (The prevalence of the other approach is due to a mix of (1) older code we haven't updated and
(2) property-setting being annoyingly heavyweight syntax.)
Okay, no problem.
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'03f9a76b8c hw/arm hw/xtensa: De-duplicate pflash creation code some 4e432c01fe pflash: Clean up after commit 368a354f02b part 2 bd61cf81c3 pflash: Clean up after commit 368a354f02b part 1 31e9871f71 mips_malta: Clean up definition of flash memory size somewhat 66c8ac0932 r2d: Flash memory creation is confused about size, mark FIXME 857cd68a50 ppc405_boards: Don't size flash memory to match backing image 170a8ce912 sam460ex: Don't size flash memory to match backing image aa2df2f4fd hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} 588d5b718c pflash: Macro PFLASH_BUG() is used just once, expand f4339a63b6 pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit f4339a63b6dd (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #127: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #339: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #357: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 588d5b718cc4 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit aa2df2f4fd70 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit 170a8ce912fd (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit 857cd68a500d (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 66c8ac09327b (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit 31e9871f7159 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit bd61cf81c38f (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#89: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#97: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 4e432c01fea3 (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 03f9a76b8cbd (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'9a994e41a5 hw/arm hw/xtensa: De-duplicate pflash creation code some 303fbacd55 pflash: Clean up after commit 368a354f02b part 2 3f16bf66bc pflash: Clean up after commit 368a354f02b part 1 3e2ae31e84 mips_malta: Clean up definition of flash memory size somewhat d0652958b7 r2d: Flash memory creation is confused about size, mark FIXME f26f2e4d2d ppc405_boards: Don't size flash memory to match backing image e5dd4a33f5 sam460ex: Don't size flash memory to match backing image 2eec664e4d hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} 83da6876dd pflash: Macro PFLASH_BUG() is used just once, expand 0b9075ea6a pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit 0b9075ea6a77 (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 83da6876dd88 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 2eec664e4dcd (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit e5dd4a33f5aa (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit f26f2e4d2d3f (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit d0652958b7c8 (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit 3e2ae31e8434 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit 3f16bf66bce3 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 303fbacd5529 (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 9a994e41a577 (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'8f917fc996 hw/arm hw/xtensa: De-duplicate pflash creation code some f63eecee6c pflash: Clean up after commit 368a354f02b part 2 3b2230a827 pflash: Clean up after commit 368a354f02b part 1 f96fda82f8 mips_malta: Clean up definition of flash memory size somewhat 0d2c655ad8 r2d: Flash memory creation is confused about size, mark FIXME 72f3fec4c4 ppc405_boards: Don't size flash memory to match backing image 257f0ac71c sam460ex: Don't size flash memory to match backing image ec2b9e19b1 hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} f1122cc4d9 pflash: Macro PFLASH_BUG() is used just once, expand f1832c9809 pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit f1832c9809fd (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit f1122cc4d99f (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit ec2b9e19b179 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit 257f0ac71c81 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit 72f3fec4c495 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 0d2c655ad826 (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit f96fda82f805 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit 3b2230a827ee (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit f63eecee6c91 (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 8f917fc9969e (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'7003d72a5f hw/arm hw/xtensa: De-duplicate pflash creation code some 0f5bb14893 pflash: Clean up after commit 368a354f02b part 2 0ddfc52fb8 pflash: Clean up after commit 368a354f02b part 1 a88cfc5bbf mips_malta: Clean up definition of flash memory size somewhat 06b58eb0a8 r2d: Flash memory creation is confused about size, mark FIXME fd280c6abc ppc405_boards: Don't size flash memory to match backing image 85a5bb56ec sam460ex: Don't size flash memory to match backing image 4f66728f2f hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} 368c51060a pflash: Macro PFLASH_BUG() is used just once, expand 209d90e8f1 pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit 209d90e8f163 (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 368c51060aff (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 4f66728f2f5a (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit 85a5bb56ec18 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit fd280c6abca7 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 06b58eb0a8e9 (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit a88cfc5bbf98 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit 0ddfc52fb852 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 0f5bb148930a (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 7003d72a5f0f (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
Submodule 'capstone' (https://git.qemu.org/git/capstone.git) registered for path 'capstone'
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc'
Submodule 'roms/QemuMacDrivers' (https://git.qemu.org/git/QemuMacDrivers.git) registered for path 'roms/QemuMacDrivers' Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path 'roms/SLOF'
Submodule 'roms/ipxe' (https://git.qemu.org/git/ipxe.git) registered for path 'roms/ipxe'
Submodule 'roms/openbios' (https://git.qemu.org/git/openbios.git) registered for path 'roms/openbios'
Submodule 'roms/openhackware' (https://git.qemu.org/git/openhackware.git) registered for path 'roms/openhackware' Submodule 'roms/qemu-palcode' (https://git.qemu.org/git/qemu-palcode.git) registered for path 'roms/qemu-palcode' Submodule 'roms/seabios' (https://git.qemu.org/git/seabios.git/) registered for path 'roms/seabios'
Submodule 'roms/seabios-hppa' (https://github.com/hdeller/seabios-hppa.git) registered for path 'roms/seabios-hppa' Submodule 'roms/sgabios' (https://git.qemu.org/git/sgabios.git) registered for path 'roms/sgabios'
Submodule 'roms/skiboot' (https://git.qemu.org/git/skiboot.git) registered for path 'roms/skiboot'
Submodule 'roms/u-boot' (https://git.qemu.org/git/u-boot.git) registered for path 'roms/u-boot'
Submodule 'roms/u-boot-sam460ex' (https://git.qemu.org/git/u-boot-sam460ex.git) registered for path 'roms/u-boot-sam460ex' Submodule 'tests/fp/berkeley-softfloat-3' (https://github.com/cota/berkeley-softfloat-3) registered for path 'tests/fp/berkeley-softfloat-3' Submodule 'tests/fp/berkeley-testfloat-3' (https://github.com/cota/berkeley-testfloat-3) registered for path 'tests/fp/berkeley-testfloat-3' Submodule 'ui/keycodemapdb' (https://git.qemu.org/git/keycodemapdb.git) registered for path 'ui/keycodemapdb'
Cloning into 'capstone'...
Submodule path 'capstone': checked out '22ead3e0bfdb87516656453336160e0a37b066bf'
Cloning into 'dtc'...
Submodule path 'dtc': checked out '88f18909db731a627456f26d779445f84e449536'
Cloning into 'roms/QemuMacDrivers'...
Submodule path 'roms/QemuMacDrivers': checked out '90c488d5f4a407342247b9ea869df1c2d9c8e266'
Cloning into 'roms/SLOF'...
Submodule path 'roms/SLOF': checked out 'a5b428e1c1eae703bdd62a3f527223c291ee3fdc'
Cloning into 'roms/ipxe'...
Submodule path 'roms/ipxe': checked out 'de4565cbe76ea9f7913a01f331be3ee901bb6e17'
Cloning into 'roms/openbios'...
Submodule path 'roms/openbios': checked out '3464681b2b5983df80086a40179d324102347da3'
Cloning into 'roms/openhackware'...
Submodule path 'roms/openhackware': checked out 'c559da7c8eec5e45ef1f67978827af6f0b9546f5'
Cloning into 'roms/qemu-palcode'...
Submodule path 'roms/qemu-palcode': checked out '51c237d7e20d05100eacadee2f61abc17e6bc097'
Cloning into 'roms/seabios'...
Submodule path 'roms/seabios': checked out 'a698c8995ffb2838296ec284fe3c4ad33dfca307'
Cloning into 'roms/seabios-hppa'...
Submodule path 'roms/seabios-hppa': checked out '1ef99a01572c2581c30e16e6fe69e9ea2ef92ce0'
Cloning into 'roms/sgabios'...
Submodule path 'roms/sgabios': checked out 'cbaee52287e5f32373181cff50a00b6c4ac9015a'
Cloning into 'roms/skiboot'...
Submodule path 'roms/skiboot': checked out 'e0ee24c27a172bcf482f6f2bc905e6211c134bcc'
Cloning into 'roms/u-boot'...
Submodule path 'roms/u-boot': checked out 'd85ca029f257b53a96da6c2fb421e78a003a9943'
Cloning into 'roms/u-boot-sam460ex'...
Submodule path 'roms/u-boot-sam460ex': checked out '60b3916f33e617a815973c5a6df77055b2e3a588'
Cloning into 'tests/fp/berkeley-softfloat-3'...
Submodule path 'tests/fp/berkeley-softfloat-3': checked out 'b64af41c3276f97f0e181920400ee056b9c88037'
Cloning into 'tests/fp/berkeley-testfloat-3'...
Submodule path 'tests/fp/berkeley-testfloat-3': checked out '5a59dcec19327396a011a17fd924aed4fec416b3'
Cloning into 'ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce'
Switched to a new branch 'test'
7003d72 hw/arm hw/xtensa: De-duplicate pflash creation code some
0f5bb14 pflash: Clean up after commit 368a354f02b part 2
0ddfc52 pflash: Clean up after commit 368a354f02b part 1
a88cfc5 mips_malta: Clean up definition of flash memory size somewhat
06b58eb r2d: Flash memory creation is confused about size, mark FIXME
fd280c6 ppc405_boards: Don't size flash memory to match backing image
85a5bb5 sam460ex: Don't size flash memory to match backing image
4f66728 hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}
368c510 pflash: Macro PFLASH_BUG() is used just once, expand
209d90e pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit 209d90e8f163 (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 368c51060aff (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 4f66728f2f5a (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit 85a5bb56ec18 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit fd280c6abca7 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 06b58eb0a8e9 (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit a88cfc5bbf98 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit 0ddfc52fb852 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 0f5bb148930a (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 7003d72a5f0f (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected] t [tag update] patchew/[email protected] -> patchew/[email protected] * [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'eadbdde93b hw/arm hw/xtensa: De-duplicate pflash creation code some 66b962dbf3 pflash: Clean up after commit 368a354f02b part 2 5284500a74 pflash: Clean up after commit 368a354f02b part 1 09d2c4a708 mips_malta: Clean up definition of flash memory size somewhat 370f0b5929 r2d: Flash memory creation is confused about size, mark FIXME a44365fece ppc405_boards: Don't size flash memory to match backing image e6dcc28b89 sam460ex: Don't size flash memory to match backing image b554480ef5 hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} d750905bcc pflash: Macro PFLASH_BUG() is used just once, expand ec3e8745cd pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit ec3e8745cdd8 (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit d750905bcc59 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit b554480ef5e6 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit e6dcc28b8994 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit a44365fece7c (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 370f0b59294b (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit 09d2c4a70817 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit 5284500a7468 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 66b962dbf392 (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit eadbdde93b39 (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'03998181d5 hw/arm hw/xtensa: De-duplicate pflash creation code some 8900ef3eb2 pflash: Clean up after commit 368a354f02b part 2 b2a752e969 pflash: Clean up after commit 368a354f02b part 1 6161e9b2e1 mips_malta: Clean up definition of flash memory size somewhat f63e1b95be r2d: Flash memory creation is confused about size, mark FIXME c940613c6f ppc405_boards: Don't size flash memory to match backing image aafbf2b0cb sam460ex: Don't size flash memory to match backing image 50c58aaaef hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} 32f306be23 pflash: Macro PFLASH_BUG() is used just once, expand ab1e43ce7b pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit ab1e43ce7b8b (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 32f306be2381 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 50c58aaaeff5 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit aafbf2b0cbd5 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit c940613c6fd9 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit f63e1b95beaf (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit 6161e9b2e1a1 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit b2a752e969e1 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 8900ef3eb27a (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 03998181d548 (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected] - [tag update] patchew/[email protected] -> patchew/[email protected] - [tag update] patchew/[email protected] -> patchew/[email protected]
Submodule 'capstone' (https://git.qemu.org/git/capstone.git) registered for path 'capstone'
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc'
Submodule 'roms/QemuMacDrivers' (https://git.qemu.org/git/QemuMacDrivers.git) registered for path 'roms/QemuMacDrivers' Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path 'roms/SLOF'
Submodule 'roms/ipxe' (https://git.qemu.org/git/ipxe.git) registered for path 'roms/ipxe'
Submodule 'roms/openbios' (https://git.qemu.org/git/openbios.git) registered for path 'roms/openbios'
Submodule 'roms/openhackware' (https://git.qemu.org/git/openhackware.git) registered for path 'roms/openhackware' Submodule 'roms/qemu-palcode' (https://git.qemu.org/git/qemu-palcode.git) registered for path 'roms/qemu-palcode' Submodule 'roms/seabios' (https://git.qemu.org/git/seabios.git/) registered for path 'roms/seabios'
Submodule 'roms/seabios-hppa' (https://github.com/hdeller/seabios-hppa.git) registered for path 'roms/seabios-hppa' Submodule 'roms/sgabios' (https://git.qemu.org/git/sgabios.git) registered for path 'roms/sgabios'
Submodule 'roms/skiboot' (https://git.qemu.org/git/skiboot.git) registered for path 'roms/skiboot'
Submodule 'roms/u-boot' (https://git.qemu.org/git/u-boot.git) registered for path 'roms/u-boot'
Submodule 'roms/u-boot-sam460ex' (https://git.qemu.org/git/u-boot-sam460ex.git) registered for path 'roms/u-boot-sam460ex' Submodule 'tests/fp/berkeley-softfloat-3' (https://github.com/cota/berkeley-softfloat-3) registered for path 'tests/fp/berkeley-softfloat-3' Submodule 'tests/fp/berkeley-testfloat-3' (https://github.com/cota/berkeley-testfloat-3) registered for path 'tests/fp/berkeley-testfloat-3' Submodule 'ui/keycodemapdb' (https://git.qemu.org/git/keycodemapdb.git) registered for path 'ui/keycodemapdb'
Cloning into 'capstone'...
Submodule path 'capstone': checked out '22ead3e0bfdb87516656453336160e0a37b066bf'
Cloning into 'dtc'...
Submodule path 'dtc': checked out '88f18909db731a627456f26d779445f84e449536'
Cloning into 'roms/QemuMacDrivers'...
Submodule path 'roms/QemuMacDrivers': checked out '90c488d5f4a407342247b9ea869df1c2d9c8e266'
Cloning into 'roms/SLOF'...
Submodule path 'roms/SLOF': checked out 'a5b428e1c1eae703bdd62a3f527223c291ee3fdc'
Cloning into 'roms/ipxe'...
Submodule path 'roms/ipxe': checked out 'de4565cbe76ea9f7913a01f331be3ee901bb6e17'
Cloning into 'roms/openbios'...
Submodule path 'roms/openbios': checked out '3464681b2b5983df80086a40179d324102347da3'
Cloning into 'roms/openhackware'...
Submodule path 'roms/openhackware': checked out 'c559da7c8eec5e45ef1f67978827af6f0b9546f5'
Cloning into 'roms/qemu-palcode'...
Submodule path 'roms/qemu-palcode': checked out '51c237d7e20d05100eacadee2f61abc17e6bc097'
Cloning into 'roms/seabios'...
Submodule path 'roms/seabios': checked out 'a698c8995ffb2838296ec284fe3c4ad33dfca307'
Cloning into 'roms/seabios-hppa'...
Submodule path 'roms/seabios-hppa': checked out '1ef99a01572c2581c30e16e6fe69e9ea2ef92ce0'
Cloning into 'roms/sgabios'...
Submodule path 'roms/sgabios': checked out 'cbaee52287e5f32373181cff50a00b6c4ac9015a'
Cloning into 'roms/skiboot'...
Submodule path 'roms/skiboot': checked out 'e0ee24c27a172bcf482f6f2bc905e6211c134bcc'
Cloning into 'roms/u-boot'...
Submodule path 'roms/u-boot': checked out 'd85ca029f257b53a96da6c2fb421e78a003a9943'
Cloning into 'roms/u-boot-sam460ex'...
Submodule path 'roms/u-boot-sam460ex': checked out '60b3916f33e617a815973c5a6df77055b2e3a588'
Cloning into 'tests/fp/berkeley-softfloat-3'...
Submodule path 'tests/fp/berkeley-softfloat-3': checked out 'b64af41c3276f97f0e181920400ee056b9c88037'
Cloning into 'tests/fp/berkeley-testfloat-3'...
Submodule path 'tests/fp/berkeley-testfloat-3': checked out '5a59dcec19327396a011a17fd924aed4fec416b3'
Cloning into 'ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce'
Switched to a new branch 'test'
0399818 hw/arm hw/xtensa: De-duplicate pflash creation code some
8900ef3 pflash: Clean up after commit 368a354f02b part 2
b2a752e pflash: Clean up after commit 368a354f02b part 1
6161e9b mips_malta: Clean up definition of flash memory size somewhat
f63e1b9 r2d: Flash memory creation is confused about size, mark FIXME
c940613 ppc405_boards: Don't size flash memory to match backing image
aafbf2b sam460ex: Don't size flash memory to match backing image
50c58aa hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}
32f306b pflash: Macro PFLASH_BUG() is used just once, expand
ab1e43c pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit ab1e43ce7b8b (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 32f306be2381 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 50c58aaaeff5 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit aafbf2b0cbd5 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit c940613c6fd9 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit f63e1b95beaf (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit 6161e9b2e1a1 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit b2a752e969e1 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#90: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#98: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 8900ef3eb27a (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 03998181d548 (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected]
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'918b511857 hw/arm hw/xtensa: De-duplicate pflash creation code some 573a3cb6ee pflash: Clean up after commit 368a354f02b part 2 cd6c8874c9 pflash: Clean up after commit 368a354f02b part 1 47d6b05dbf mips_malta: Clean up definition of flash memory size somewhat 4d776997cb r2d: Flash memory creation is confused about size, mark FIXME 8ef649b622 ppc405_boards: Don't size flash memory to match backing image 05e5efce12 sam460ex: Don't size flash memory to match backing image 83454272f9 hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} e25489f667 pflash: Macro PFLASH_BUG() is used just once, expand 23cedcc198 pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit 23cedcc198b7 (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit e25489f66779 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 83454272f952 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit 05e5efce1273 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit 8ef649b622cf (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 4d776997cb7d (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit 47d6b05dbf10 (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit cd6c8874c9f4 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#91: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#99: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 573a3cb6eeac (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 918b5118573b (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'ba3f93c692 hw/arm hw/xtensa: De-duplicate pflash creation code some f99ab9fe08 pflash: Clean up after commit 368a354f02b part 2 e98231996b pflash: Clean up after commit 368a354f02b part 1 fd218de008 mips_malta: Clean up definition of flash memory size somewhat 413850d478 r2d: Flash memory creation is confused about size, mark FIXME d23c64b271 ppc405_boards: Don't size flash memory to match backing image db2935d503 sam460ex: Don't size flash memory to match backing image 856425f0be hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} 09fa7495d9 pflash: Macro PFLASH_BUG() is used just once, expand 83625c2e47 pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit 83625c2e4780 (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #128: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #340: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #358: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 09fa7495d9a5 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 856425f0be58 (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit db2935d50313 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit d23c64b27139 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 413850d478aa (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit fd218de008eb (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit e98231996be7 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#92: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#100: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit f99ab9fe08d8 (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit ba3f93c692dd (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH 00/10] pflash: Fixes and cleanups
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'97502f3196 hw/arm hw/xtensa: De-duplicate pflash creation code some 6bb2bc07ff pflash: Clean up after commit 368a354f02b part 2 9604558ee0 pflash: Clean up after commit 368a354f02b part 1 bc39e20ae1 mips_malta: Clean up definition of flash memory size somewhat 9aeddfb874 r2d: Flash memory creation is confused about size, mark FIXME cd1fb1567e ppc405_boards: Don't size flash memory to match backing image 6a565f0a2a sam460ex: Don't size flash memory to match backing image 9cbfffefec hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2} 9f784f3f33 pflash: Macro PFLASH_BUG() is used just once, expand 1e9644bd3b pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
=== OUTPUT BEGIN ===
1/10 Checking commit 1e9644bd3b0d (pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02)
ERROR: space prohibited between function name and open parenthesis '(' #129: FILE: hw/block/pflash_cfi01.c:288:
+static uint32_t pflash_read (PFlashCFI01 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #341: FILE: hw/block/pflash_cfi02.c:141:
+static uint32_t pflash_read (PFlashCFI02 *pfl, hwaddr offset,
ERROR: space prohibited between function name and open parenthesis '(' #359: FILE: hw/block/pflash_cfi02.c:264:
+static void pflash_write (PFlashCFI02 *pfl, hwaddr offset,
total: 3 errors, 0 warnings, 483 lines checked
Patch 1/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/10 Checking commit 9f784f3f3321 (pflash: Macro PFLASH_BUG() is used just once, expand) 3/10 Checking commit 9cbfffefec0b (hw: Use CFI_PFLASH0{1, 2} and TYPE_CFI_PFLASH0{1, 2}) 4/10 Checking commit 6a565f0a2aa8 (sam460ex: Don't size flash memory to match backing image) 5/10 Checking commit cd1fb1567ec3 (ppc405_boards: Don't size flash memory to match backing image) 6/10 Checking commit 9aeddfb8748e (r2d: Flash memory creation is confused about size, mark FIXME) 7/10 Checking commit bc39e20ae16c (mips_malta: Clean up definition of flash memory size somewhat) 8/10 Checking commit 9604558ee0b8 (pflash: Clean up after commit 368a354f02b part 1)
ERROR: spaces required around that '-' (ctx:VxV)
#92: FILE: hw/arm/musicpal.c:1639:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
ERROR: spaces required around that '-' (ctx:VxV)
#100: FILE: hw/arm/musicpal.c:1646:
+ pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX,
^
total: 2 errors, 0 warnings, 248 lines checked
Patch 8/10 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/10 Checking commit 6bb2bc07ffb7 (pflash: Clean up after commit 368a354f02b part 2) 10/10 Checking commit 97502f319636 (hw/arm hw/xtensa: De-duplicate pflash creation code some) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]