From patchwork Wed Dec 16 12:57:09 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: 557458 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 B70421402C4 for ; Thu, 17 Dec 2015 00:02:05 +1100 (AEDT) Received: from localhost ([::1]:47108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BiV-0000He-MF for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2015 08:02:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BeQ-0001U8-2v 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-0007MW-AK for qemu-devel@nongnu.org; Wed, 16 Dec 2015 07:57:49 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:35351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BeL-0007MN-Vh 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 tBGCvj6p030926 (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 tBGCvgIk028496; 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:09 +0100 Message-Id: <1450270635-27080-7-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: 2567 X-purgate-ID: 151667::1450270665-00002C61-C8E7CDE3/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 06/12] 4byte address mode support added. 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 | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 1a547ae..6d5d90d 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, + RESET_ENABLE = 0x66, RESET_MEMORY = 0x99, @@ -267,6 +270,7 @@ typedef struct Flash { uint8_t cmd_in_progress; uint64_t cur_addr; bool write_enable; + bool four_bytes_address_mode; bool reset_enable; bool initialized; uint8_t reset_pin; @@ -405,11 +409,24 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data) s->dirty_page = page; } +static inline int is_4bytes(Flash *s) +{ + return s->four_bytes_address_mode; + } +} + 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]; + if (is_4bytes(s)) { + s->cur_addr = s->data[0] << 24; + s->cur_addr |= s->data[1] << 16; + s->cur_addr |= s->data[2] << 8; + s->cur_addr |= s->data[3]; + } else { + s->cur_addr = s->data[0] << 16; + s->cur_addr |= s->data[1] << 8; + s->cur_addr |= s->data[2]; + } s->state = STATE_IDLE; @@ -446,6 +463,7 @@ static void reset_memory(Flash *s) { s->cmd_in_progress = NOP; s->cur_addr = 0; + s->four_bytes_address_mode = false; s->len = 0; s->needed_bytes = 0; s->pos = 0; @@ -565,6 +583,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 RESET_ENABLE: s->reset_enable = true; break; @@ -715,6 +739,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_BOOL(reset_enable, Flash), VMSTATE_BOOL(initialized, Flash), VMSTATE_UINT8(reset_pin, Flash),