Commit c861286b authored by Daniel DeGrasse's avatar Daniel DeGrasse Committed by Dan Kalowsky
Browse files

drivers: flash: flash_mcux_flexspi_nor: check all 3 bytes of JEDEC ID 

The FlexSPI NOR driver should verify all 3 bytes of the JEDEC ID match
the expected value before attempting to use a custom LUT table with a
flash chip. This reduces the odds that an incompatible LUT will be used
with a flash chip, as some flash chips may share the same first byte of
their device ID but not be compatible with the custom LUT table.

Signed-off-by: default avatarDaniel DeGrasse <daniel.degrasse@nxp.com>
(cherry picked from commit c12030ac)
parent 3f4037b9

drivers/flash/flash_mcux_flexspi_nor.c

+12 −22
Changes for drivers/flash/flash_mcux_flexspi_nor.c: 12 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -944,8 +944,10 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data, 
	}



	/* Switch on manufacturer and vendor ID */

	switch (vendor_id & 0xFFFF) {

	case 0x609d: /* IS25LP flash, needs P[4:3] cleared with same method as IS25WP */

	switch (vendor_id & 0xFFFFFF) {

	case 0x16609d: /* IS25LP032 flash, needs P[4:3] cleared with same method as IS25WP */

	case 0x17609d: /* IS25LP064 */

	case 0x18609d: /* IS25LP128 */

		read_params = 0xE0U;

		ret = flash_flexspi_nor_is25_clear_read_param(data, flexspi_lut, &read_params);

		if (ret < 0) {
@@ -959,7 +961,9 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data, 
		}

		/* Still return an error- we want the JEDEC configuration to run */

		return -ENOTSUP;

	case 0x709d:

	case 0x16709d: /* IS25WP032 */

	case 0x17709d: /* IS25WP064 */

	case 0x18709d: /* IS25WP128 */

		/*

		 * IS25WP flash. We can support this flash with the JEDEC probe,

		 * but we need to insure P[6:3] are at the default value
@@ -977,15 +981,8 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data, 
		}

		/* Still return an error- we want the JEDEC configuration to run */

		return -ENOTSUP;

	case 0x40ef:

		if ((vendor_id & 0xFFFFFF) != 0x2040ef) {

			/*

			 * This is not the correct flash chip, and will not

			 * support the LUT table. Return here

			 */

			return -ENOTSUP;

		}

		/* W25Q512JV flash, use 4 byte read/write */

	case 0x2040ef:

		/* W25Q512JV-IQ/IN flash, use 4 byte read/write */

		flexspi_lut[READ][0] = FLEXSPI_LUT_SEQ(

				kFLEXSPI_Command_SDR, kFLEXSPI_1PAD, SPI_NOR_CMD_4READ_4B,

				kFLEXSPI_Command_RADDR_SDR, kFLEXSPI_4PAD, 32);
@@ -1015,14 +1012,7 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data, 
		/* Device uses bit 1 of status reg 2 for QE */

		return flash_flexspi_nor_quad_enable(data, flexspi_lut,

						     JESD216_DW15_QER_VAL_S2B1v5);

	case 0x60ef:

		if ((vendor_id & 0xFFFFFF) != 0x2060ef) {

			/*

			 * This is not the correct flash chip, and will not

			 * support the LUT table. Return here

			 */

			return -ENOTSUP;

		}

	case 0x2060ef:

		/* W25Q512NW-IQ/IN flash, use 4 byte read/write */

		flexspi_lut[READ][0] = FLEXSPI_LUT_SEQ(

				kFLEXSPI_Command_SDR, kFLEXSPI_1PAD, SPI_NOR_CMD_4READ_4B,
@@ -1053,8 +1043,8 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data, 
		/* Device uses bit 1 of status reg 2 for QE */

		return flash_flexspi_nor_quad_enable(data, flexspi_lut,

						     JESD216_DW15_QER_VAL_S2B1v5);

	case 0x25C2:

		/* MX25 flash, use 4 byte read/write */

	case 0x3A25C2:

		/* MX25U51245G flash, use 4 byte read/write */

		flexspi_lut[READ][0] = FLEXSPI_LUT_SEQ(

				kFLEXSPI_Command_SDR, kFLEXSPI_1PAD, SPI_NOR_CMD_4READ_4B,

				kFLEXSPI_Command_RADDR_SDR, kFLEXSPI_4PAD, 32);

CRA Git | Maintained and supported by SUSTech CRA and CCSE