Received: by 10.192.165.156 with SMTP id m28csp50863imm; Sun, 15 Apr 2018 16:45:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/kXSHpiJ08M3M5MW9p9IQa9DuCdXfGedP7iUNaMStUQd0Z72wBTmNycU7UvmzpXk6z5DRB X-Received: by 2002:a17:902:444:: with SMTP id 62-v6mr13323237ple.127.1523835955507; Sun, 15 Apr 2018 16:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523835955; cv=none; d=google.com; s=arc-20160816; b=pTNtWZKJQCTcdRmyNWTG/su8cXX7lmReoWwSTopjWA2XKKX/CfUjQHi+9dH0qfuP6I cIYnwe6nQS53qBcfMRxmAz1zEPYjCrey60VvyHa+MzbpGHwd+UalTAFxYOOlsi58dF7g uKrlW2N8OIXYe2st5nRhQ1E/uF4zr7pme1WWVPjDM9uwJD7by69YZF0N3iNpHJQ0Oykz YYdM57ffpABpzY0aZnKoTpTsvg7o2EGKct07HWlrAtw1fRJTmVFs4SLgG1H6gYmdIGQv +hRHYXugdxR8YG4syLEHE6uFU+OIIABjds9+4G96FYGQEu0bee02fdac71Sv8XbFTYrm 2QCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:references :in-reply-to:subject:cc:date:to:from:arc-authentication-results; bh=s4I44uJ13L3AbVoAG8JwfPCVukkVTf5r5l8dOzkl03A=; b=xTNR2rojfX2a/bvdLG8zHOuqaDVgTCzmP/n5RZjnO3Y7ybwL4rB6ywgwRZSUcJSA+/ OGdL2zLVgMUJjXRHFweGvYkH6M1YRlUOYIO+DT6g22W6nWdTOthnNA8D1KsOJzrWliYv XZ3MgfOWmto8fewWQarvDaPqFP1jK52PtyEn/4Ul+0texP3bTnY94h106k7+9f8Kr8ob mID8Z/DOC9oR+ddbSG43980I3C1rX1vhNvPpPTaA6zRYRiUiEsTMSvOPtvrW+OT0zO21 vdbEqaAy0bqmgJQWpiMMpFef/6JwXl9X4FdfHyCF/6OO5rARBA0zJqSCa47jb8lxHQZF evNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g2-v6si7526105plm.181.2018.04.15.16.45.21; Sun, 15 Apr 2018 16:45: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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752654AbeDOXmp (ORCPT + 99 others); Sun, 15 Apr 2018 19:42:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:39293 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752552AbeDOXmo (ORCPT ); Sun, 15 Apr 2018 19:42:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2A68BAD2D; Sun, 15 Apr 2018 23:42:43 +0000 (UTC) From: NeilBrown To: Cyrille Pitchen , Marek Vasut Date: Mon, 16 Apr 2018 09:42:30 +1000 Cc: David Woodhouse , Brian Norris , Boris Brezillon , Richard Weinberger , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing. In-Reply-To: <874lkmw54j.fsf@notabene.neil.brown.name> References: <874lkmw54j.fsf@notabene.neil.brown.name> Message-ID: <87sh7wrq8p.fsf@notabene.neil.brown.name> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Winbond spi-nor flash 32MB and larger have an 'Extended Address Register' as one option for addressing beyond 16MB (Macronix has the same concept, Spansion has EXTADD bits in the Bank Address Register). According to section 8.2.7 Write Extended Address Register (C5h) of the Winbond W25Q256FV data sheet (256M-BIT SPI flash) The Extended Address Register is only effective when the device is in the 3-Byte Address Mode. When the device operates in the 4-Byte Address Mode (ADS=3D1), any command with address input of A31-A24 will replace the Extended Address Register values. It is recommended to check and update the Extended Address Register if necessary when the device is switched from 4-Byte to 3-Byte Address Mode. So the documentation suggests clearing the EAR after switching to 3-byte mode. Experimentation shows that the EAR is *always* one after the switch to 3-byte mode, so clearing the EAR is mandatory at shutdown for a subsequent 3-byte-addressed reboot to work. Note that some SOCs (e.g. MT7621) do not assert a reset line at normal reboot, so we cannot rely on hardware reset. The MT7621 does assert a reset line at watchdog-reset. Signed-off-by: NeilBrown =2D-- following a helpful discussion with Marek, I've revised the description a little, and make the code change specific to winbond. I've change the OP names to RDEAR and WREAR instead of RDXA and WRXA to match names used in the Macronix documentation. Winbond documentation doesn't provide abbreviated OP names. Thanks, NeilBrown drivers/mtd/spi-nor/spi-nor.c | 13 +++++++++++++ include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index d445a4d3b770..0d0af0acf8b9 100644 =2D-- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -284,6 +284,19 @@ static inline int set_4byte(struct spi_nor *nor, const= struct flash_info *info, if (need_wren) write_disable(nor); =20 + if (!status && !enable && + JEDEC_MFR(info) =3D=3D SNOR_MFR_WINBOND) { + /* On Winbond W25Q256FV, leaving 4byte mode causes + * the Extended Address Register to be set to 1, so all + * 3-byte-address reads come from the second 16M. + * We must clear the register to enable normal behavior. + */ + write_enable(nor); + nor->cmd_buf[0] =3D 0; + nor->write_reg(nor, SPINOR_OP_WREAR, nor->cmd_buf, 1); + write_disable(nor); + } + return status; default: /* Spansion style */ diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index de36969eb359..e60da0d34cc1 100644 =2D-- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -62,6 +62,8 @@ #define SPINOR_OP_RDCR 0x35 /* Read configuration register */ #define SPINOR_OP_RDFSR 0x70 /* Read flag status register */ #define SPINOR_OP_CLFSR 0x50 /* Clear flag status register */ +#define SPINOR_OP_RDEAR 0xc8 /* Read Extended Address Register */ +#define SPINOR_OP_WREAR 0xc5 /* Write Extended Address Register */ =20 /* 4-byte address opcodes - used on Spansion and some Macronix flashes. */ #define SPINOR_OP_READ_4B 0x13 /* Read data bytes (low frequency) */ =2D-=20 2.14.0.rc0.dirty --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEG8Yp69OQ2HB7X0l6Oeye3VZigbkFAlrT42YACgkQOeye3VZi gblCDw//Y4otOxTe0EHGb17QGFw2lAkk+G+h03ggDIqEqi68sKjgsApJMQvr6Kae cms/D7y0Gq7v7bwTqgbuCKTlA/p2spzhkX+K2dGmCq3vm4Pq74s/WAwl3I4CxNN9 pOLLU4G1Lm6Br0O/7eaAGf+rODQ26Gy4mrlQNHv3sSTxNezv05Ipk6TcSgVq4NUw WkRcHrGU6JvQOqlUfODMripl2Ehbo2moIWCS7w7tWqfbwTPE/oxygmP9/qZlC0zc AFjnN+hTiFE9ahP2VGH4n7Sl1Kn5ymCyRWPJ6Ev0N4dgDoDZtrM67gU1Xii1vMir Tlrno6vyIfEOdMxx86kJytGbRLBdVnL8kr9MefoHnM2OGxuL49VMvMu/I9PqvhQn ZNHAaZQglL+53pR8XnnZ3LTNOQrIT5szPXTcN4/Kf2AyzMatBIq5qGvogL1tqUx8 bMJKPrKIan9tApkx7PTQku1OYns1wquczyXS2LSiKfdIBRxjpLW8I6VGp2ojjRAn GBLmQj4oUzd+43iMCmoIuSzx7OvOZDqXxitEfHi1dEvDJ9nlVAShNhNv/85AZJ1+ L6we1RA8YChlhTHEcQqkCnYLlJOwyGaIXc6qItA04791kaKv3FEMjY2NaHl1zZCF ucieISe0H0/E03tPbv6IYXZDWPm3u3bOiwQVUeAOjCRPYKgLqJw= =ESY4 -----END PGP SIGNATURE----- --=-=-=--