vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

m25p80: change cur_addr to 32 bit integer 

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 <pbonzini@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-id: 1467138270-32481-5-git-send-email-clg@kaod.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Paolo Bonzini 2016-07-04 13:06:37 +01:00 committed by Peter Maydell
parent b68cb06093
commit b7f480c3f6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/block/m25p80.c
View File

@ -390,7 +390,7 @@ typedef struct Flash {
uint32_t pos; uint32_t pos;
uint8_t needed_bytes; uint8_t needed_bytes;
uint8_t cmd_in_progress; uint8_t cmd_in_progress;
uint64_t cur_addr; uint32_t cur_addr;
uint32_t nonvolatile_cfg; uint32_t nonvolatile_cfg;
/* Configuration register for Macronix */ /* Configuration register for Macronix */
uint32_t volatile_cfg; uint32_t volatile_cfg;
@ -536,9 +536,9 @@ static inline void flash_sync_dirty(Flash *s, int64_t newpage)
} }
static inline 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]; uint8_t prev = s->storage[s->cur_addr];
if (!s->write_enable) { if (!s->write_enable) {
@ -546,7 +546,7 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data)
} }
if ((prev ^ data) & 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); " -> %" PRIx8 "\n", addr, prev, data);
} }
@ -1095,7 +1095,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)
switch (s->state) { switch (s->state) {
case STATE_PAGE_PROGRAM: 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); s->cur_addr, (uint8_t)tx);
flash_write8(s, 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); 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: case STATE_READ:
r = s->storage[s->cur_addr]; 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); (uint8_t)r);
s->cur_addr = (s->cur_addr + 1) & (s->size - 1); s->cur_addr = (s->cur_addr + 1) & (s->size - 1);
break; break;
@ -1202,7 +1202,8 @@ static const VMStateDescription vmstate_m25p80 = {
VMSTATE_UINT32(pos, Flash), VMSTATE_UINT32(pos, Flash),
VMSTATE_UINT8(needed_bytes, Flash), VMSTATE_UINT8(needed_bytes, Flash),
VMSTATE_UINT8(cmd_in_progress, 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(write_enable, Flash),
VMSTATE_BOOL_V(reset_enable, Flash, 2), VMSTATE_BOOL_V(reset_enable, Flash, 2),
VMSTATE_UINT8_V(ear, Flash, 2), VMSTATE_UINT8_V(ear, Flash, 2),