From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alHZK-0004i5-Dh for qemu-devel@nongnu.org; Wed, 30 Mar 2016 10:58:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alHZJ-000547-5A for qemu-devel@nongnu.org; Wed, 30 Mar 2016 10:58:02 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:56293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alHZI-00050z-U2 for qemu-devel@nongnu.org; Wed, 30 Mar 2016 10:58:01 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1alHZC-0001Av-9H for qemu-devel@nongnu.org; Wed, 30 Mar 2016 15:57:54 +0100 From: Peter Maydell Date: Wed, 30 Mar 2016 15:57:41 +0100 Message-Id: <1459349869-25448-10-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1459349869-25448-1-git-send-email-peter.maydell@linaro.org> References: <1459349869-25448-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 09/17] block: m25p80: Dummy cycles for N25Q256/512 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Marcin Krzeminski Use the setting from the volatile cfg register to correctly set the number of dummy cycles. Signed-off-by: Marcin Krzeminski Reviewed-by: Peter Crosthwaite Message-id: 1458719789-29868-8-git-send-email-marcin.krzeminski@nokia.com Signed-off-by: Peter Maydell --- hw/block/m25p80.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 3394f22..04e8730 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -583,7 +583,11 @@ static void decode_new_cmd(Flash *s, uint32_t value) case FAST_READ: case DOR: case QOR: - s->needed_bytes = get_addr_length(s) + 1; + 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; @@ -596,7 +600,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->needed_bytes = 4; break; default: - s->needed_bytes = get_addr_length(s) + 2; + 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); } s->pos = 0; s->len = 0; @@ -610,7 +616,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->needed_bytes = 6; break; default: - s->needed_bytes = get_addr_length(s) + 4; + 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); } s->pos = 0; s->len = 0; -- 1.9.1