From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSnh1-0005SR-OS for qemu-devel@nongnu.org; Mon, 08 Feb 2016 10:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSngx-0006JA-D5 for qemu-devel@nongnu.org; Mon, 08 Feb 2016 10:25:35 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:60740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSngw-0006I4-OU for qemu-devel@nongnu.org; Mon, 08 Feb 2016 10:25:31 -0500 From: marcin.krzeminski@nokia.com Date: Mon, 8 Feb 2016 16:25:02 +0100 Message-Id: <1454945111-728-3-git-send-email-marcin.krzeminski@nokia.com> In-Reply-To: <1454945111-728-1-git-send-email-marcin.krzeminski@nokia.com> References: <1454945111-728-1-git-send-email-marcin.krzeminski@nokia.com> Subject: [Qemu-devel] [PATCH v3 02/11] block: m25p80: RESET_ENABLE and RESET_MEMORY commnads List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com 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() } }; -- 2.5.0