Re: [PATCH v2 04/35] mtd: spi-nor: macronix: Handle ID collision b/w MX25L12805D and MX25L12835F

Michael Walle
2021-08-23T22:45:08Z

Am 2021-07-27 06:51, schrieb Tudor Ambarus:
> MX25L12835F define SFDP, while MX25L12805D does not.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> Testd-by: Heiko Thiery <heiko.thiery@gmail.com>
> Acked-by: Pratyush Yadav <p.yadav@ti.com>

Same remarks as patch #3.

-michael

> # cat
> /sys/devices/platform/soc@0/30800000.bus/30bb0000.spi/spi_master/spi0/spi0
> .0/spi-nor/sfdp | xxd -p
> 53464450000101ff00000109300000ffc2000104600000ffffffffffffff
> ffffffffffffffffffffffffffffffffffffe520f1ffffffff0744eb086b
> 083b04bbfeffffffffff00ffffff44eb0c200f5210d800ffffffffffffff
> ffffffffffff003600279df9c06485cbffffffffffff
>
> drivers/mtd/spi-nor/macronix.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/macronix.c
> b/drivers/mtd/spi-nor/macronix.c
> index 68f6ac060bc6..fba85efafb47 100644
> --- a/drivers/mtd/spi-nor/macronix.c
> +++ b/drivers/mtd/spi-nor/macronix.c
> @@ -8,6 +8,24 @@
>
> #include "core.h"
>
> +static int mx25l12835f_post_bfpt_fixups(struct spi_nor *nor,
> + const struct sfdp_parameter_header *bfpt_header,
> + const struct sfdp_bfpt *bfpt)
> +{
> + /*
> + * Macronix has a bad habit of reusing flash IDs: MX25L12835F
> collides
> + * with MX25L12805D. MX25L12835F defines SFDP tables, while the older
> + * variant does not.
> + */
> + nor->name = "mx25l12835f";
> +
> + return 0;
> +}
> +
> +static struct spi_nor_fixups mx25l12835f_fixups = {
> + .post_bfpt = mx25l12835f_post_bfpt_fixups,
> +};
> +
> static int mx25l3233f_post_bfpt_fixups(struct spi_nor *nor,
> const struct sfdp_parameter_header *bfpt_header,
> const struct sfdp_bfpt *bfpt)
> @@ -70,8 +88,10 @@ static const struct flash_info macronix_parts[] = {
> { "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) },
> { "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) },
> { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
> - { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K |
> - SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP) },
> + { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SPI_NOR_PARSE_SFDP
> |
> + SECT_4K | SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP)
> + /* ID collision with mx25l12835f. */
> + .fixups = &mx25l12835f_fixups },
> { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
> { "mx25r1635f", INFO(0xc22815, 0, 64 * 1024, 32,
> SECT_4K | SPI_NOR_DUAL_READ |