diff mbox

[U-Boot,v6,10/21] sf: Remove legacy idcode detection code

Message ID 1479268992-26811-11-git-send-email-jagan@openedev.com
State Superseded
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Jagan Teki Nov. 16, 2016, 4:03 a.m. UTC 
From: Jagan Teki <jagan@amarulasolutions.com>

Since flash detection code is more mature to
detect even with 6 bytes id length devices
removed old code and related references.

Cc: Yunhui Cui <yunhui.cui@nxp.com>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Jagan Teki <jagan@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Tested-by: Jagan Teki <jagan@openedev.com>
---
 drivers/mtd/spi/sf_internal.h |  6 ----
 drivers/mtd/spi/spi_flash.c   | 79 -------------------------------------------
 2 files changed, 85 deletions(-)

Comments

Siva Durga Prasad Paladugu Nov. 16, 2016, 6:40 a.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Jagan Teki [mailto:jagan@openedev.com]
> Sent: Wednesday, November 16, 2016 9:33 AM
> To: u-boot@lists.denx.de
> Cc: Jagan Teki <jagan@amarulasolutions.com>; Yunhui Cui
> <yunhui.cui@nxp.com>; Bin Meng <bmeng.cn@gmail.com>; York Sun
> <york.sun@nxp.com>; Vignesh R <vigneshr@ti.com>; Mugunthan V N
> <mugunthanvnm@ti.com>; Michal Simek <michal.simek@xilinx.com>;
> Michael Trimarchi <michael@amarulasolutions.com>; Siva Durga Prasad
> Paladugu <sivadur@xilinx.com>; Jagan Teki <jagan@openedev.com>
> Subject: [PATCH v6 10/21] sf: Remove legacy idcode detection code
> 
> From: Jagan Teki <jagan@amarulasolutions.com>
> 
> Since flash detection code is more mature to detect even with 6 bytes id
> length devices removed old code and related references.

As I said earlier in 9/21, this patch may break S25FS512S until we add SECT_4K to its flags.
Please take care of this.

