From patchwork Wed Dec 16 12:57:10 2015 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: 557455 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 7B8871402C4 for ; Thu, 17 Dec 2015 00:00:12 +1100 (AEDT) Received: from localhost ([::1]:47068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9Bgg-0005rf-CF for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2015 08:00:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BeQ-0001Ud-3N for qemu-devel@nongnu.org; Wed, 16 Dec 2015 07:57:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9BeM-0007Mf-Ke for qemu-devel@nongnu.org; Wed, 16 Dec 2015 07:57:49 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:35354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BeM-0007MQ-A0 for qemu-devel@nongnu.org; Wed, 16 Dec 2015 07:57:46 -0500 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 tBGCvjvx030945 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Dec 2015 12:57:45 GMT Received: from CNU418C7XK.nsn-intra.net ([10.154.155.152]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id tBGCvgIl028496; Wed, 16 Dec 2015 13:57:44 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Wed, 16 Dec 2015 13:57:10 +0100 Message-Id: <1450270635-27080-8-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1450270635-27080-1-git-send-email-marcin.krzeminski@nokia.com> References: <1450270635-27080-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: 2797 X-purgate-ID: 151667::1450270665-00002C61-548A9CC1/0/0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 93.183.12.32 Cc: pawel.lenkow@nokia.com, peter.crosthwaite@xilinx.com, marcin.krzeminski@nokia.com Subject: [Qemu-devel] [PATCH 07/12] Added support for extend address mode 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 Signed-off-by: Marcin Krzeminski Reviewed-by: Peter Crosthwaite --- hw/block/m25p80.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 6d5d90d..f0f637e 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -47,6 +47,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 */ @@ -240,6 +243,9 @@ typedef enum { EN_4BYTE_ADDR = 0xB7, EX_4BYTE_ADDR = 0xE9, + EXTEND_ADDR_READ = 0xC8, + EXTEND_ADDR_WRITE = 0xC5, + RESET_ENABLE = 0x66, RESET_MEMORY = 0x99, @@ -274,6 +280,7 @@ typedef struct Flash { bool reset_enable; bool initialized; uint8_t reset_pin; + uint8_t ear; int64_t dirty_page; @@ -426,6 +433,8 @@ 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; @@ -454,6 +463,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; } @@ -463,6 +475,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; @@ -589,6 +602,20 @@ static void decode_new_cmd(Flash *s, uint32_t value) case EX_4BYTE_ADDR: s->four_bytes_address_mode = false; 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; @@ -740,6 +767,7 @@ static const VMStateDescription vmstate_m25p80 = { 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_BOOL(initialized, Flash), VMSTATE_UINT8(reset_pin, Flash),