From patchwork Thu Feb 4 12:23:17 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: 8220901 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 52F44BEEE5 for ; Thu, 4 Feb 2016 12:32:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA29D20375 for ; Thu, 4 Feb 2016 12:32:18 +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 EA36D2034C for ; Thu, 4 Feb 2016 12:32:17 +0000 (UTC) Received: from localhost ([::1]:41357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRJ57-0002KO-A2 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Feb 2016 07:32:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIwv-00067f-G7 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRIwo-0008NX-O4 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:49 -0500 Received: from demumfd002.nsn-inter.net ([93.183.12.31]:54809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIwo-0008Mg-Cp 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 demumfd002.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u14CNa6a018247 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Feb 2016 12:23:36 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 u14CNXO8022276; Thu, 4 Feb 2016 13:23:35 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Thu, 4 Feb 2016 13:23:17 +0100 Message-Id: <1454588606-14094-3-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: 2962 X-purgate-ID: 151667::1454588616-0000462D-111AD46F/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, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com Subject: [Qemu-devel] [PATCH v2 02/11] block: m25p80: RESET_ENABLE and RESET_MEMORY commnads 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 Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 2222124..b986df4 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -233,6 +233,9 @@ typedef enum { ERASE_4K = 0x20, ERASE_32K = 0x52, ERASE_SECTOR = 0xd8, + + RESET_ENABLE = 0x66, + RESET_MEMORY = 0x99, } FlashCMD; typedef enum { @@ -260,6 +263,7 @@ typedef struct Flash { uint8_t cmd_in_progress; uint64_t cur_addr; bool write_enable; + bool reset_enable; int64_t dirty_page; @@ -432,11 +436,29 @@ static void complete_collecting_data(Flash *s) } } +static void reset_memory(Flash *s) +{ + s->cmd_in_progress = NOP; + s->cur_addr = 0; + s->len = 0; + s->needed_bytes = 0; + s->pos = 0; + s->state = STATE_IDLE; + s->write_enable = false; + s->reset_enable = false; + + DB_PRINT_L(0, "Reset done.\n"); +} + static void decode_new_cmd(Flash *s, uint32_t value) { s->cmd_in_progress = value; DB_PRINT_L(0, "decoded new command:%x\n", value); + if (value != RESET_MEMORY) { + s->reset_enable = false; + } + switch (value) { case ERASE_4K: @@ -541,6 +563,14 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case NOP: break; + case RESET_ENABLE: + s->reset_enable = true; + break; + case RESET_MEMORY: + if (s->reset_enable) { + reset_memory(s); + } + break; default: qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Unknown cmd %x\n", value); break; @@ -555,6 +585,7 @@ static int m25p80_cs(SSISlave *ss, bool select) s->len = 0; s->pos = 0; s->state = STATE_IDLE; + s->reset_enable = false; flash_sync_dirty(s, -1); } @@ -622,6 +653,8 @@ static int m25p80_init(SSISlave *ss) s->size = s->pi->sector_size * s->pi->n_sectors; s->dirty_page = -1; + reset_memory(s); + /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_MTD); @@ -654,7 +687,7 @@ static void m25p80_pre_save(void *opaque) static const VMStateDescription vmstate_m25p80 = { .name = "xilinx_spi", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .pre_save = m25p80_pre_save, .fields = (VMStateField[]) { @@ -666,6 +699,7 @@ static const VMStateDescription vmstate_m25p80 = { VMSTATE_UINT8(cmd_in_progress, Flash), VMSTATE_UINT64(cur_addr, Flash), VMSTATE_BOOL(write_enable, Flash), + VMSTATE_BOOL(reset_enable, Flash), VMSTATE_END_OF_LIST() } };