From patchwork Sun Mar 20 18:28:06 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: 599877 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 3qSnbL2vKFz9s8d for ; Mon, 21 Mar 2016 05:31:10 +1100 (AEDT) Received: from localhost ([::1]:54007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahi84-0003Bz-HD for incoming@patchwork.ozlabs.org; Sun, 20 Mar 2016 14:31:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahi5a-0006aJ-Rv 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-0004XK-AI for qemu-devel@nongnu.org; Sun, 20 Mar 2016 14:28:34 -0400 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:36268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahi5V-0004WM-Vm 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 demumfd001.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u2KISKsu009757 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 20 Mar 2016 18:28:20 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 u2KISEfe017919; Sun, 20 Mar 2016 19:28:19 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Sun, 20 Mar 2016 19:28:06 +0100 Message-Id: <1458498493-13906-5-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: 2869 X-purgate-ID: 151667::1458498500-00007057-9EDFDEF3/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, rfsw-patches@mlist.nsn-inter.net, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com Subject: [Qemu-devel] [PATCH v5 04/11] block: m25p80: Extend 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marcin Krzeminski Extend address mode allows to switch flash 16 MiB banks, allowing user to access all flash sectors. This access mode is used by u-boot. Signed-off-by: Marcin Krzeminski Reviewed-by: Peter Crosthwaite --- hw/block/m25p80.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index cbb8b3e..c5de4ee 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -48,6 +48,9 @@ */ #define WR_1 0x100 +/* 16 MiB max in 3 byte address mode */ +#define MAX_3BYTES_SIZE 0x1000000 + typedef struct FlashPartInfo { const char *part_name; /* jedec code. (jedec >> 16) & 0xff is the 1st byte, >> 8 the 2nd etc */ @@ -234,6 +237,9 @@ typedef enum { ERASE_32K = 0x52, ERASE_SECTOR = 0xd8, + EXTEND_ADDR_READ = 0xC8, + EXTEND_ADDR_WRITE = 0xC5, + RESET_ENABLE = 0x66, RESET_MEMORY = 0x99, } FlashCMD; @@ -264,6 +270,7 @@ typedef struct Flash { uint64_t cur_addr; bool write_enable; bool reset_enable; + uint8_t ear; int64_t dirty_page; @@ -404,6 +411,7 @@ 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; s->state = STATE_IDLE; @@ -431,6 +439,9 @@ static void complete_collecting_data(Flash *s) s->write_enable = false; } break; + case EXTEND_ADDR_WRITE: + s->ear = s->data[0]; + break; default: break; } @@ -440,6 +451,7 @@ static void reset_memory(Flash *s) { s->cmd_in_progress = NOP; s->cur_addr = 0; + s->ear = 0; s->len = 0; s->needed_bytes = 0; s->pos = 0; @@ -563,6 +575,20 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case NOP: break; + case EXTEND_ADDR_READ: + s->data[0] = s->ear; + s->pos = 0; + s->len = 1; + s->state = STATE_READING_DATA; + break; + case EXTEND_ADDR_WRITE: + if (s->write_enable) { + s->needed_bytes = 1; + s->pos = 0; + s->len = 0; + s->state = STATE_COLLECTING_DATA; + } + break; case RESET_ENABLE: s->reset_enable = true; break; @@ -703,6 +729,7 @@ static const VMStateDescription vmstate_m25p80 = { VMSTATE_UINT8(cmd_in_progress, Flash), VMSTATE_UINT64(cur_addr, Flash), VMSTATE_BOOL(write_enable, Flash), + VMSTATE_UINT8(ear, Flash), VMSTATE_BOOL(reset_enable, Flash), VMSTATE_END_OF_LIST() }