mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/block/pflash_cfi0{1, 2}: Error out if device length isn't a power of two

Browse Source 
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>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20221018210146.193159-3-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Bernhard Beschow 2022-10-18 23:01:41 +02:00 committed by Daniel Henrique Barboza
parent c593d1cc25
commit 334c388f25
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/block/pflash_cfi01.c
View File

@ -690,7 +690,7 @@ static const MemoryRegionOps pflash_cfi01_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .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; uint64_t blocks_per_device, sector_len_per_device, device_len;
int num_devices; 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; sector_len_per_device = pfl->sector_len / num_devices;
} }
device_len = sector_len_per_device * blocks_per_device; device_len = sector_len_per_device * blocks_per_device;
if (!is_power_of_2(device_len)) {
error_setg(errp, "Device size must be a power of two.");
return;
}
/* Hardcoded CFI table */ /* Hardcoded CFI table */
/* Standard "QRY" string */ /* Standard "QRY" string */
@ -865,7 +869,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
*/ */
pfl->cmd = 0x00; pfl->cmd = 0x00;
pfl->status = 0x80; /* WSM ready */ 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) static void pflash_cfi01_system_reset(DeviceState *dev)

5
hw/block/pflash_cfi02.c
View File

@ -880,6 +880,11 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
return; return;
} }
if (!is_power_of_2(pfl->chip_len)) {
error_setg(errp, "Device size must be a power of two.");
return;
}
memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl),
&pflash_cfi02_ops, pfl, pfl->name, &pflash_cfi02_ops, pfl, pfl->name,
pfl->chip_len, errp); pfl->chip_len, errp);