From patchwork Thu Feb 4 12:23:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Krzeminski, Marcin (Nokia - PL/Wroclaw)" X-Patchwork-Id: 578897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CD42D140783 for ; Thu, 4 Feb 2016 23:29:13 +1100 (AEDT) Received: from localhost ([::1]:41322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRJ27-0006gH-S9 for incoming@patchwork.ozlabs.org; Thu, 04 Feb 2016 07:29:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIws-00060Y-2Q for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRIwo-0008Nw-To for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:45 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:59357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIwo-0008Mv-Jx for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:42 -0500 Received: from demuprx017.emea.nsn-intra.net ([10.150.129.56]) by demumfd001.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u14CNcT4004016 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Feb 2016 12:23:38 GMT Received: from CNU418C7XK.nsn-intra.net ([10.154.155.152]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u14CNXOE022276; Thu, 4 Feb 2016 13:23:37 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Thu, 4 Feb 2016 13:23:23 +0100 Message-Id: <1454588606-14094-9-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454588606-14094-1-git-send-email-marcin.krzeminski@nokia.com> References: <1454588606-14094-1-git-send-email-marcin.krzeminski@nokia.com> X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 3939 X-purgate-ID: 151667::1454588618-00001C0B-25AC372D/0/0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 93.183.12.32 Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com Subject: [Qemu-devel] [PATCH v2 08/11] block: m25p80: Fast read and 4bytes commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marcin Krzeminski Adds fast read and 4bytes commands family. This work is based on Pawel Lenkow patch from v1. Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index df1f829..faf1212 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -224,19 +224,28 @@ typedef enum { BULK_ERASE = 0xc7, READ = 0x3, - FAST_READ = 0xb, + READ4 = 0x13, + FAST_READ = 0x0b, + FAST_READ4 = 0x0c, DOR = 0x3b, + DOR4 = 0x3c, QOR = 0x6b, + QOR4 = 0x6c, DIOR = 0xbb, + DIOR4 = 0xbc, QIOR = 0xeb, + QIOR4 = 0xec, PP = 0x2, + PP4 = 0x12, DPP = 0xa2, QPP = 0x32, ERASE_4K = 0x20, + ERASE4_4K = 0x21, ERASE_32K = 0x52, ERASE_SECTOR = 0xd8, + ERASE4_SECTOR = 0xdc, EN_4BYTE_ADDR = 0xB7, EX_4BYTE_ADDR = 0xE9, @@ -359,6 +368,7 @@ static void flash_erase(Flash *s, int offset, FlashCMD cmd) switch (cmd) { case ERASE_4K: + case ERASE4_4K: len = 4 << 10; capa_to_assert = ER_4K; break; @@ -367,6 +377,7 @@ static void flash_erase(Flash *s, int offset, FlashCMD cmd) capa_to_assert = ER_32K; break; case ERASE_SECTOR: + case ERASE4_SECTOR: len = s->pi->sector_size; break; case BULK_ERASE: @@ -425,6 +436,18 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data) static inline int get_cmd_length(Flash *s) { + switch (s->cmd_in_progress) { + case PP4: + case READ4: + case QIOR4: + case ERASE4_4K: + case ERASE4_SECTOR: + case FAST_READ4: + case DOR4: + case QOR4: + case DIOR4: + return 4; + default: return s->four_bytes_address_mode ? 4 : 3; } } @@ -450,19 +473,28 @@ static void complete_collecting_data(Flash *s) case DPP: case QPP: case PP: + case PP4: s->state = STATE_PAGE_PROGRAM; break; case READ: + case READ4: case FAST_READ: + case FAST_READ4: case DOR: + case DOR4: case QOR: + case QOR4: case DIOR: + case DIOR4: case QIOR: + case QIOR4: s->state = STATE_READ; break; case ERASE_4K: + case ERASE4_4K: case ERASE_32K: case ERASE_SECTOR: + case ERASE4_SECTOR: flash_erase(s, s->cur_addr, s->cmd_in_progress); break; case WRSR: @@ -515,12 +547,16 @@ static void decode_new_cmd(Flash *s, uint32_t value) switch (value) { case ERASE_4K: + case ERASE4_4K: case ERASE_32K: case ERASE_SECTOR: + case ERASE4_SECTOR: case READ: + case READ4: case DPP: case QPP: case PP: + case PP4: s->needed_bytes = get_cmd_length(s); s->pos = 0; s->len = 0; @@ -528,8 +564,11 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case FAST_READ: + case FAST_READ4: case DOR: + case DOR4: case QOR: + case QOR4: s->needed_bytes = get_cmd_length(s); if ( ((s->pi->jedec >> 16) & 0xFF) == JEDEC_NUMONYX ) { /* Dummy cycles - modeled with bytes writes instead of bits */ @@ -541,6 +580,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case DIOR: + case DIOR4: switch ((s->pi->jedec >> 16) & 0xFF) { case JEDEC_WINBOND: case JEDEC_SPANSION: @@ -559,6 +599,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case QIOR: + case QIOR4: switch ((s->pi->jedec >> 16) & 0xFF) { case JEDEC_WINBOND: case JEDEC_SPANSION: