[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 08/11] r2d: Flash memory creation is confused about
From: |
Markus Armbruster |
Subject: |
[Qemu-ppc] [PATCH v2 08/11] r2d: Flash memory creation is confused about size, mark FIXME |
Date: |
Tue, 26 Feb 2019 20:34:05 +0100 |
pflash_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 physical hardware, no luck.
For now, adjust the byte size passed to match the actual size created,
and add a FIXME comment.
Cc: Magnus Damm <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/sh4/r2d.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index dcdb3728cb..ed18d1f351 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -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,
--
2.17.2
- Re: [Qemu-ppc] [PATCH v2 09/11] mips_malta: Clean up definition of flash memory size somewhat, (continued)
- [Qemu-ppc] [PATCH v2 06/11] sam460ex: Don't size flash memory to match backing image, Markus Armbruster, 2019/02/26
- [Qemu-ppc] [PATCH v2 05/11] hw: Use PFLASH_CFI0{1, 2} and TYPE_PFLASH_CFI0{1, 2}, Markus Armbruster, 2019/02/26
- [Qemu-ppc] [PATCH v2 07/11] ppc405_boards: Don't size flash memory to match backing image, Markus Armbruster, 2019/02/26
- [Qemu-ppc] [PATCH v2 04/11] pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*, Markus Armbruster, 2019/02/26
- [Qemu-ppc] [PATCH v2 08/11] r2d: Flash memory creation is confused about size, mark FIXME,
Markus Armbruster <=
- [Qemu-ppc] [PATCH v2 11/11] pflash: Clean up after commit 368a354f02b part 2, Markus Armbruster, 2019/02/26
- [Qemu-ppc] [PATCH v2 10/11] pflash: Clean up after commit 368a354f02b part 1, Markus Armbruster, 2019/02/26
- [Qemu-ppc] [PATCH v2 01/11] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02, Markus Armbruster, 2019/02/26
- Re: [Qemu-ppc] [PATCH v2 00/11] pflash: Fixes and cleanups, Alex Bennée, 2019/02/26