From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai3Mk-0004z0-8H for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:11:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai3Me-0004ad-B0 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:11:42 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:38324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai3Me-0004aP-1u for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:11:36 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Mar 2016 17:11:35 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id D25601B08447 for ; Mon, 21 Mar 2016 17:03:04 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2LH2Xqn61145326 for ; Mon, 21 Mar 2016 17:02:33 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2LH2WDG003124 for ; Mon, 21 Mar 2016 13:02:33 -0400 References: <1458498493-13906-1-git-send-email-marcin.krzeminski@nokia.com> <1458498493-13906-3-git-send-email-marcin.krzeminski@nokia.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <56F02921.2000501@fr.ibm.com> Date: Mon, 21 Mar 2016 18:02:25 +0100 MIME-Version: 1.0 In-Reply-To: <1458498493-13906-3-git-send-email-marcin.krzeminski@nokia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 02/11] block: m25p80: RESET_ENABLE and RESET_MEMORY commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcin.krzeminski@nokia.com, qemu-devel@nongnu.org Cc: crosthwaitepeter@gmail.com, pawel.lenkow@itlen.com, rfsw-patches@mlist.nsn-inter.net Hello Marcin, One minor comment below, On 03/20/2016 07:28 PM, marcin.krzeminski@nokia.com wrote: > From: Marcin Krzeminski > > Signed-off-by: Marcin Krzeminski > Reviewed-by: Peter Crosthwaite > --- > hw/block/m25p80.c | 41 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 40 insertions(+), 1 deletion(-) > > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index 2222124..1d053a5 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; > @@ -647,6 +677,13 @@ static int m25p80_init(SSISlave *ss) > return 0; > } > > +static void m25p80_reset(DeviceState *d) > +{ > + Flash *s = M25P80(d); > + > + reset_memory(s); > +} > + > static void m25p80_pre_save(void *opaque) > { > flash_sync_dirty((Flash *)opaque, -1); > @@ -654,7 +691,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 +703,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), Shouldn't that be VMSTATE_BOOL_V(reset_enable, Flash, 2) ? C. > VMSTATE_END_OF_LIST() > } > }; > @@ -681,6 +719,7 @@ 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; > mc->pi = data; > } >