From: marcin.krzeminski@nokia.com
To: qemu-devel@nongnu.org
Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com,
pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com
Subject: [Qemu-devel] [PATCH v3 05/11] block: m25p80: 4byte address mode
Date: Mon, 8 Feb 2016 16:25:05 +0100 [thread overview]
Message-ID: <1454945111-728-6-git-send-email-marcin.krzeminski@nokia.com> (raw)
In-Reply-To: <1454945111-728-1-git-send-email-marcin.krzeminski@nokia.com>
From: Marcin Krzeminski <marcin.krzeminski@nokia.com>
This patch adds only 4byte address mode (does not cover dummy cycles).
This mode is needed to access more than 16 MiB of flash.
Signed-off-by: Marcin Krzeminski <marcin.krzeminski@nokia.com>
---
hw/block/m25p80.c | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 761a14a..df5eaec 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -237,6 +237,9 @@ typedef enum {
ERASE_32K = 0x52,
ERASE_SECTOR = 0xd8,
+ EN_4BYTE_ADDR = 0xB7,
+ EX_4BYTE_ADDR = 0xE9,
+
EXTEND_ADDR_READ = 0xC8,
EXTEND_ADDR_WRITE = 0xC5,
@@ -269,6 +272,7 @@ typedef struct Flash {
uint8_t cmd_in_progress;
uint64_t cur_addr;
bool write_enable;
+ bool four_bytes_address_mode;
bool reset_enable;
uint8_t ear;
@@ -406,12 +410,25 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data)
s->dirty_page = page;
}
+static inline int get_addr_length(Flash *s)
+{
+ return s->four_bytes_address_mode ? 4 : 3;
+}
+
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;
+ int i;
+
+ s->cur_addr = 0;
+
+ for (i = 0; i < get_addr_length(s); ++i) {
+ s->cur_addr <<= 8;
+ s->cur_addr |= s->data[i];
+ }
+
+ if (get_addr_length(s) == 3) {
+ s->cur_addr += (s->ear & 0x3) * MAX_3BYTES_SIZE;
+ }
s->state = STATE_IDLE;
@@ -452,6 +469,7 @@ static void reset_memory(Flash *s)
s->cmd_in_progress = NOP;
s->cur_addr = 0;
s->ear = 0;
+ s->four_bytes_address_mode = false;
s->len = 0;
s->needed_bytes = 0;
s->pos = 0;
@@ -480,7 +498,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
case DPP:
case QPP:
case PP:
- s->needed_bytes = 3;
+ s->needed_bytes = get_addr_length(s);
s->pos = 0;
s->len = 0;
s->state = STATE_COLLECTING_DATA;
@@ -489,7 +507,7 @@ static void decode_new_cmd(Flash *s, uint32_t value)
case FAST_READ:
case DOR:
case QOR:
- s->needed_bytes = 4;
+ s->needed_bytes = get_addr_length(s);
s->pos = 0;
s->len = 0;
s->state = STATE_COLLECTING_DATA;
@@ -502,6 +520,8 @@ static void decode_new_cmd(Flash *s, uint32_t value)
s->needed_bytes = 4;
break;
case JEDEC_NUMONYX:
+ s->needed_bytes = get_addr_length(s);
+ break;
default:
s->needed_bytes = 5;
}
@@ -517,6 +537,8 @@ static void decode_new_cmd(Flash *s, uint32_t value)
s->needed_bytes = 6;
break;
case JEDEC_NUMONYX:
+ s->needed_bytes = get_addr_length(s);
+ break;
default:
s->needed_bytes = 8;
}
@@ -575,6 +597,12 @@ static void decode_new_cmd(Flash *s, uint32_t value)
break;
case NOP:
break;
+ case EN_4BYTE_ADDR:
+ s->four_bytes_address_mode = true;
+ break;
+ case EX_4BYTE_ADDR:
+ s->four_bytes_address_mode = false;
+ break;
case EXTEND_ADDR_READ:
s->data[0] = s->ear;
s->pos = 0;
@@ -725,6 +753,7 @@ static const VMStateDescription vmstate_m25p80 = {
VMSTATE_UINT8(cmd_in_progress, Flash),
VMSTATE_UINT64(cur_addr, Flash),
VMSTATE_BOOL(write_enable, Flash),
+ VMSTATE_BOOL(four_bytes_address_mode, Flash),
VMSTATE_UINT8(ear, Flash),
VMSTATE_BOOL(reset_enable, Flash),
VMSTATE_END_OF_LIST()
--
2.5.0
next prev parent reply other threads:[~2016-02-08 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 15:25 [Qemu-devel] [PATCH v3 00/11] Support for N25Q256/512 and AT25128/256 marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 01/11] block: m25p80: Removed unused variable marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 02/11] block: m25p80: RESET_ENABLE and RESET_MEMORY commnads marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 03/11] block: m25p80: Widen flags variable marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 04/11] block: m25p80: Extend address mode marcin.krzeminski
2016-02-08 15:25 ` marcin.krzeminski [this message]
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 06/11] block: m25p80: Add configuration registers marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 07/11] block: m25p80: Dummy cycles for N25Q256/512 marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 08/11] block: m25p80: Fast read and 4bytes commands marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 09/11] block: m25p80: Implemented FSR register marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 10/11] block: m25p80: n25q256a/n25q512a models marcin.krzeminski
2016-02-08 15:25 ` [Qemu-devel] [PATCH v3 11/11] block: m25p80: at25128a/at25256a models marcin.krzeminski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454945111-728-6-git-send-email-marcin.krzeminski@nokia.com \
--to=marcin.krzeminski@nokia.com \
--cc=clg@fr.ibm.com \
--cc=crosthwaitepeter@gmail.com \
--cc=pawel.lenkow@itlen.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).