From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 3.mo179.mail-out.ovh.net ([178.33.251.175]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2zx8-0000Ld-JG for linux-mtd@lists.infradead.org; Thu, 20 Sep 2018 14:29:15 +0000 Received: from player755.ha.ovh.net (unknown [10.109.159.152]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id B3EC9FF8F0 for ; Thu, 20 Sep 2018 16:28:54 +0200 (CEST) Subject: Re: [PATCH] mtd: spi-nor: Set SPI_NOR_4B_OPCODES on all >16MB Spansion NORs To: Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , linux-mtd@lists.infradead.org References: <20180920141425.31737-1-boris.brezillon@bootlin.com> From: Cyrille Pitchen Message-ID: <1485e647-e662-53ca-22c0-e63a185ccd41@wedev4u.fr> Date: Thu, 20 Sep 2018 16:28:43 +0200 MIME-Version: 1.0 In-Reply-To: <20180920141425.31737-1-boris.brezillon@bootlin.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi Boris, Le 20/09/2018 à 16:14, Boris Brezillon a écrit : > The code was treating >16MB Spansion NORs as a special case, while they > could just be flagged with SPI_NOR_4B_OPCODES and be treated as other > NORs. > > This change simplifies the code and makes it explicit that those parts > are supporting 4B addressing. > > Signed-off-by: Boris Brezillon > --- > I've checked the datasheet of s25fl512s and s70fl01gs, and they indeed > support 4B opcodes. Other Spansion NORs might also support 4B opcodes, > but those that are not already have SPI_NOR_4B_OPCODES set are anyway > <16MB in size. > > Also, I kept NOR definitions on a single line, since those were already > over 80chars. Marek, let me know if you want me to change that for the > GigaDevice formatting: > > { > "gd25q16", INFO(0xc84015, 0, 64 * 1024, 32, > SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | > SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) > }, > --- > drivers/mtd/spi-nor/spi-nor.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index 7993dd5c0c21..391e888758c1 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -1416,8 +1416,8 @@ static const struct flash_info spi_nor_ids[] = { > { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, > { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) }, > { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, You need to add the SPI_NOR_4B_OPCODES to all Spansion/Cypress memory parts > 128Mbits, hence also to 256Mbits memory parts ;) Best regards, Cyrille > - { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, > - { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) }, > + { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR | SPI_NOR_4B_OPCODES) }, > + { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, SPI_NOR_4B_OPCODES) }, > { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, > { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, > { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, > @@ -3558,7 +3558,6 @@ static int spi_nor_init(struct spi_nor *nor) > } > > if ((nor->addr_width == 4) && > - (JEDEC_MFR(nor->info) != SNOR_MFR_SPANSION) && > !(nor->info->flags & SPI_NOR_4B_OPCODES)) { > /* > * If the RESET# pin isn't hooked up properly, or the system > @@ -3592,7 +3591,6 @@ void spi_nor_restore(struct spi_nor *nor) > { > /* restore the addressing mode */ > if ((nor->addr_width == 4) && > - (JEDEC_MFR(nor->info) != SNOR_MFR_SPANSION) && > !(nor->info->flags & SPI_NOR_4B_OPCODES) && > (nor->flags & SNOR_F_BROKEN_RESET)) > set_4byte(nor, nor->info, 0); > @@ -3749,8 +3747,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, > } else if (mtd->size > 0x1000000) { > /* enable 4-byte addressing if the device exceeds 16MiB */ > nor->addr_width = 4; > - if (JEDEC_MFR(info) == SNOR_MFR_SPANSION || > - info->flags & SPI_NOR_4B_OPCODES) > + if (info->flags & SPI_NOR_4B_OPCODES) > spi_nor_set_4byte_opcodes(nor, info); > } else { > nor->addr_width = 3; >