[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/10] m25p80: Allow more than four banks.
From: |
marcin.krzeminski |
Subject: |
[Qemu-devel] [PATCH v3 03/10] m25p80: Allow more than four banks. |
Date: |
Fri, 24 Jun 2016 10:07:04 +0200 |
From: Marcin Krzeminski <address@hidden>
Allow to have more than four 16MiB regions for bigger flash devices.
Signed-off-by: Marcin Krzeminski <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
---
hw/block/m25p80.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 342f7c9..6910c52 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -129,7 +129,6 @@ typedef struct FlashPartInfo {
#define EVCFG_QUAD_IO_ENABLED (1 << 7)
#define NVCFG_4BYTE_ADDR_MASK (1 << 0)
#define NVCFG_LOWER_SEGMENT_MASK (1 << 1)
-#define CFG_UPPER_128MB_SEG_ENABLED 0x3
/* Numonyx (Micron) Flag Status Register macros */
#define FSR_4BYTE_ADDR_MODE_ENABLED 0x1
@@ -545,7 +544,7 @@ static void complete_collecting_data(Flash *s)
}
if (get_addr_length(s) == 3) {
- s->cur_addr += (s->ear & 0x3) * MAX_3BYTES_SIZE;
+ s->cur_addr += s->ear * MAX_3BYTES_SIZE;
}
s->state = STATE_IDLE;
@@ -644,7 +643,7 @@ static void reset_memory(Flash *s)
s->four_bytes_address_mode = true;
}
if (!(s->nonvolatile_cfg & NVCFG_LOWER_SEGMENT_MASK)) {
- s->ear = CFG_UPPER_128MB_SEG_ENABLED;
+ s->ear = s->size / MAX_3BYTES_SIZE - 1;
}
break;
default:
--
2.7.4
- [Qemu-devel] [PATCH v3 00/10] m25p80: Add new 512Mbit and 1Gbit devices, marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 04/10] m25p80: Introduce COLLECTING_VAR_LEN_DATA state., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 10/10] m25p80: Fix WINBOND fast read command handling, marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 01/10] m25p80: Replace JEDEC ID masking with function., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 02/10] m25p80: Make a table for JEDEC ID., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 07/10] m25p80: Introduce configuration registers., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 03/10] m25p80: Allow more than four banks.,
marcin.krzeminski <=
- [Qemu-devel] [PATCH v3 08/10] m25p80: Fast read commands family changes., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 09/10] m25p80: New flash devices., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 06/10] m25p80: Introduce quad and equad modes., marcin.krzeminski, 2016/06/24
- [Qemu-devel] [PATCH v3 05/10] m25p80: Add additional flash commands:, marcin.krzeminski, 2016/06/24
- Re: [Qemu-devel] [PATCH v3 00/10] m25p80: Add new 512Mbit and 1Gbit devices, Peter Maydell, 2016/06/27