From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSnh1-0005SO-Ng for qemu-devel@nongnu.org; Mon, 08 Feb 2016 10:25:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSngx-0006Jh-Eg for qemu-devel@nongnu.org; Mon, 08 Feb 2016 10:25:35 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:60758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSngw-0006IH-PV for qemu-devel@nongnu.org; Mon, 08 Feb 2016 10:25:31 -0500 From: marcin.krzeminski@nokia.com Date: Mon, 8 Feb 2016 16:25:07 +0100 Message-Id: <1454945111-728-8-git-send-email-marcin.krzeminski@nokia.com> In-Reply-To: <1454945111-728-1-git-send-email-marcin.krzeminski@nokia.com> References: <1454945111-728-1-git-send-email-marcin.krzeminski@nokia.com> Subject: [Qemu-devel] [PATCH v3 07/11] block: m25p80: Dummy cycles for N25Q256/512 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com From: Marcin Krzeminski This patch handles dummy cycles. Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 3949cc5..5a1abfd 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -530,6 +530,10 @@ static void decode_new_cmd(Flash *s, uint32_t value) case DOR: case QOR: s->needed_bytes = get_addr_length(s); + if (((s->pi->jedec >> 16) & 0xFF) == JEDEC_NUMONYX) { + /* Dummy cycles modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + } s->pos = 0; s->len = 0; s->state = STATE_COLLECTING_DATA; @@ -543,6 +547,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_NUMONYX: s->needed_bytes = get_addr_length(s); + /* Dummy cycles modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); break; default: s->needed_bytes = 5; @@ -560,6 +566,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_NUMONYX: s->needed_bytes = get_addr_length(s); + /* Dummy cycles modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg, 4, 4); break; default: s->needed_bytes = 8; -- 2.5.0