Thanks,
Siva
> 
> Cc: Yunhui Cui <yunhui.cui@nxp.com>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: York Sun <york.sun@nxp.com>
> Cc: Vignesh R <vigneshr@ti.com>
> Cc: Mugunthan V N <mugunthanvnm@ti.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Michael Trimarchi <michael@amarulasolutions.com>
> Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
> Signed-off-by: Jagan Teki <jagan@openedev.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Jagan Teki <jagan@openedev.com>
> Tested-by: Jagan Teki <jagan@openedev.com>
> ---
>  drivers/mtd/spi/sf_internal.h |  6 ----
>  drivers/mtd/spi/spi_flash.c   | 79 -------------------------------------------
>  2 files changed, 85 deletions(-)
> 
> diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
> index cbed6e8..6a39cdd 100644
> --- a/drivers/mtd/spi/sf_internal.h
> +++ b/drivers/mtd/spi/sf_internal.h
> @@ -98,12 +98,6 @@ int sst_write_bp(struct spi_flash *flash, u32 offset,
> size_t len,
>  		const void *buf);
>  #endif
> 
> -#ifdef CONFIG_SPI_FLASH_SPANSION
> -/* Used for Spansion S25FS-S family flash only. */
> -#define CMD_SPANSION_RDAR	0x65 /* Read any device register */
> -#define CMD_SPANSION_WRAR	0x71 /* Write any device register */
> -#endif
> -
>  #define JEDEC_MFR(info)		((info)->id[0])
>  #define JEDEC_ID(info)		(((info)->id[1]) << 8 | ((info)->id[2]))
>  #define JEDEC_EXT(info)		(((info)->id[3]) << 8 | ((info)->id[4]))
> diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index
> 9430424..b126a21 100644
> --- a/drivers/mtd/spi/spi_flash.c
> +++ b/drivers/mtd/spi/spi_flash.c
> @@ -999,43 +999,6 @@ int spi_flash_decode_fdt(const void *blob, struct
> spi_flash *flash)  }  #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */
> 
> -#ifdef CONFIG_SPI_FLASH_SPANSION
> -static int spansion_s25fss_disable_4KB_erase(struct spi_slave *spi) -{
> -	u8 cmd[4];
> -	u32 offset = 0x800004; /* CR3V register offset */
> -	u8 cr3v;
> -	int ret;
> -
> -	cmd[0] = CMD_SPANSION_RDAR;
> -	cmd[1] = offset >> 16;
> -	cmd[2] = offset >> 8;
> -	cmd[3] = offset >> 0;
> -
> -	ret = spi_flash_cmd_read(spi, cmd, 4, &cr3v, 1);
> -	if (ret)
> -		return -EIO;
> -	/* CR3V bit3: 4-KB Erase */
> -	if (cr3v & 0x8)
> -		return 0;
> -
> -	cmd[0] = CMD_SPANSION_WRAR;
> -	cr3v |= 0x8;
> -	ret = spi_flash_cmd_write(spi, cmd, 4, &cr3v, 1);
> -	if (ret)
> -		return -EIO;
> -
> -	cmd[0] = CMD_SPANSION_RDAR;
> -	ret = spi_flash_cmd_read(spi, cmd, 4, &cr3v, 1);
> -	if (ret)
> -		return -EIO;
> -	if (!(cr3v & 0x8))
> -		return -EFAULT;
> -
> -	return 0;
> -}
> -#endif
> -
>  int spi_flash_scan(struct spi_flash *flash)  {
>  	struct spi_slave *spi = flash->spi;
> @@ -1046,48 +1009,6 @@ int spi_flash_scan(struct spi_flash *flash)
>  	if (IS_ERR_OR_NULL(info))
>  		return -ENOENT;
> 
> -#ifdef CONFIG_SPI_FLASH_SPANSION
> -	/*
> -	 * The S25FS-S family physical sectors may be configured as a
> -	 * hybrid combination of eight 4-kB parameter sectors
> -	 * at the top or bottom of the address space with all
> -	 * but one of the remaining sectors being uniform size.
> -	 * The Parameter Sector Erase commands (20h or 21h) must
> -	 * be used to erase the 4-kB parameter sectors individually.
> -	 * The Sector (uniform sector) Erase commands (D8h or DCh)
> -	 * must be used to erase any of the remaining
> -	 * sectors, including the portion of highest or lowest address
> -	 * sector that is not overlaid by the parameter sectors.
> -	 * The uniform sector erase command has no effect on parameter
> sectors.
> -	 */
> -	if ((JEDEC_ID(info) == 0x0219 || (JEDEC_ID(info) == 0x0220)) &&
> -	    (JEDEC_EXT(info) & 0xff00) == 0x4d00) {
> -		int ret;
> -		u8 idcode[5];
> -		u8 id[6];
> -
> -		/* Read the ID codes again, 5 bytes */
> -		ret = spi_flash_cmd(flash->spi, CMD_READ_ID, idcode,
> sizeof(idcode));
> -		if (ret)
> -			return -EIO;
> -
> -		/* Read the ID codes again, 6 bytes */
> -		ret = spi_flash_cmd(flash->spi, CMD_READ_ID, id, sizeof(id));
> -		if (ret)
> -			return -EIO;
> -
> -		ret = memcmp(id, idcode, 5);
> -		if (ret)
> -			return -EIO;
> -
> -		/* 0x81: S25FS-S family 0x80: S25FL-S family */
> -		if (id[5] == 0x81) {
> -			ret = spansion_s25fss_disable_4KB_erase(spi);
> -			if (ret)
> -				return ret;
> -		}
> -	}
> -#endif
>  	/* Flash powers up read-only, so clear BP# bits */
>  	if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ATMEL ||
>  	    JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_MACRONIX ||
> --
> 1.9.1
diff mbox

Patch

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index cbed6e8..6a39cdd 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -98,12 +98,6 @@  int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len,
 		const void *buf);
 #endif
 
