From patchwork Wed Mar 26 16:39:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 27151 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3CD0A20369 for ; Wed, 26 Mar 2014 16:43:58 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wn1sf8122865obc.9 for ; Wed, 26 Mar 2014 09:43:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=6SPxXg+99UyLfBf26kysX+sKSq5bsw770YSy6e3teHg=; b=RhsVMLmB/U2SNKH0nKjdQnmcOk9cQaXoi8wFjJ/rDQ1o7HB+KWoTjlXh/qgD1H2YOg qEa6mTwy4w8cPYNU1HoHYHiGesL8vPuXo6rPrUSGHVlps5HxMozL2f8twWAU/cqpcde7 rPOEoaKZ09W1vos1eYrXd0RMzfBgPwSEqtT7FG+D2ONlIuvRr2jZsA+syk5F+ajm1uOT hoJ5SsmF/+OFxPejgHZLA0sBskQXYMdV9Kb2K+n2U0ov9RojVvtj6AgJ57sfYzgDUKWA eSe2NrRoCitD7F7RYl7oHyjkRSPQpN+krKaYVzvevemOpMRGGYKPhscXKlKfJ8oeGF/s m6jA== X-Gm-Message-State: ALoCoQnGlGaMAcPkFUNBMgNftLVTS1kwxjABBcosl6EgeLiX+4NajKE5HkxK/2LAA8mYCgji4HXt X-Received: by 10.50.136.198 with SMTP id qc6mr10931204igb.4.1395852237781; Wed, 26 Mar 2014 09:43:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.196 with SMTP id 62ls658492qgt.76.gmail; Wed, 26 Mar 2014 09:43:57 -0700 (PDT) X-Received: by 10.220.89.4 with SMTP id c4mr85930vcm.53.1395852237571; Wed, 26 Mar 2014 09:43:57 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id la9si4652628veb.38.2014.03.26.09.43.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 09:43:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so2686499veb.29 for ; Wed, 26 Mar 2014 09:43:56 -0700 (PDT) X-Received: by 10.52.253.75 with SMTP id zy11mr3530994vdc.10.1395852236800; Wed, 26 Mar 2014 09:43:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp61373vck; Wed, 26 Mar 2014 09:43:56 -0700 (PDT) X-Received: by 10.68.143.231 with SMTP id sh7mr88179135pbb.7.1395852235880; Wed, 26 Mar 2014 09:43:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hw8si13992814pbc.206.2014.03.26.09.43.55; Wed, 26 Mar 2014 09:43:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932240AbaCZQnn (ORCPT + 26 others); Wed, 26 Mar 2014 12:43:43 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:51714 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932091AbaCZQkK (ORCPT ); Wed, 26 Mar 2014 12:40:10 -0400 Received: by mail-we0-f174.google.com with SMTP id t60so1329040wes.33 for ; Wed, 26 Mar 2014 09:40:09 -0700 (PDT) X-Received: by 10.180.36.8 with SMTP id m8mr30824617wij.42.1395852009696; Wed, 26 Mar 2014 09:40:09 -0700 (PDT) Received: from lee--X1.home (host109-148-113-193.range109-148.btcentralplus.com. [109.148.113.193]) by mx.google.com with ESMTPSA id gp10sm3913806wib.13.2014.03.26.09.40.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 09:40:08 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, computersforpeace@gmail.com, linux-mtd@lists.infradead.org, angus.clark@st.com, Carmelo Amoroso Subject: [PATCH 10/15] mtd: st_spi_fsm: Add support for N25Q512 and N25Q00A devices Date: Wed, 26 Mar 2014 16:39:24 +0000 Message-Id: <1395851969-13520-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395851969-13520-1-git-send-email-lee.jones@linaro.org> References: <1395851969-13520-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Angus Clark This patch adds support for the Micron N25Q512 and N25Q00A Serial Flash devices. Unlike previous Micron devices, it is now mandatory to check the Flags Status Register following a Write or Erase operation. The N25Q512A device presents a further complication in that different variants of the device use different opcodes for the WRITE_1_4_4 operation. Since there is no easy way to determine at runtime which variant is being used, FLASH_CAPS_WRITE_1_4_4 support is removed for N25Q512 devices, resulting in WRITE_1_1_4 being used instead. The following devices have been tested: b2000C + N25Q512A13GSF40G b2000C + N25Q00AA13GSF40G b2147A + N25Q512A83GSF40X Signed-off-by: Angus Clark Signed-off-by: Carmelo Amoroso Signed-off-by: Lee Jones --- drivers/mtd/devices/st_spi_fsm.c | 96 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c index 1584783..99b3435 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c @@ -260,12 +260,25 @@ #define S25FL_STATUS_E_ERR 0x20 #define S25FL_STATUS_P_ERR 0x40 +/* N25Q - READ/WRITE/CLEAR NON/VOLATILE STATUS/CONFIG Registers */ +#define N25Q_CMD_RFSR 0x70 +#define N25Q_CMD_CLFSR 0x50 #define N25Q_CMD_WRVCR 0x81 #define N25Q_CMD_RDVCR 0x85 #define N25Q_CMD_RDVECR 0x65 #define N25Q_CMD_RDNVCR 0xb5 #define N25Q_CMD_WRNVCR 0xb1 +/* N25Q Flags Status Register: Error Flags */ +#define N25Q_FLAGS_ERR_ERASE BIT(5) +#define N25Q_FLAGS_ERR_PROG BIT(4) +#define N25Q_FLAGS_ERR_VPP BIT(3) +#define N25Q_FLAGS_ERR_PROT BIT(1) +#define N25Q_FLAGS_ERROR (N25Q_FLAGS_ERR_ERASE | \ + N25Q_FLAGS_ERR_PROG | \ + N25Q_FLAGS_ERR_VPP | \ + N25Q_FLAGS_ERR_PROT) + #define FLASH_PAGESIZE 256 /* In Bytes */ #define FLASH_PAGESIZE_32 (FLASH_PAGESIZE / 4) /* In uint32_t */ #define FLASH_MAX_BUSY_WAIT (300 * HZ) /* Maximum 'CHIPERASE' time */ @@ -277,6 +290,7 @@ #define CFG_WRITE_TOGGLE_32BIT_ADDR 0x00000002 #define CFG_ERASESEC_TOGGLE_32BIT_ADDR 0x00000008 #define CFG_S25FL_CHECK_ERROR_FLAGS 0x00000010 +#define CFG_N25Q_CHECK_ERROR_FLAGS 0x00000020 struct stfsm_seq { uint32_t data_size; @@ -395,6 +409,7 @@ static struct flash_info flash_types[] = { (MX25_FLAG | FLASH_FLAG_32BIT_ADDR | FLASH_FLAG_RESET), 70, stfsm_mx25_config}, + /* Micron N25Qxxx */ #define N25Q_FLAG (FLASH_FLAG_READ_WRITE | \ FLASH_FLAG_READ_FAST | \ FLASH_FLAG_READ_1_1_2 | \ @@ -407,10 +422,29 @@ static struct flash_info flash_types[] = { FLASH_FLAG_WRITE_1_4_4) { "n25q128", 0x20ba18, 0, 64 * 1024, 256, N25Q_FLAG, 108, stfsm_n25q_config }, - { "n25q256", 0x20ba19, 0, 64 * 1024, 512, - N25Q_FLAG | FLASH_FLAG_32BIT_ADDR, 108, stfsm_n25q_config }, - { "n25q512", 0x20ba20, 0, 64 * 1024, 1024, - N25Q_FLAG | FLASH_FLAG_32BIT_ADDR, 108, stfsm_n25q_config}, + + /* Micron N25Q256/N25Q512/N25Q00A (32-bit ADDR devices) + * + * Versions are available with or without a dedicated RESET# pin + * (e.g. N25Q512A83GSF40G vs. N25Q512A13GSF40G). To complicate matters, + * the versions that include a RESET# pin (Feature Set = 8) require a + * different opcode for the FLASH_CMD_WRITE_1_4_4 command. + * Unfortunately it is not possible to determine easily at run-time + * which version is being used. We therefore remove support for + * FLASH_FLAG_WRITE_1_4_4 (falling back to FLASH_FLAG_WRITE_1_1_4), and + * defer overall support for RESET# to the board-level platform/Device + * Tree property "reset-signal". + */ +#define N25Q_32BIT_ADDR_FLAG ((N25Q_FLAG | \ + FLASH_FLAG_32BIT_ADDR | \ + FLASH_FLAG_RESET) & \ + ~FLASH_FLAG_WRITE_1_4_4) + { "n25q256", 0x20ba19, 0, 64 * 1024, 512, + N25Q_32BIT_ADDR_FLAG, 108, stfsm_n25q_config}, + { "n25q512", 0x20ba20, 0x1000, 64 * 1024, 1024, + N25Q_32BIT_ADDR_FLAG, 108, stfsm_n25q_config}, + { "n25q00a", 0x20ba21, 0x1000, 64 * 1024, 2048, + N25Q_32BIT_ADDR_FLAG, 108, stfsm_n25q_config}, /* * Spansion S25FLxxxP @@ -888,6 +922,30 @@ static int stfsm_write_fifo(struct stfsm *fsm, uint32_t *buf, uint32_t size) return size; } +static int n25q_clear_flags(struct stfsm *fsm) +{ + struct stfsm_seq seq = { + .seq_opc[0] = (SEQ_OPC_PADS_1 | + SEQ_OPC_CYCLES(8) | + SEQ_OPC_OPCODE(N25Q_CMD_CLFSR) | + SEQ_OPC_CSDEASSERT), + .seq = { + STFSM_INST_CMD1, + STFSM_INST_STOP, + }, + .seq_cfg = (SEQ_CFG_PADS_1 | + SEQ_CFG_READNOTWRITE | + SEQ_CFG_CSDEASSERT | + SEQ_CFG_STARTSEQ), + }; + + stfsm_load_seq(fsm, &seq); + + stfsm_wait_seq(fsm); + + return 0; +} + static int stfsm_enter_32bit_addr(struct stfsm *fsm, int enter) { struct stfsm_seq *seq = &fsm->stfsm_seq_en_32bit_addr; @@ -1248,10 +1306,18 @@ static int stfsm_mx25_config(struct stfsm *fsm) static int stfsm_n25q_config(struct stfsm *fsm) { uint32_t flags = fsm->info->flags; - uint8_t vcr; + uint8_t vcr, sta; int ret = 0; bool soc_reset; + /* + * Check/Clear Error Flags + */ + fsm->configuration |= CFG_N25Q_CHECK_ERROR_FLAGS; + stfsm_read_status(fsm, N25Q_CMD_RFSR, &sta, 1); + if (sta & N25Q_FLAGS_ERROR) + n25q_clear_flags(fsm); + /* Configure 'READ' sequence */ if (flags & FLASH_FLAG_32BIT_ADDR) ret = stfsm_search_prepare_rw_seq(fsm, &fsm->stfsm_seq_read, @@ -1626,6 +1692,7 @@ static int stfsm_write(struct stfsm *fsm, const uint8_t *buf, uint32_t page_buf[FLASH_PAGESIZE_32]; uint8_t *t = (uint8_t *)&tmp; const uint8_t *p; + uint8_t sta; int ret; int i; @@ -1697,6 +1764,15 @@ static int stfsm_write(struct stfsm *fsm, const uint8_t *buf, if (ret && fsm->configuration & CFG_S25FL_CHECK_ERROR_FLAGS) stfsm_s25fl_clear_status_reg(fsm); + /* N25Q: Check/Clear Error Flags */ + if (fsm->configuration & CFG_N25Q_CHECK_ERROR_FLAGS) { + stfsm_read_status(fsm, N25Q_CMD_RFSR, &sta, 1); + if (sta & N25Q_FLAGS_ERROR) { + n25q_clear_flags(fsm); + ret = -EPROTO; + } + } + /* Exit 32-bit address mode, if required */ if (fsm->configuration & CFG_WRITE_TOGGLE_32BIT_ADDR) stfsm_enter_32bit_addr(fsm, 0); @@ -1739,6 +1815,7 @@ static int stfsm_mtd_read(struct mtd_info *mtd, loff_t from, size_t len, static int stfsm_erase_sector(struct stfsm *fsm, uint32_t offset) { struct stfsm_seq *seq = &stfsm_seq_erase_sector; + uint8_t sta; int ret; dev_dbg(fsm->dev, "erasing sector at 0x%08x\n", offset); @@ -1759,6 +1836,15 @@ static int stfsm_erase_sector(struct stfsm *fsm, uint32_t offset) if (ret && fsm->configuration & CFG_S25FL_CHECK_ERROR_FLAGS) stfsm_s25fl_clear_status_reg(fsm); + /* N25Q: Check/Clear Error Flags */ + if (fsm->configuration & CFG_N25Q_CHECK_ERROR_FLAGS) { + stfsm_read_status(fsm, N25Q_CMD_RFSR, &sta, 1); + if (sta & N25Q_FLAGS_ERROR) { + n25q_clear_flags(fsm); + ret = -EPROTO; + } + } + /* Exit 32-bit address mode, if required */ if (fsm->configuration & CFG_ERASESEC_TOGGLE_32BIT_ADDR) stfsm_enter_32bit_addr(fsm, 0);