david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m25p80: Add additional flash commands:

Browse Source 
Page program 4byte/quad and erase 32K sectors 4 bytes.

Signed-off-by: Marcin Krzeminski <marcin.krzeminski@nokia.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 1466755631-25201-6-git-send-email-marcin.krzeminski@nokia.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Marcin Krzeminski 2016-06-27 15:37:33 +01:00 committed by Peter Maydell
parent 9964674e50
commit 30467afe7b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/block/m25p80.c
View File

@ -297,12 +297,14 @@ typedef enum {
PP = 0x02, PP = 0x02,
PP4 = 0x12, PP4 = 0x12,
PP4_4 = 0x3e,
DPP = 0xa2, DPP = 0xa2,
QPP = 0x32, QPP = 0x32,
ERASE_4K = 0x20, ERASE_4K = 0x20,
ERASE4_4K = 0x21, ERASE4_4K = 0x21,
ERASE_32K = 0x52, ERASE_32K = 0x52,
ERASE4_32K = 0x5c,
ERASE_SECTOR = 0xd8, ERASE_SECTOR = 0xd8,
ERASE4_SECTOR = 0xdc, ERASE4_SECTOR = 0xdc,
@ -449,6 +451,7 @@ static void flash_erase(Flash *s, int offset, FlashCMD cmd)
capa_to_assert = ER_4K; capa_to_assert = ER_4K;
break; break;
case ERASE_32K: case ERASE_32K:
case ERASE4_32K:
len = 32 << 10; len = 32 << 10;
capa_to_assert = ER_32K; capa_to_assert = ER_32K;
break; break;
@ -519,9 +522,11 @@ static inline int get_addr_length(Flash *s)
switch (s->cmd_in_progress) { switch (s->cmd_in_progress) {
case PP4: case PP4:
case PP4_4:
case READ4: case READ4:
case QIOR4: case QIOR4:
case ERASE4_4K: case ERASE4_4K:
case ERASE4_32K:
case ERASE4_SECTOR: case ERASE4_SECTOR:
case FAST_READ4: case FAST_READ4:
case DOR4: case DOR4:
@ -555,6 +560,7 @@ static void complete_collecting_data(Flash *s)
case QPP: case QPP:
case PP: case PP:
case PP4: case PP4:
case PP4_4:
s->state = STATE_PAGE_PROGRAM; s->state = STATE_PAGE_PROGRAM;
break; break;
case READ: case READ:
@ -574,6 +580,7 @@ static void complete_collecting_data(Flash *s)
case ERASE_4K: case ERASE_4K:
case ERASE4_4K: case ERASE4_4K:
case ERASE_32K: case ERASE_32K:
case ERASE4_32K:
case ERASE_SECTOR: case ERASE_SECTOR:
case ERASE4_SECTOR: case ERASE4_SECTOR:
flash_erase(s, s->cur_addr, s->cmd_in_progress); flash_erase(s, s->cur_addr, s->cmd_in_progress);
@ -669,6 +676,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
case ERASE_4K: case ERASE_4K:
case ERASE4_4K: case ERASE4_4K:
case ERASE_32K: case ERASE_32K:
case ERASE4_32K:
case ERASE_SECTOR: case ERASE_SECTOR:
case ERASE4_SECTOR: case ERASE4_SECTOR:
case READ: case READ:
@ -677,6 +685,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
case QPP: case QPP:
case PP: case PP:
case PP4: case PP4:
case PP4_4:
s->needed_bytes = get_addr_length(s); s->needed_bytes = get_addr_length(s);
s->pos = 0; s->pos = 0;
s->len = 0; s->len = 0;