-#ifdef CONFIG_SPI_FLASH_SPANSION
-/* Used for Spansion S25FS-S family flash only. */
-#define CMD_SPANSION_RDAR	0x65 /* Read any device register */
-#define CMD_SPANSION_WRAR	0x71 /* Write any device register */
-#endif
-
 #define JEDEC_MFR(info)		((info)->id[0])
 #define JEDEC_ID(info)		(((info)->id[1]) << 8 | ((info)->id[2]))
 #define JEDEC_EXT(info)		(((info)->id[3]) << 8 | ((info)->id[4]))
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 9430424..b126a21 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -999,43 +999,6 @@  int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)
 }
 #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */
 
-#ifdef CONFIG_SPI_FLASH_SPANSION
-static int spansion_s25fss_disable_4KB_erase(struct spi_slave *spi)
-{
-	u8 cmd[4];
-	u32 offset = 0x800004; /* CR3V register offset */
-	u8 cr3v;
-	int ret;
-
-	cmd[0] = CMD_SPANSION_RDAR;
-	cmd[1] = offset >> 16;
-	cmd[2] = offset >> 8;
-	cmd[3] = offset >> 0;
-
-	ret = spi_flash_cmd_read(spi, cmd, 4, &cr3v, 1);
-	if (ret)
-		return -EIO;
-	/* CR3V bit3: 4-KB Erase */
-	if (cr3v & 0x8)
-		return 0;
-
-	cmd[0] = CMD_SPANSION_WRAR;
-	cr3v |= 0x8;
-	ret = spi_flash_cmd_write(spi, cmd, 4, &cr3v, 1);
-	if (ret)
-		return -EIO;
-
-	cmd[0] = CMD_SPANSION_RDAR;
-	ret = spi_flash_cmd_read(spi, cmd, 4, &cr3v, 1);
-	if (ret)
-		return -EIO;
-	if (!(cr3v & 0x8))
-		return -EFAULT;
-
-	return 0;
-}
-#endif
-
 int spi_flash_scan(struct spi_flash *flash)
 {
 	struct spi_slave *spi = flash->spi;
@@ -1046,48 +1009,6 @@  int spi_flash_scan(struct spi_flash *flash)
 	if (IS_ERR_OR_NULL(info))
 		return -ENOENT;
 
-#ifdef CONFIG_SPI_FLASH_SPANSION
-	/*
-	 * The S25FS-S family physical sectors may be configured as a
-	 * hybrid combination of eight 4-kB parameter sectors
-	 * at the top or bottom of the address space with all
-	 * but one of the remaining sectors being uniform size.
-	 * The Parameter Sector Erase commands (20h or 21h) must
-	 * be used to erase the 4-kB parameter sectors individually.
-	 * The Sector (uniform sector) Erase commands (D8h or DCh)
-	 * must be used to erase any of the remaining
-	 * sectors, including the portion of highest or lowest address
-	 * sector that is not overlaid by the parameter sectors.
-	 * The uniform sector erase command has no effect on parameter sectors.
-	 */
-	if ((JEDEC_ID(info) == 0x0219 || (JEDEC_ID(info) == 0x0220)) &&
-	    (JEDEC_EXT(info) & 0xff00) == 0x4d00) {
-		int ret;
-		u8 idcode[5];
-		u8 id[6];
-
-		/* Read the ID codes again, 5 bytes */
-		ret = spi_flash_cmd(flash->spi, CMD_READ_ID, idcode, sizeof(idcode));
-		if (ret)
-			return -EIO;
-
-		/* Read the ID codes again, 6 bytes */
-		ret = spi_flash_cmd(flash->spi, CMD_READ_ID, id, sizeof(id));
-		if (ret)
-			return -EIO;
-
-		ret = memcmp(id, idcode, 5);
-		if (ret)
-			return -EIO;
-
-		/* 0x81: S25FS-S family 0x80: S25FL-S family */
-		if (id[5] == 0x81) {
-			ret = spansion_s25fss_disable_4KB_erase(spi);
-			if (ret)
-				return ret;
-		}
-	}
-#endif
 	/* Flash powers up read-only, so clear BP# bits */
 	if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ATMEL ||
 	    JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_MACRONIX ||