pflash: Fixes and cleanups
Subsystems (2)
v3 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.
v3:
* PATCH 07,13: Commit message typo
* PATCH 08: Replaced [Philippe, Magnus]
* PATCH 09-11: New [Philippe]
* PATCH 12: Straightforward rebase onto new patches
* PATCH 14: Commit message improved [Philippe], lines joined [Zoltan]
v2:
* PATCH 01+10: Style cleanups [checkpatch]
* PATCH 02: Rewritten [Peter, Philippe]
* PATCH 03+04: New [Philippe]
* PATCH 06: Commit message improved, FIXME added, accidental replacement of 64 * KiB by 65536 backed out [Zoltan]
* PATCH 07: Style tweak [Alex, David]
* PATCH 08: Commit message typo [Philippe]
* PATCH 11: Commit message typo [László]
* Old PATCH 10 dropped [Max, Peter]
Markus Armbruster (11):
pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
pflash_cfi01: Do not exit() on guest aborting "write to buffer"
pflash_cfi01: Log use of flawed "write to buffer"
pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*
hw: Use PFLASH_CFI0{1,2} and TYPE_PFLASH_CFI0{1,2}
sam460ex: Don't size flash memory to match backing image
ppc405_boards: Don't size flash memory to match backing image
r2d: Fix flash memory size, sector size, width, device ID
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
Philippe Mathieu-Daudé (3):
hw/mips/malta: Fix the DEBUG_BOARD_INIT code hw/mips/malta: Remove fl_sectors variable hw/mips/malta: Restrict 'bios_size' variable scope
hw/arm/collie.c | 9 +- hw/arm/digic_boards.c | 3 +- hw/arm/gumstix.c | 10 +- hw/arm/mainstone.c | 5 +- hw/arm/musicpal.c | 8 +- hw/arm/omap_sx1.c | 10 +- hw/arm/versatilepb.c | 3 +- hw/arm/vexpress.c | 10 +- hw/arm/virt.c | 3 +- hw/arm/xilinx_zynq.c | 7 +- hw/arm/z2.c | 6 +- hw/block/pflash_cfi01.c | 123 ++++++++++++----------- hw/block/pflash_cfi02.c | 79 ++++++++------- hw/i386/pc_sysfw.c | 10 +- hw/lm32/lm32_boards.c | 8 +- hw/lm32/milkymist.c | 5 +- hw/microblaze/petalogix_ml605_mmu.c | 6 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 5 +- hw/mips/mips_malta.c | 22 ++-- hw/mips/mips_r4k.c | 5 +- hw/ppc/ppc405_boards.c | 57 ++++------- hw/ppc/sam460ex.c | 42 +++++--- hw/ppc/virtex_ml507.c | 5 +- hw/sh4/r2d.c | 17 +++- hw/xtensa/xtfpga.c | 12 +-- include/hw/block/flash.h | 57 +++++++---- 26 files changed, 265 insertions(+), 262 deletions(-)
Signature · 1 line
2.17.2
PATCH v3 1/14 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 | 89 +++++++++++++++++++++------------------- hw/block/pflash_cfi02.c | 71 +++++++++++++++++--------------- 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, 125 insertions(+), 110 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 +46 -43
218 lines not on this page · raw message
hw/block/pflash_cfi02.c +37 -34
138 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
PATCH v3 2/14 pflash_cfi01: Do not exit() on guest aborting "write to buffer"
In reply to Markus ArmbrusterWhen a guest tries to abort "write to buffer" (command 0xE8), we print "PFLASH: Possible BUG - Write block confirm", then exit(1). Letting the guest terminate QEMU is not a good idea. Instead, LOG_UNIMP we screwed up, then reset the device.
Macro PFLASH_BUG() is now unused; delete it.
--- hw/block/pflash_cfi01.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
hw/block/pflash_cfi01.c +5 -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, ...) \
@@ -623,8 +617,11 @@ 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_UNIMP , +"%s: Aborting write to buffer not implemented," +" the data is already written to storage!\n" +"Flash device reset into READ mode.\n" , + __func__); goto reset_flash; }break ;
Signature · 1 line
2.17.2
PATCH v3 3/14 pflash_cfi01: Log use of flawed "write to buffer"
In reply to Markus ArmbrusterOur implementation of "write to buffer" (command 0xE8) is flawed. LOG_UNIMP its use, and add some FIXME comments.
--- hw/block/pflash_cfi01.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
hw/block/pflash_cfi01.c +13 -0
@@ -502,6 +502,10 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,break ;case 0xe8 :/* Write to buffer */ DPRINTF ("%s: Write to buffer\n" , __func__); +/* FIXME should save @offset, @width for case 1+ */ +qemu_log_mask (LOG_UNIMP , +"%s: Write to buffer emulation is flawed\n" , + __func__); pfl->status |=0x80 ;/* Ready! */ break ;case 0xf0 :/* Probe for AMD flash */
@@ -545,6 +549,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,/* Mask writeblock size based on device width, or bank width if * device width not specified. */ +/* FIXME check @offset, @width */ if (pfl->device_width) { value =extract32 (value,0 , pfl->device_width *8 ); }else {
@@ -582,7 +587,13 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,case 2 :switch (pfl->cmd) {case 0xe8 :/* Block write */ +/* FIXME check @offset, @width */ if (!pfl->ro) { +/* +* FIXME writing straight to memory is *wrong*. We +* should write to a buffer, and flush it to memory +* only on confirm command (see below). +*/ pflash_data_write (pfl, offset, value, width, be); }else { pfl->status |=0x10 ;/* Programming error */
@@ -598,6 +609,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->wcycle++;if (!pfl->ro) {/* Flush the entire write buffer onto backing storage. */ +/* FIXME premature! */ pflash_update (pfl, offset & mask, pfl->writeblock_size); }else { pfl->status |=0x10 ;/* Programming error */
@@ -614,6 +626,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,switch (pfl->cmd) {case 0xe8 :/* Block write */ if (cmd ==0xd0 ) { +/* FIXME this is where we should write out the buffer */ pfl->wcycle =0 ; pfl->status |=0x80 ; }else {
Signature · 1 line
2.17.2
PATCH v3 4/14 pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*
In reply to Markus Armbrusterpflash_cfi01.c and pflash_cfi02.c start their identifiers with pflash_cfi01_ and pflash_cfi02_ respectively, except for CFI_PFLASH01(), TYPE_CFI_PFLASH01, CFI_PFLASH02(), TYPE_CFI_PFLASH02. Rename for consistency.
--- hw/block/pflash_cfi01.c | 12 ++++++------ hw/block/pflash_cfi02.c | 12 ++++++------ include/hw/block/flash.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-)
hw/block/pflash_cfi01.c +6 -6
@@ -59,8 +59,8 @@ do { \#define DPRINTF (fmt, ...) do { } while (0)#endif -#define CFI_PFLASH01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01) +#define PFLASH_CFI01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01)#define PFLASH_BE 0#define PFLASH_SECURE 1
@@ -698,7 +698,7 @@ static const MemoryRegionOps pflash_cfi01_ops = {static void pflash_cfi01_realize (DeviceState *dev,Error **errp) { -PFlashCFI01 *pfl =CFI_PFLASH01 (dev); +PFlashCFI01 *pfl =PFLASH_CFI01 (dev);uint64_t total_len;int ret;uint64_t blocks_per_device, sector_len_per_device, device_len;
@@ -926,7 +926,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)static const TypeInfo pflash_cfi01_info = { - .name =TYPE_CFI_PFLASH01 , + .name =TYPE_PFLASH_CFI01 , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (PFlashCFI01), .class_init = pflash_cfi01_class_init,
@@ -949,7 +949,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, uint16_t id2, uint16_t id3, int be) { - DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01); + DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort);
@@ -966,7 +966,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return CFI_PFLASH01 (dev); +return PFLASH_CFI01 (dev); }MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl)
hw/block/pflash_cfi02.c +6 -6
@@ -57,8 +57,8 @@ do { \#define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define CFI_PFLASH02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02) +#define PFLASH_CFI02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02)struct PFlashCFI02 {/*< private >*/
@@ -534,7 +534,7 @@ static const MemoryRegionOps pflash_cfi02_ops_le = {static void pflash_cfi02_realize (DeviceState *dev,Error **errp) { -PFlashCFI02 *pfl =CFI_PFLASH02 (dev); +PFlashCFI02 *pfl =PFLASH_CFI02 (dev);uint32_t chip_len;int ret;Error *local_err =NULL ;
@@ -706,7 +706,7 @@ static void pflash_cfi02_class_init(ObjectClass *klass, void *data) }static const TypeInfo pflash_cfi02_info = { - .name =TYPE_CFI_PFLASH02 , + .name =TYPE_PFLASH_CFI02 , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (PFlashCFI02), .class_init = pflash_cfi02_class_init,
@@ -731,7 +731,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, uint16_t unlock_addr1, int be) { -DeviceState *dev =qdev_create (NULL ,TYPE_CFI_PFLASH02 ); +DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI02 );if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort);
@@ -751,5 +751,5 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,qdev_init_nofail (dev);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); -return CFI_PFLASH02 (dev); +return PFLASH_CFI02 (dev); }
include/hw/block/flash.h +2 -2
@@ -7,7 +7,7 @@/* pflash_cfi01.c */ -#define TYPE_CFI_PFLASH01 "cfi.pflash01" +#define TYPE_PFLASH_CFI01 "cfi.pflash01"typedef struct PFlashCFI01 PFlashCFI01 ;
@@ -24,7 +24,7 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);/* pflash_cfi02.c */ -#define TYPE_CFI_PFLASH02 "cfi.pflash02" +#define TYPE_PFLASH_CFI02 "cfi.pflash02"typedef struct PFlashCFI02 PFlashCFI02 ;
Signature · 1 line
2.17.2
PATCH v3 5/14 hw: Use PFLASH_CFI0{1, 2} and TYPE_PFLASH_CFI0{1, 2}
In reply to Markus ArmbrusterWe have two open-coded copies of macro PFLASH_CFI01(). Move the macro to the header, so we can ditch the copies. Move PFLASH_CFI02() to the header for symmetry.
We define macros TYPE_PFLASH_CFI01 and TYPE_PFLASH_CFI02 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_PFLASH_CFI01 );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 PFLASH_CFI01 (dev); }static void vexpress_common_init (MachineState *machine)
hw/arm/virt.c +2 -1
@@ -35,6 +35,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"
@@ -879,7 +880,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_PFLASH_CFI01 );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 PFLASH_CFI01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01) -#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 PFLASH_CFI02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02) -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_PFLASH_CFI01 );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 PFLASH_CFI01 (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_PFLASH_CFI01 "cfi.pflash01" +#define PFLASH_CFI01 (obj) \ + OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01)typedef struct PFlashCFI01 PFlashCFI01 ;
@@ -25,6 +27,8 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);/* pflash_cfi02.c */ #define TYPE_PFLASH_CFI02 "cfi.pflash02" +#define PFLASH_CFI02 (obj) \ + OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02)typedef struct PFlashCFI02 PFlashCFI02 ;
Signature · 1 line
2.17.2
PATCH v3 6/14 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), and 512KiB of ROM get mapped on top of its second half. 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.
The physical hardware appears to have 512KiB of flash memory:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdf
For now, just set the flash memory size to 1MiB regardless of image size, and document the mess.
--- hw/ppc/sam460ex.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-)
hw/ppc/sam460ex.c +26 -15
@@ -91,32 +91,43 @@ struct boot_info {static int sam460ex_load_uboot (void ) { +/* +* 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 get +* mapped on top of its second half (0xFFF80000..0xFFFFFFFF), +* initialized from u-boot-sam460-20100605.bin. +* +* This doesn't smell right. +* +* The physical hardware appears to have 512KiB flash memory. +* +* TODO Figure out what we really need here, and clean this up. +*/ +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 , +64 * KiB,FLASH_SIZE / (64 * KiB),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] [PATCH v3 06/14] sam460ex: Don't size flash memory to match backing image
Quoted 10 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000), and 512KiB of ROM get mapped on top of its second half. 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.
You now have! [*] "Hardwiring address lines leaves part of the hardware unaddressable." Anything bigger than 1MiB mapped at 0xFFF00000 only has the first MiB addressable. IOW anything above 1MiB is unaddressable, but you still can map a such bigger flash.
[*] https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg01380.html
Quoted 81 lines
I guess memory at the end of the address space remains unmapped when it's smaller than 1MiB. Again, useful outcomes seem unlikely.
The physical hardware appears to have 512KiB of flash memory:
https://eu.mouser.com/datasheet/2/268/atmel_AT49BV040B-1180330.pdfFor now, just set the flash memory size to 1MiB regardless of image size, and document the mess.
Cc BALATON Zoltan <[email protected]>Signed-off-by Markus Armbruster <[email protected]>Reviewed-by BALATON Zoltan <[email protected]>Reviewed-by Alex Bennée <[email protected]>--- hw/ppc/sam460ex.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-)hw/ppc/sam460ex.c +26
-15@@ -91,32 +91,43 @@ struct boot_info {static int sam460ex_load_uboot (void ) { +/* +* 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 get +* mapped on top of its second half (0xFFF80000..0xFFFFFFFF), +* initialized from u-boot-sam460-20100605.bin. +* +* This doesn't smell right. +* +* The physical hardware appears to have 512KiB flash memory. +* +* TODO Figure out what we really need here, and clean this up. +*/ +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 , +64 * KiB,FLASH_SIZE / (64 * KiB),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 ;
Re: [Qemu-devel] [PATCH v3 06/14] sam460ex: Don't size flash memory to match backing image
Quoted 12 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000), and 512KiB of ROM get mapped on top of its second half. 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.
Quoted 6 lines
You now have! [*] "Hardwiring address lines leaves part of the hardware unaddressable." Anything bigger than 1MiB mapped at
0xFFF00000only has the first MiB addressable. IOW anything above 1MiB is unaddressable, but you still can map a such bigger flash.[*] https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg01380.html
Well, that's what would happen with real hardware. But this device model doesn't actually model address lines. It simply asks pflash_cfi01_register() to map blk_getlength() bytes at the base address. If you ask it to map gigabytes, it'll happily do so (as long as malloc plays along).
Philippe Mathieu-Daudé
Reviewed-byRe: [Qemu-devel] [PATCH v3 06/14] sam460ex: Don't size flash memory to match backing image
Quoted 19 lines · Markus Armbruster
Quoted 17 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Markus Armbruster
Machine "sam460ex" maps its flash memory at address
0xFFF00000. When no image is supplied, its size is 1MiB (0x100000), and 512KiB of ROM get mapped on top of its second half. 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.
You now have! [*] "Hardwiring address lines leaves part of the hardware unaddressable." Anything bigger than 1MiB mapped at
0xFFF00000only has the first MiB addressable. IOW anything above 1MiB is unaddressable, but you still can map a such bigger flash.
Quoted 7 lines
Quoted 1 line
[*] https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg01380.html
Well, that's what would happen with real hardware. But this device model doesn't actually model address lines. It simply asks
pflash_cfi01_register()to mapblk_getlength()bytes at the base address. If you ask it to map gigabytes, it'll happily do so (as long as malloc plays along).
Ah, I misunderstood your commit message then. About the QEMU crippled model, your commit description makes sense. Thus:
PATCH v3 7/14 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 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 | 51 +++++++++++++----------------------------- 1 file changed, 15 insertions(+), 36 deletions(-)
hw/ppc/ppc405_boards.c +15 -36
@@ -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 + bios_size =8 * MiB;pflash_cfi02_register ((uint32_t )(-bios_size),NULL ,"ef405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +64 * KiB, bios_size / (64 * KiB),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 , +64 * KiB, bios_size / (64 * KiB),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 , +64 * KiB, bios_size / (64 * KiB),1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA , 1); fl_idx++;
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH v3 07/14] 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 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 8 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]>Acked-by David Gibson <[email protected]>Reviewed-by Alex Bennée <[email protected]>
I'm assuming because this is in a series I'm not otherwise CCed on that this is going in through someone else's tree. Let me know if you want me take it through mine.
Quoted 109 lines
--- hw/ppc/ppc405_boards.c | 51 +++++++++++++----------------------------- 1 file changed, 15 insertions(+), 36 deletions(-)hw/ppc/ppc405_boards.c +15
-36@@ -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 + bios_size =8 * MiB;pflash_cfi02_register ((uint32_t )(-bios_size),NULL ,"ef405ep.bios" , bios_size, - blk,65536 , fl_sectors,1 , + dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , +64 * KiB, bios_size / (64 * KiB),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 , +64 * KiB, bios_size / (64 * KiB),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 , +64 * KiB, bios_size / (64 * KiB),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] [PATCH v3 07/14] ppc405_boards: Don't size flash memory to match backing image
Quoted 26 lines · David Gibson
Quoted 25 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 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.
Quoted 8 lines
Quoted 4 lines
Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>Acked-by David Gibson <[email protected]>Reviewed-by Alex Bennée <[email protected]>I'm assuming because this is in a series I'm not otherwise CCed on that this is going in through someone else's tree. Let me know if you want me take it through mine.
I intend to take the complete series through my tree unless a maintainer objects.
Re: [Qemu-devel] [PATCH v3 07/14] ppc405_boards: Don't size flash memory to match backing image
Quoted 33 lines · Markus Armbruster
Quoted 31 lines · David Gibson
Quoted 29 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 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]>Acked-by David Gibson <[email protected]>Reviewed-by Alex Bennée <[email protected]>
Quoted 6 lines
Quoted 3 lines
I'm assuming because this is in a series I'm not otherwise CCed on that this is going in through someone else's tree. Let me know if you want me take it through mine.
I intend to take the complete series through my tree unless a maintainer objects.
No objection here.
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
PATCH v3 8/14 r2d: Fix flash memory size, sector size, width, device ID
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: FLASH_SIZE / 4, i.e. 8MiB.
The best information we have on the physical hardware lists a Cypress S29PL127J60TFI130 128MiBit NOR flash addressable in words of 16 bits, in sectors of 4 and 32 Kibiwords. We don't model multiple sector sizes.
Fix the flash size from 8 to 16MiB, and adjust the sector size from 16 to 64KiB. Fix the width from 4 to 2. While there, supply the real device IDs 0x0001, 0x227e, 0x2220, 0x2200 instead of zeros.
--- hw/sh4/r2d.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
hw/sh4/r2d.c +12 -4
@@ -44,7 +44,7 @@#include "exec/address-spaces.h" #define FLASH_BASE 0x00000000 -#define FLASH_SIZE 0x02000000 +#define FLASH_SIZE (16 * MiB)#define SDRAM_BASE 0x0c000000/* Physical location of SDRAM: Area 3 */ #define SDRAM_SIZE 0x04000000
@@ -288,12 +288,20 @@ static void r2d_init(MachineState *machine)sysbus_mmio_map (busdev,1 ,0x1400080c );mmio_ide_init_drives (dev, dinfo,NULL ); -/* onboard flash memory */ +/* +* Onboard flash memory +* 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. +*/ dinfo =drive_get (IF_PFLASH ,0 ,0 );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 , +1 ,2 ,0x0001 ,0x227e ,0x2220 ,0x2200 ,0x555 ,0x2aa ,0 );/* NIC: rtl8139 on-board, and 2 slots. */
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH v3 08/14] r2d: Fix flash memory size, sector size, width, device ID
Quoted 11 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:FLASH_SIZE/ 4, i.e. 8MiB.The best information we have on the physical hardware lists a Cypress S29PL127J60TFI130 128MiBit NOR flash addressable in words of 16 bits, in sectors of 4 and 32 Kibiwords. We don't model multiple sector sizes.
Quoted 6 lines
Fix the flash size from 8 to 16MiB, and adjust the sector size from 16 to 64KiB. Fix the width from 4 to 2. While there, supply the real device IDs
0x0001,0x227e,0x2220,0x2200instead of zeros.Cc Magnus Damm <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 42 lines
--- hw/sh4/r2d.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/sh4/r2d.c +12
-4@@ -44,7 +44,7 @@#include "exec/address-spaces.h" #define FLASH_BASE 0x00000000 -#define FLASH_SIZE 0x02000000 +#define FLASH_SIZE (16 * MiB)#define SDRAM_BASE 0x0c000000/* Physical location of SDRAM: Area 3 */ #define SDRAM_SIZE 0x04000000@@ -288,12 +288,20 @@ static void r2d_init(MachineState *machine)sysbus_mmio_map (busdev,1 ,0x1400080c );mmio_ide_init_drives (dev, dinfo,NULL ); -/* onboard flash memory */ +/* +* Onboard flash memory +* 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. +*/ dinfo =drive_get (IF_PFLASH ,0 ,0 );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 , +1 ,2 ,0x0001 ,0x227e ,0x2220 ,0x2200 ,0x555 ,0x2aa ,0 );/* NIC: rtl8139 on-board, and 2 slots. */
PATCH v3 9/14 hw/mips/malta: Fix the DEBUG_BOARD_INIT code
In reply to Markus ArmbrusterFrom: Philippe Mathieu-Daudé <[email protected]>
Commit fa1d36df746 missed to convert this ifdef'ed out code. Introduce the pflash_blk variable.
This fixes:
hw/mips/mips_malta.c:1273:16: error: implicit declaration of function ‘blk_name’; did you mean ‘basename’? [-Werror=implicit-function-declaration]
blk_name(dinfo->bdrv), fl_sectors);
^~~~~~~~
hw/mips/mips_malta.c:1273:16: error: nested extern declaration of ‘blk_name’ [-Werror=nested-externs]
hw/mips/mips_malta.c:1273:30: error: ‘DriveInfo’ {aka ‘struct DriveInfo’} has no member named ‘bdrv’
blk_name(dinfo->bdrv), fl_sectors);
^~--- hw/mips/mips_malta.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
hw/mips/mips_malta.c +8 -5
@@ -40,6 +40,7 @@#include "hw/pci/pci.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" +#include "sysemu/block-backend.h" #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h"
@@ -1205,6 +1206,7 @@ void mips_malta_init(MachineState *machine)qemu_irq cbus_irq, i8259_irq;int piix4_devfn;I2CBus *smbus; +BlockBackend *pflash_blk =NULL ;DriveInfo *dinfo;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int fl_idx =0 ;
@@ -1265,17 +1267,18 @@ void mips_malta_init(MachineState *machine)/* Load firmware in flash / BIOS. */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx); -#ifdef DEBUG_BOARD_INIT if (dinfo) { + pflash_blk =blk_by_legacy_dinfo (dinfo); +#ifdef DEBUG_BOARD_INIT printf ("Register parallel flash %d size " TARGET_FMT_lx" at " "addr %08llx '%s' %x\n" , - fl_idx, bios_size,FLASH_ADDRESS , -blk_name (dinfo->bdrv), fl_sectors); - } + fl_idx,blk_getlength (pflash_blk),FLASH_ADDRESS , +blk_name (pflash_blk), fl_sectors);#endif + } fl =pflash_cfi01_register (FLASH_ADDRESS ,NULL ,"mips_malta.bios" ,BIOS_SIZE , - dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , + pflash_blk,65536 , fl_sectors,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be); bios =pflash_cfi01_get_memory (fl);
Signature · 1 line
2.17.2
PATCH v3 10/14 hw/mips/malta: Remove fl_sectors variable
In reply to Markus ArmbrusterFrom: Philippe Mathieu-Daudé <[email protected]>
Variable fl_sectors is used just twice. Since fl_sectors = bios_size >> 16 and bios_size = FLASH_SIZE there, we can simply use FLASH_SIZE >> 16, and eliminate variable.
--- hw/mips/mips_malta.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/mips/mips_malta.c +2 -3
@@ -1210,7 +1210,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 );
@@ -1273,13 +1272,13 @@ void mips_malta_init(MachineState *machine)printf ("Register parallel flash %d size " TARGET_FMT_lx" at " "addr %08llx '%s' %x\n" , fl_idx,blk_getlength (pflash_blk),FLASH_ADDRESS , -blk_name (pflash_blk), fl_sectors); +blk_name (pflash_blk),FLASH_SIZE >>16 );#endif } fl =pflash_cfi01_register (FLASH_ADDRESS ,NULL ,"mips_malta.bios" ,BIOS_SIZE , pflash_blk, -65536 , fl_sectors, +65536 ,FLASH_SIZE >>16 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be); bios =pflash_cfi01_get_memory (fl); fl_idx++;
Signature · 1 line
2.17.2
PATCH v3 11/14 hw/mips/malta: Restrict 'bios_size' variable scope
In reply to Markus ArmbrusterFrom: Philippe Mathieu-Daudé <[email protected]>
The 'bios_size' variable is only used in the 'if (!kernel_filename && !dinfo)' clause. This is the case when we don't provide -pflash command line option, and also don't provide a -kernel option. In this case we will check for the -bios option, or use the default BIOS_FILENAME file.
The 'bios' term is valid in this if statement, but is confuse in the whole mips_malta_init() scope. Restrict his scope.
--- hw/mips/mips_malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/mips/mips_malta.c +1 -1
@@ -1196,7 +1196,6 @@ void mips_malta_init(MachineState *machine)MemoryRegion *ram_low_preio =g_new (MemoryRegion,1 );MemoryRegion *ram_low_postio;MemoryRegion *bios, *bios_copy =g_new (MemoryRegion,1 ); -target_long bios_size =FLASH_SIZE ;const size_t smbus_eeprom_size =8 *256 ;uint8_t *smbus_eeprom_buf =g_malloc0 (smbus_eeprom_size);int64_t kernel_entry, bootloader_run_addr;
@@ -1314,6 +1313,7 @@ void mips_malta_init(MachineState *machine) bootloader_run_addr, kernel_entry); } }else { +target_long bios_size =FLASH_SIZE ;/* The flash region isn't executable from a KVM guest */ if (kvm_enabled ()) { error_report("KVM enabled but no -kernel argument was specified. "
Signature · 1 line
2.17.2
PATCH v3 12/14 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.
--- hw/mips/mips_malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/mips/mips_malta.c +1 -1
@@ -1275,7 +1275,7 @@ void mips_malta_init(MachineState *machine)#endif } fl =pflash_cfi01_register (FLASH_ADDRESS ,NULL ,"mips_malta.bios" , -BIOS_SIZE , +FLASH_SIZE , pflash_blk,65536 ,FLASH_SIZE >>16 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be);
Signature · 1 line
2.17.2
PATCH v3 13/14 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
@@ -937,7 +937,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
@@ -1274,7 +1274,7 @@ void mips_malta_init(MachineState *machine) blk_name(pflash_blk), FLASH_SIZE >> 16);#endif } - fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios", + fl = pflash_cfi01_register(FLASH_ADDRESS, "mips_malta.bios", FLASH_SIZE, pflash_blk, 65536, FLASH_SIZE >> 16,
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 =8 * MiB; pflash_cfi02_register((uint32_t)(-bios_size), - NULL, "ef405ep.bios", bios_size, + "ef405ep.bios", bios_size, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 64 * KiB, bios_size / (64 * KiB), 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, 64 * KiB, bios_size / (64 * KiB), 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, 64 * KiB, bios_size / (64 * KiB), 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
hw/ppc/sam460ex.c +1 -1
@@ -113,7 +113,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 ,64 * KiB,FLASH_SIZE / (64 * KiB),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
@@ -298,7 +298,7 @@ static void r2d_init(MachineState *machine)* addressable in words of 16bit. */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE, + pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 64 * KiB, FLASH_SIZE >> 16, 1, 2, 0x0001, 0x227e, 0x2220, 0x2200,
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
PATCH v3 14/14 pflash: Clean up after commit 368a354f02b, part 2
In reply to Markus ArmbrusterOur pflash devices are simplistically modelled has having "num-blocks" sectors of equal size "sector-length". Real hardware commonly has sectors of different sizes. How our "sector-length" property is related to the physical device's multiple sector sizes is unclear.
Helper functions pflash_cfi01_register() and pflash_cfi02_register() create a pflash device, set properties including "sector-length" and "num-blocks", and realize. They take parameters @size, @sector_len and @nb_blocs.
QOMification left parameter @size unused. 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 | 6 ++---- hw/arm/mainstone.c | 3 +-- hw/arm/musicpal.c | 4 ++-- hw/arm/omap_sx1.c | 6 ++---- hw/arm/versatilepb.c | 1 - hw/arm/xilinx_zynq.c | 5 ++--- hw/arm/z2.c | 3 +-- 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 | 3 +-- hw/microblaze/petalogix_ml605_mmu.c | 3 +-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 3 +-- hw/mips/mips_malta.c | 4 +--- hw/mips/mips_r4k.c | 3 +-- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/sam460ex.c | 3 +-- hw/ppc/virtex_ml507.c | 3 +-- hw/sh4/r2d.c | 3 +-- include/hw/block/flash.h | 4 ++-- 23 files changed, 35 insertions(+), 54 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 -4
@@ -74,8 +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, -2 ,0 ,0 ,0 ,0 , be)) { + sector_len,2 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 ); }
@@ -111,8 +110,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, -2 ,0 ,0 ,0 ,0 , be)) { + sector_len,2 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 ); }
hw/arm/mainstone.c +1 -2
@@ -152,8 +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, - 4, 0, 0, 0, 0, be)) { + 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 -4
@@ -155,8 +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, -4 ,0 ,0 ,0 ,0 , be)) { + sector_size,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory %d.\n" , fl_idx); }
@@ -179,8 +178,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, -4 ,0 ,0 ,0 ,0 , be)) { + 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 +2 -3
@@ -207,10 +207,9 @@ 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 ); +0 ); dev =qdev_create (NULL ,"xilinx,zynq_slcr" );qdev_init_nofail (dev);
hw/arm/z2.c +1 -2
@@ -326,8 +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, -4 ,0 ,0 ,0 ,0 , be)) { + sector_len,4 ,0 ,0 ,0 ,0 , be)) {error_report ("Error registering flash memory" );exit (1 ); }
hw/block/pflash_cfi01.c +3 -2
@@ -940,7 +940,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,
@@ -951,7 +951,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 -2
@@ -123,8 +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, -2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 ); + flash_sector_size,2 ,0x00 ,0x89 ,0x00 ,0x1d ,1 );/* create irq lines */ env->pic_state =lm32_pic_init (qemu_allocate_irq (cpu_irq_handler, cpu,0 ));
hw/microblaze/petalogix_ml605_mmu.c +1 -2
@@ -109,8 +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 , -2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 ); +64 * KiB,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 ); dev =qdev_create (NULL ,"xlnx.xps-intc" );
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -2
@@ -90,8 +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 , -1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); dev =qdev_create (NULL ,"xlnx.xps-intc" ); qdev_prop_set_uint32(dev, "kind-of-intr",
hw/mips/mips_malta.c +1 -3
@@ -1275,9 +1275,7 @@ void mips_malta_init(MachineState *machine)#endif } fl =pflash_cfi01_register (FLASH_ADDRESS ,"mips_malta.bios" , -FLASH_SIZE , - pflash_blk, -65536 ,FLASH_SIZE >>16 , +FLASH_SIZE , pflash_blk,65536 ,4 ,0x0000 ,0x0000 ,0x0000 ,0x0000 , be); bios =pflash_cfi01_get_memory (fl); fl_idx++;
hw/mips/mips_r4k.c +1 -2
@@ -237,8 +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, -4 ,0 ,0 ,0 ,0 , be)) { + sector_len,4 ,0 ,0 ,0 ,0 , be)) {fprintf (stderr,"qemu: Error registering flash memory.\n" ); } }else if (!qtest_enabled ()) {
hw/ppc/ppc405_boards.c +3 -3
@@ -195,7 +195,7 @@ static void ref405ep_init(MachineState *machine)pflash_cfi02_register ((uint32_t )(-bios_size),"ef405ep.bios" , bios_size, dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB, bios_size / (64 * KiB),1 , +64 * KiB,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 , -64 * KiB, bios_size / (64 * KiB),1 , +64 * KiB,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 , -64 * KiB, bios_size / (64 * KiB),1 , +64 * KiB,1 ,4 ,0x0001 ,0x22DA ,0x0000 ,0x0000 ,0x555 ,0x2AA ,1 ); fl_idx++;
hw/ppc/sam460ex.c +1 -2
@@ -115,8 +115,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 , -64 * KiB,FLASH_SIZE / (64 * KiB), -1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) { +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {error_report ("Error registering flash memory" );/* XXX: return an error instead? */ exit (1 );
hw/ppc/virtex_ml507.c +1 -2
@@ -229,8 +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 , -1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); +64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 ); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT]; dev =qdev_create (NULL ,"xlnx.xps-intc" );
hw/sh4/r2d.c +1 -2
@@ -300,8 +300,7 @@ static void r2d_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );pflash_cfi02_register (0x0 ,"r2d.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , -64 * KiB,FLASH_SIZE >>16 , -1 ,2 ,0x0001 ,0x227e ,0x2220 ,0x2200 , +64 * KiB,1 ,2 ,0x0001 ,0x227e ,0x2220 ,0x2200 ,0x555 ,0x2aa ,0 );/* NIC: rtl8139 on-board, and 2 slots. */
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 v3 14/14] pflash: Clean up after commit 368a354f02b, part 2
Quoted 15 lines · Markus Armbruster
Our pflash devices are simplistically modelled has having "num-blocks" sectors of equal size "sector-length". Real hardware commonly has sectors of different sizes. How our "sector-length" property is related to the physical device's multiple sector sizes is unclear.
Helper functions
pflash_cfi01_register()andpflash_cfi02_register()create a pflash device, set properties including "sector-length" and "num-blocks", and realize. They take parameters @size, @sector_len and @nb_blocs.QOMification left parameter @size unused. Obviously, @size should match @sector_len and @nb_blocs, i.e. size ==
sector_len*nb_blocs. All callers satisfy this.
Quoted 5 lines
Remove @nb_blocs and compute it from @size and @sector_len.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Laszlo Ersek <[email protected]>Reviewed-by Alex Bennée <[email protected]>
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
CC hw/display/cirrus_vga.o
CC hw/display/cirrus_vga_isa.o/tmp/qemu-test/src/hw/block/pflash_cfi02.c: In function 'pflash_cfi02_unrealize':/tmp/qemu-test/src/hw/block/pflash_cfi02.c:698:5: error: unknown type name 'pflash_t'; did you mean 'fpos_t'?
pflash_t *pfl = CFI_PFLASH02(dev);
^~~~~~~~
fpos_t
/tmp/qemu-test/src/hw/block/pflash_cfi02.c:698:21: error: implicit declaration of function 'CFI_PFLASH02'; did you mean 'HW_FLASH_H'? [-Werror=implicit-function-declaration]
pflash_t *pfl = CFI_PFLASH02(dev);
^~~~~~~~~~~~
HW_FLASH_H
/tmp/qemu-test/src/hw/block/pflash_cfi02.c:698:21: error: nested extern declaration of 'CFI_PFLASH02' [-Werror=nested-externs]
/tmp/qemu-test/src/hw/block/pflash_cfi02.c:698:21: error: initialization of 'int *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
/tmp/qemu-test/src/hw/block/pflash_cfi02.c:699:19: error: request for member 'timer' in something not a structure or union
timer_del(&pfl->timer);
^~cc1: all warnings being treated as errors
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]