Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-07 14:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

m25p80: Add support for continuous read out of RDSR and READ_FSR

Browse Source 
Add support for continuous read out of the RDSR and READ_FSR status
registers until the chip select is deasserted. This feature is supported
by amongst others 1 or more flashtypes manufactured by Numonyx (Micron),
Windbond, SST, Gigadevice, Eon and Macronix.

Signed-off-by: Francisco Iglesias <frasse.iglesias@gmail.com>
Acked-by: Marcin Krzemiński<mar.krzeminski@gmail.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20171126231634.9531-2-frasse.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Francisco Iglesias 2017-12-13 17:59:20 +00:00 committed by Peter Maydell
parent 0a0dc59d27
commit 0add925f7c
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/block/m25p80.c
View File

@ -423,6 +423,7 @@ typedef struct Flash {
uint8_t data[M25P80_INTERNAL_DATA_BUFFER_SZ]; uint8_t data[M25P80_INTERNAL_DATA_BUFFER_SZ];
uint32_t len; uint32_t len;
uint32_t pos; uint32_t pos;
bool data_read_loop;
uint8_t needed_bytes; uint8_t needed_bytes;
uint8_t cmd_in_progress; uint8_t cmd_in_progress;
uint32_t cur_addr; uint32_t cur_addr;
@ -983,6 +984,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
} }
s->pos = 0; s->pos = 0;
s->len = 1; s->len = 1;
s->data_read_loop = true;
s->state = STATE_READING_DATA; s->state = STATE_READING_DATA;
break; break;
@ -993,6 +995,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
} }
s->pos = 0; s->pos = 0;
s->len = 1; s->len = 1;
s->data_read_loop = true;
s->state = STATE_READING_DATA; s->state = STATE_READING_DATA;
break; break;
@ -1133,6 +1136,7 @@ static int m25p80_cs(SSISlave *ss, bool select)
s->pos = 0; s->pos = 0;
s->state = STATE_IDLE; s->state = STATE_IDLE;
flash_sync_dirty(s, -1); flash_sync_dirty(s, -1);
s->data_read_loop = false;
} }
DB_PRINT_L(0, "%sselect\n", select ? "de" : ""); DB_PRINT_L(0, "%sselect\n", select ? "de" : "");
@ -1198,7 +1202,9 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)
s->pos++; s->pos++;
if (s->pos == s->len) { if (s->pos == s->len) {
s->pos = 0; s->pos = 0;
s->state = STATE_IDLE; if (!s->data_read_loop) {
s->state = STATE_IDLE;
}
} }
break; break;
@ -1269,11 +1275,38 @@ static Property m25p80_properties[] = {
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
static int m25p80_pre_load(void *opaque)
{
Flash *s = (Flash *)opaque;
s->data_read_loop = false;
return 0;
}
static bool m25p80_data_read_loop_needed(void *opaque)
{
Flash *s = (Flash *)opaque;
return s->data_read_loop;
}
static const VMStateDescription vmstate_m25p80_data_read_loop = {
.name = "m25p80/data_read_loop",
.version_id = 1,
.minimum_version_id = 1,
.needed = m25p80_data_read_loop_needed,
.fields = (VMStateField[]) {
VMSTATE_BOOL(data_read_loop, Flash),
VMSTATE_END_OF_LIST()
}
};
static const VMStateDescription vmstate_m25p80 = { static const VMStateDescription vmstate_m25p80 = {
.name = "m25p80", .name = "m25p80",
.version_id = 0, .version_id = 0,
.minimum_version_id = 0, .minimum_version_id = 0,
.pre_save = m25p80_pre_save, .pre_save = m25p80_pre_save,
.pre_load = m25p80_pre_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT8(state, Flash), VMSTATE_UINT8(state, Flash),
VMSTATE_UINT8_ARRAY(data, Flash, M25P80_INTERNAL_DATA_BUFFER_SZ), VMSTATE_UINT8_ARRAY(data, Flash, M25P80_INTERNAL_DATA_BUFFER_SZ),
@ -1295,6 +1328,10 @@ static const VMStateDescription vmstate_m25p80 = {
VMSTATE_UINT8(spansion_cr3nv, Flash), VMSTATE_UINT8(spansion_cr3nv, Flash),
VMSTATE_UINT8(spansion_cr4nv, Flash), VMSTATE_UINT8(spansion_cr4nv, Flash),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
},
.subsections = (const VMStateDescription * []) {
&vmstate_m25p80_data_read_loop,
NULL
} }
}; };