All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"Hanna Reitz" <hreitz@redhat.com>,
	qemu-block@nongnu.org, "Bin Meng" <bin.meng@windriver.com>,
	qemu-ppc@nongnu.org, "Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH 06/11] hw/block/pflash_cfi01: Error out if device length isn't a power of two
Date: Thu, 15 Sep 2022 17:25:15 +0200	[thread overview]
Message-ID: <20220915152520.21948-7-shentey@gmail.com> (raw)
In-Reply-To: <20220915152520.21948-1-shentey@gmail.com>

According to the JEDEC standard the device length is communicated to an
OS as an exponent (power of two).

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/block/pflash_cfi01.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 0cbc2fb4cb..8c9b3f518a 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -690,7 +690,7 @@ static const MemoryRegionOps pflash_cfi01_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl)
+static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl, Error **errp)
 {
     uint64_t blocks_per_device, sector_len_per_device, device_len;
     int num_devices;
@@ -708,6 +708,10 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl)
         sector_len_per_device = pfl->sector_len / num_devices;
     }
     device_len = sector_len_per_device * blocks_per_device;
+    if (ctpop64(device_len) != 1) {
+        error_setg(errp, "Device size must be a power of two.");
+        return;
+    }
 
     /* Hardcoded CFI table */
     /* Standard "QRY" string */
@@ -865,7 +869,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
      */
     pfl->cmd = 0x00;
     pfl->status = 0x80; /* WSM ready */
-    pflash_cfi01_fill_cfi_table(pfl);
+    pflash_cfi01_fill_cfi_table(pfl, errp);
 }
 
 static void pflash_cfi01_system_reset(DeviceState *dev)
-- 
2.37.3



  parent reply	other threads:[~2022-09-15 15:29 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-15 15:25 [PATCH 00/11] ppc/e500: Add support for two types of flash, cleanup Bernhard Beschow
2022-09-15 15:25 ` [PATCH 01/11] hw/ppc/meson: Allow e500 boards to be enabled separately Bernhard Beschow
2022-09-16  2:37   ` Bin Meng
2022-09-18 12:15   ` Philippe Mathieu-Daudé via
2022-09-15 15:25 ` [PATCH 02/11] hw/gpio/meson: Introduce dedicated config switch for hw/gpio/mpc8xxx Bernhard Beschow
2022-09-16  2:40   ` Bin Meng
2022-09-18 12:15   ` Philippe Mathieu-Daudé via
2022-09-15 15:25 ` [PATCH 03/11] docs/system/ppc/ppce500: Add heading for networking chapter Bernhard Beschow
2022-09-16  2:43   ` Bin Meng
2022-09-18 12:16   ` Philippe Mathieu-Daudé via
2022-09-15 15:25 ` [PATCH 04/11] hw/ppc/mpc8544ds: Add platform bus Bernhard Beschow
2022-09-16  6:15   ` Bin Meng
2022-09-16 17:19     ` Bernhard Beschow
2022-10-09  2:31       ` Bin Meng
2022-09-15 15:25 ` [PATCH 05/11] hw/ppc/e500: Remove if statement which is now always true Bernhard Beschow
2022-09-16  6:17   ` Bin Meng
2022-09-18 12:17   ` Philippe Mathieu-Daudé via
2022-09-15 15:25 ` Bernhard Beschow [this message]
2022-09-16  6:24   ` [PATCH 06/11] hw/block/pflash_cfi01: Error out if device length isn't a power of two Bin Meng
2022-09-15 15:25 ` [PATCH 07/11] hw/ppc/e500: Implement pflash handling Bernhard Beschow
2022-09-16 15:00   ` Bin Meng
2022-09-16 17:05     ` Bernhard Beschow
2022-10-03 19:45       ` B
2022-09-15 15:25 ` [PATCH 08/11] hw/sd/sdhci-internal: Unexport ESDHC defines Bernhard Beschow
2022-09-16 10:04   ` Bin Meng
2022-09-18 12:19   ` Philippe Mathieu-Daudé via
2022-09-15 15:25 ` [PATCH 09/11] hw/sd/sdhci: Rename ESDHC_* defines to USDHC_* Bernhard Beschow
2022-09-16 10:07   ` Bin Meng
2022-09-16 17:11     ` Bernhard Beschow
2022-09-15 15:25 ` [PATCH 10/11] hw/sd/sdhci: Implement Freescale eSDHC device model Bernhard Beschow
2022-09-16 15:15   ` Bin Meng
2022-09-16 17:27     ` Bernhard Beschow
2022-09-15 15:25 ` [PATCH 11/11] hw/ppc/e500: Add Freescale eSDHC to e500 boards Bernhard Beschow
2022-09-16 15:26   ` Bin Meng
2022-09-16 16:15     ` Bernhard Beschow
2022-09-16 15:27 ` [PATCH 00/11] ppc/e500: Add support for two types of flash, cleanup Bin Meng
2022-09-16 16:08   ` Bernhard Beschow
2022-09-18 14:37 ` Philippe Mathieu-Daudé via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220915152520.21948-7-shentey@gmail.com \
    --to=shentey@gmail.com \
    --cc=bin.meng@windriver.com \
    --cc=f4bug@amsat.org \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.