From patchwork Wed Dec 16 12:57:05 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: 557457 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 003A51402C4 for ; Thu, 17 Dec 2015 00:02:03 +1100 (AEDT) Received: from localhost ([::1]:47107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BiT-0000E5-Gk for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2015 08:02:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BeQ-0001Ue-3Q 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 1a9BeL-0007M2-9e for qemu-devel@nongnu.org; Wed, 16 Dec 2015 07:57:49 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:35333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9BeK-0007LY-Vi for qemu-devel@nongnu.org; Wed, 16 Dec 2015 07:57:45 -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 tBGCvhlZ030877 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Dec 2015 12:57:43 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 tBGCvgIg028496; Wed, 16 Dec 2015 13:57:42 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Wed, 16 Dec 2015 13:57:05 +0100 Message-Id: <1450270635-27080-3-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: 2631 X-purgate-ID: 151667::1450270663-00002C61-CEFECEF2/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 02/12] Added reset-pin emulation in model. 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 --- hw/block/m25p80.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index bfd493f..bcb66a5 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -258,6 +258,8 @@ typedef struct Flash { uint8_t cmd_in_progress; uint64_t cur_addr; bool write_enable; + bool initialized; + uint8_t reset_pin; int64_t dirty_page; @@ -430,6 +432,19 @@ 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; + + DB_PRINT_L(0, "Reset done.\n"); +} + static void decode_new_cmd(Flash *s, uint32_t value) { s->cmd_in_progress = value; @@ -620,6 +635,8 @@ static int m25p80_init(SSISlave *ss) s->size = s->pi->sector_size * s->pi->n_sectors; s->dirty_page = -1; + s->initialized = false; + /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_MTD); @@ -650,9 +667,24 @@ static void m25p80_pre_save(void *opaque) flash_sync_dirty((Flash *)opaque, -1); } +static void m25p80_reset(DeviceState *d) +{ + Flash *s = M25P80(d); + + if (s->reset_pin || !s->initialized) { + reset_memory(s); + s->initialized = true; + } +} + +static Property m25p80_properties[] = { + DEFINE_PROP_UINT8("reset-pin", Flash, reset_pin, 0), + DEFINE_PROP_END_OF_LIST(), +}; + 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[]) { @@ -664,6 +696,8 @@ static const VMStateDescription vmstate_m25p80 = { VMSTATE_UINT8(cmd_in_progress, Flash), VMSTATE_UINT64(cur_addr, Flash), VMSTATE_BOOL(write_enable, Flash), + VMSTATE_BOOL(initialized, Flash), + VMSTATE_UINT8(reset_pin, Flash), VMSTATE_END_OF_LIST() } }; @@ -679,6 +713,8 @@ static void m25p80_class_init(ObjectClass *klass, void *data) k->set_cs = m25p80_cs; k->cs_polarity = SSI_CS_LOW; dc->vmsd = &vmstate_m25p80; + dc->reset = &m25p80_reset; + dc->props = m25p80_properties; mc->pi = data; }