From patchwork Wed Mar 23 07:56:27 2016 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: 601139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3qVMSQ4xczz9syq for ; Wed, 23 Mar 2016 19:00:38 +1100 (AEDT) Received: from localhost ([::1]:41703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aidiW-0002hc-U8 for incoming@patchwork.ozlabs.org; Wed, 23 Mar 2016 04:00:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aideo-0003sd-JT for qemu-devel@nongnu.org; Wed, 23 Mar 2016 03:56:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiden-0002H5-Gm for qemu-devel@nongnu.org; Wed, 23 Mar 2016 03:56:46 -0400 Received: from demumfd002.nsn-inter.net ([93.183.12.31]:44480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiden-0002GI-4s for qemu-devel@nongnu.org; Wed, 23 Mar 2016 03:56:45 -0400 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 u2N7ueXs031236 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 23 Mar 2016 07:56:40 GMT Received: from CNU418C7XK.nsn-intra.net ([10.154.154.82]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u2N7uVZf022990; Wed, 23 Mar 2016 08:56:39 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Wed, 23 Mar 2016 08:56:27 +0100 Message-Id: <1458719789-29868-10-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458719789-29868-1-git-send-email-marcin.krzeminski@nokia.com> References: <1458719789-29868-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: 1642 X-purgate-ID: 151667::1458719800-000079EB-0FFB0320/0/0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 93.183.12.31 Cc: peter.maydell@linaro.org, crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, rfsw-patches@mlist.nsn-inter.net Subject: [Qemu-devel] [PATCH v6 09/11] block: m25p80: Implemented FSR register 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 Implements FSR register, it is used for busy waits. Signed-off-by: Marcin Krzeminski Reviewed-by: Peter Crosthwaite --- hw/block/m25p80.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 1e615ca..479d4c5 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -103,6 +103,10 @@ typedef struct FlashPartInfo { #define NVCFG_LOWER_SEGMENT_MASK (1 << 1) #define CFG_UPPER_128MB_SEG_ENABLED 0x3 +/* Numonyx (Micron) Flag Status Register macros */ +#define FSR_4BYTE_ADDR_MODE_ENABLED 0x1 +#define FSR_FLASH_READY (1 << 7) + static const FlashPartInfo known_devices[] = { /* Atmel -- some are (confusingly) marketed as "DataFlash" */ { INFO("at25fs010", 0x1f6601, 0, 32 << 10, 4, ER_4K) }, @@ -242,6 +246,7 @@ typedef enum { WREN = 0x6, JEDEC_READ = 0x9f, BULK_ERASE = 0xc7, + READ_FSR = 0x70, READ = 0x03, READ4 = 0x13, @@ -690,6 +695,16 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->state = STATE_READING_DATA; break; + case READ_FSR: + s->data[0] = FSR_FLASH_READY; + if (s->four_bytes_address_mode) { + s->data[0] |= FSR_4BYTE_ADDR_MODE_ENABLED; + } + s->pos = 0; + s->len = 1; + s->state = STATE_READING_DATA; + break; + case JEDEC_READ: DB_PRINT_L(0, "populated jedec code\n"); s->data[0] = (s->pi->jedec >> 16) & 0xff;