[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/9] m25p80: change cur_addr to 32 bit integer
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH v5 4/9] m25p80: change cur_addr to 32 bit integer |
Date: |
Tue, 28 Jun 2016 20:24:25 +0200 |
From: Paolo Bonzini <address@hidden>
The maximum amount of storage that can be addressed by the m25p80 command
set is 4 GiB. However, cur_addr is currently a 64-bit integer. To avoid
further problems related to sign extension of signed 32-bit integer
expressions, change cur_addr to a 32 bit integer. Preserve migration
format by adding a dummy 4-byte field in place of the (big-endian)
high four bytes in the formerly 64-bit cur_addr field.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/block/m25p80.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 4836b4eb9666..80e60c23e009 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -390,7 +390,7 @@ typedef struct Flash {
uint32_t pos;
uint8_t needed_bytes;
uint8_t cmd_in_progress;
- uint64_t cur_addr;
+ uint32_t cur_addr;
uint32_t nonvolatile_cfg;
/* Configuration register for Macronix */
uint32_t volatile_cfg;
@@ -536,9 +536,9 @@ static inline void flash_sync_dirty(Flash *s, int64_t
newpage)
}
static inline
-void flash_write8(Flash *s, uint64_t addr, uint8_t data)
+void flash_write8(Flash *s, uint32_t addr, uint8_t data)
{
- int64_t page = addr / s->pi->page_size;
+ uint32_t page = addr / s->pi->page_size;
uint8_t prev = s->storage[s->cur_addr];
if (!s->write_enable) {
@@ -546,7 +546,7 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data)
}
if ((prev ^ data) & data) {
- DB_PRINT_L(1, "programming zero to one! addr=%" PRIx64 " %" PRIx8
+ DB_PRINT_L(1, "programming zero to one! addr=%" PRIx32 " %" PRIx8
" -> %" PRIx8 "\n", addr, prev, data);
}
@@ -1095,7 +1095,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t
tx)
switch (s->state) {
case STATE_PAGE_PROGRAM:
- DB_PRINT_L(1, "page program cur_addr=%#" PRIx64 " data=%" PRIx8 "\n",
+ DB_PRINT_L(1, "page program cur_addr=%#" PRIx32 " data=%" PRIx8 "\n",
s->cur_addr, (uint8_t)tx);
flash_write8(s, s->cur_addr, (uint8_t)tx);
s->cur_addr = (s->cur_addr + 1) & (s->size - 1);
@@ -1103,7 +1103,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t
tx)
case STATE_READ:
r = s->storage[s->cur_addr];
- DB_PRINT_L(1, "READ 0x%" PRIx64 "=%" PRIx8 "\n", s->cur_addr,
+ DB_PRINT_L(1, "READ 0x%" PRIx32 "=%" PRIx8 "\n", s->cur_addr,
(uint8_t)r);
s->cur_addr = (s->cur_addr + 1) & (s->size - 1);
break;
@@ -1202,7 +1202,8 @@ static const VMStateDescription vmstate_m25p80 = {
VMSTATE_UINT32(pos, Flash),
VMSTATE_UINT8(needed_bytes, Flash),
VMSTATE_UINT8(cmd_in_progress, Flash),
- VMSTATE_UINT64(cur_addr, Flash),
+ VMSTATE_UNUSED(4),
+ VMSTATE_UINT32(cur_addr, Flash),
VMSTATE_BOOL(write_enable, Flash),
VMSTATE_BOOL_V(reset_enable, Flash, 2),
VMSTATE_UINT8_V(ear, Flash, 2),
--
2.1.4
- [Qemu-devel] [PATCH v5 0/9] ast2400: SMC controllers, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 1/9] ssi: change ssi_slave_init to be a realize ops, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 2/9] m25p80: do not put iovec on the stack, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 3/9] m25p80: avoid out of bounds accesses, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 4/9] m25p80: change cur_addr to 32 bit integer,
Cédric Le Goater <=
- [Qemu-devel] [PATCH v5 5/9] m25p80: qdev-ify drive property, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 6/9] ast2400: add SMC controllers (FMC and SPI), Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 7/9] ast2400: add SPI flash slaves, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 8/9] ast2400: create SPI flash slaves, Cédric Le Goater, 2016/06/28
- [Qemu-devel] [PATCH v5 9/9] tests: add a m25p80 test, Cédric Le Goater, 2016/06/28