[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/17] block: m25p80: Extend address mode
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 06/17] block: m25p80: Extend address mode |
Date: |
Wed, 30 Mar 2016 15:57:38 +0100 |
From: Marcin Krzeminski <address@hidden>
Extend address mode allows to switch flash 16 MiB banks,
allowing user to access all flash sectors.
This access mode is used by u-boot.
Signed-off-by: Marcin Krzeminski <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/block/m25p80.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 4986741..03f59ae 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -48,6 +48,9 @@
*/
#define WR_1 0x100
+/* 16 MiB max in 3 byte address mode */
+#define MAX_3BYTES_SIZE 0x1000000
+
typedef struct FlashPartInfo {
const char *part_name;
/* jedec code. (jedec >> 16) & 0xff is the 1st byte, >> 8 the 2nd etc */
@@ -234,6 +237,9 @@ typedef enum {
ERASE_32K = 0x52,
ERASE_SECTOR = 0xd8,
+ EXTEND_ADDR_READ = 0xC8,
+ EXTEND_ADDR_WRITE = 0xC5,
+
RESET_ENABLE = 0x66,
RESET_MEMORY = 0x99,
} FlashCMD;
@@ -264,6 +270,7 @@ typedef struct Flash {
uint64_t cur_addr;
bool write_enable;
bool reset_enable;
+ uint8_t ear;
int64_t dirty_page;
@@ -404,6 +411,7 @@ static void complete_collecting_data(Flash *s)
s->cur_addr = s->data[0] << 16;
s->cur_addr |= s->data[1] << 8;
s->cur_addr |= s->data[2];
+ s->cur_addr += (s->ear & 0x3) * MAX_3BYTES_SIZE;
s->state = STATE_IDLE;
@@ -431,6 +439,9 @@ static void complete_collecting_data(Flash *s)
s->write_enable = false;
}
break;
+ case EXTEND_ADDR_WRITE:
+ s->ear = s->data[0];
+ break;
default:
break;
}
@@ -440,6 +451,7 @@ static void reset_memory(Flash *s)
{
s->cmd_in_progress = NOP;
s->cur_addr = 0;
+ s->ear = 0;
s->len = 0;
s->needed_bytes = 0;
s->pos = 0;
@@ -563,6 +575,20 @@ static void decode_new_cmd(Flash *s, uint32_t value)
break;
case NOP:
break;
+ case EXTEND_ADDR_READ:
+ s->data[0] = s->ear;
+ s->pos = 0;
+ s->len = 1;
+ s->state = STATE_READING_DATA;
+ break;
+ case EXTEND_ADDR_WRITE:
+ if (s->write_enable) {
+ s->needed_bytes = 1;
+ s->pos = 0;
+ s->len = 0;
+ s->state = STATE_COLLECTING_DATA;
+ }
+ break;
case RESET_ENABLE:
s->reset_enable = true;
break;
@@ -704,6 +730,7 @@ static const VMStateDescription vmstate_m25p80 = {
VMSTATE_UINT64(cur_addr, Flash),
VMSTATE_BOOL(write_enable, Flash),
VMSTATE_BOOL_V(reset_enable, Flash, 2),
+ VMSTATE_UINT8_V(ear, Flash, 2),
VMSTATE_END_OF_LIST()
}
};
--
1.9.1
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 17/17] arm: implement query-gic-capabilities, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 12/17] block: m25p80: n25q256a/n25q512a models, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 11/17] block: m25p80: Implemented FSR register, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 14/17] arm: qmp: add query-gic-capabilities interface, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 13/17] block: m25p80: at25128a/at25256a models, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 04/17] block: m25p80: RESET_ENABLE and RESET_MEMORY commands, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 09/17] block: m25p80: Dummy cycles for N25Q256/512, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 06/17] block: m25p80: Extend address mode,
Peter Maydell <=
- [Qemu-devel] [PULL 08/17] block: m25p80: Add configuration registers, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 07/17] block: m25p80: 4byte address mode, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 05/17] block: m25p80: Widen flags variable, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 16/17] kvm: add kvm_device_supported() helper function, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 10/17] block: m25p80: Fast read and 4bytes commands, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 15/17] arm: enhance kvm_arm_create_scratch_host_vcpu, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 01/17] hw/gpio: Add the emulation of gpio_key, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 02/17] ARM: Virt: Use gpio_key for power button, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 03/17] block: m25p80: Removed unused variable, Peter Maydell, 2016/03/30
- Re: [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2016/03/30