From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:46390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyiVL-0002cP-So for qemu-devel@nongnu.org; Tue, 26 Feb 2019 14:35:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyiV8-0006dj-8r for qemu-devel@nongnu.org; Tue, 26 Feb 2019 14:34:54 -0500 From: Markus Armbruster Date: Tue, 26 Feb 2019 20:34:05 +0100 Message-Id: <20190226193408.23862-9-armbru@redhat.com> In-Reply-To: <20190226193408.23862-1-armbru@redhat.com> References: <20190226193408.23862-1-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 08/11] r2d: Flash memory creation is confused about size, mark FIXME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, lersek@redhat.com, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, qemu-ppc@nongnu.org, Magnus Damm 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 Signed-off-by: Markus Armbruster --- 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