From patchwork Sun Mar 20 18:28:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: marcin.krzeminski@nokia.com X-Patchwork-Id: 8626991 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4E573C0553 for ; Sun, 20 Mar 2016 18:30:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99BB6202DD for ; Sun, 20 Mar 2016 18:30:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC3CB202D1 for ; Sun, 20 Mar 2016 18:30:36 +0000 (UTC) Received: from localhost ([::1]:54001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahi7Y-0001yd-4m for patchwork-qemu-devel@patchwork.kernel.org; Sun, 20 Mar 2016 14:30:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahi5a-0006aI-QL for qemu-devel@nongnu.org; Sun, 20 Mar 2016 14:28:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahi5W-0004Ww-2Z for qemu-devel@nongnu.org; Sun, 20 Mar 2016 14:28:34 -0400 Received: from demumfd002.nsn-inter.net ([93.183.12.31]:37990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahi5V-0004W1-Pp for qemu-devel@nongnu.org; Sun, 20 Mar 2016 14:28:30 -0400 Received: from demuprx016.emea.nsn-intra.net ([10.150.129.55]) by demumfd002.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u2KISLYM020739 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 20 Mar 2016 18:28:21 GMT Received: from CNU418C7XK.emea.nsn-net.net ([10.150.177.236]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u2KISEff017919; Sun, 20 Mar 2016 19:28:20 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Sun, 20 Mar 2016 19:28:07 +0100 Message-Id: <1458498493-13906-6-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458498493-13906-1-git-send-email-marcin.krzeminski@nokia.com> References: <1458498493-13906-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: 4056 X-purgate-ID: 151667::1458498501-000079EB-ACC19BEA/0/0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 93.183.12.31 Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, rfsw-patches@mlist.nsn-inter.net, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com Subject: [Qemu-devel] [PATCH v5 05/11] block: m25p80: 4byte address mode 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marcin Krzeminski 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 Reviewed-by: Peter Crosthwaite --- hw/block/m25p80.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index c5de4ee..101a43f 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) + 1; s->pos = 0; s->len = 0; s->state = STATE_COLLECTING_DATA; @@ -501,9 +519,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) case JEDEC_SPANSION: s->needed_bytes = 4; break; - case JEDEC_NUMONYX: default: - s->needed_bytes = 5; + s->needed_bytes = get_addr_length(s) + 2; } s->pos = 0; s->len = 0; @@ -516,9 +533,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) case JEDEC_SPANSION: s->needed_bytes = 6; break; - case JEDEC_NUMONYX: default: - s->needed_bytes = 8; + s->needed_bytes = get_addr_length(s) + 4; } s->pos = 0; s->len = 0; @@ -575,6 +591,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; @@ -729,6 +751,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()