| Index: linux-5.4.260/drivers/mtd/nand/spi/core.c |
| =================================================================== |
| --- linux-5.4.260.orig/drivers/mtd/nand/spi/core.c |
| +++ linux-5.4.260/drivers/mtd/nand/spi/core.c |
| @@ -16,6 +16,7 @@ |
| #include <linux/mtd/spinand.h> |
| #include <linux/of.h> |
| #include <linux/slab.h> |
| +#include <linux/string.h> |
| #include <linux/spi/spi.h> |
| #include <linux/spi/spi-mem.h> |
| |
| @@ -370,10 +371,11 @@ out: |
| return status & STATUS_BUSY ? -ETIMEDOUT : 0; |
| } |
| |
| -static int spinand_read_id_op(struct spinand_device *spinand, u8 *buf) |
| +static int spinand_read_id_op(struct spinand_device *spinand, u8 naddr, |
| + u8 ndummy, u8 *buf) |
| { |
| - struct spi_mem_op op = SPINAND_READID_OP(0, spinand->scratchbuf, |
| - SPINAND_MAX_ID_LEN); |
| + struct spi_mem_op op = SPINAND_READID_OP( |
| + naddr, ndummy, spinand->scratchbuf, SPINAND_MAX_ID_LEN); |
| int ret; |
| |
| ret = spi_mem_exec_op(spinand->spimem, &op); |
| @@ -760,24 +762,62 @@ static const struct spinand_manufacturer |
| &winbond_spinand_manufacturer, |
| }; |
| |
| -static int spinand_manufacturer_detect(struct spinand_device *spinand) |
| +static int spinand_manufacturer_match(struct spinand_device *spinand, |
| + enum spinand_readid_method rdid_method) |
| { |
| + u8 *id = spinand->id.data; |
| unsigned int i; |
| int ret; |
| |
| for (i = 0; i < ARRAY_SIZE(spinand_manufacturers); i++) { |
| - ret = spinand_manufacturers[i]->ops->detect(spinand); |
| - if (ret > 0) { |
| - spinand->manufacturer = spinand_manufacturers[i]; |
| - return 0; |
| - } else if (ret < 0) { |
| - return ret; |
| - } |
| - } |
| + const struct spinand_manufacturer *manufacturer = |
| + spinand_manufacturers[i]; |
| + |
| + if (id[0] != manufacturer->id) |
| + continue; |
| |
| + ret = spinand_match_and_init(spinand, |
| + manufacturer->chips, |
| + manufacturer->nchips, |
| + rdid_method); |
| + if (ret < 0) |
| + continue; |
| + |
| + spinand->manufacturer = manufacturer; |
| + return 0; |
| + } |
| return -ENOTSUPP; |
| } |
| |
| +static int spinand_id_detect(struct spinand_device *spinand) |
| +{ |
| + u8 *id = spinand->id.data; |
| + int ret; |
| + |
| + ret = spinand_read_id_op(spinand, 0, 0, id); |
| + if (ret) |
| + return ret; |
| + ret = spinand_manufacturer_match(spinand, SPINAND_READID_METHOD_OPCODE); |
| + if (!ret) |
| + return 0; |
| + |
| + ret = spinand_read_id_op(spinand, 1, 0, id); |
| + if (ret) |
| + return ret; |
| + ret = spinand_manufacturer_match(spinand, |
| + SPINAND_READID_METHOD_OPCODE_ADDR); |
| + if (!ret) |
| + return 0; |
| + |
| + ret = spinand_read_id_op(spinand, 0, 1, id); |
| + if (ret) |
| + return ret; |
| + ret = spinand_manufacturer_match(spinand, |
| + SPINAND_READID_METHOD_OPCODE_DUMMY); |
| + |
| + return ret; |
| +} |
| + |
| static int spinand_manufacturer_init(struct spinand_device *spinand) |
| { |
| if (spinand->manufacturer->ops->init) |
| @@ -833,9 +873,9 @@ spinand_select_op_variant(struct spinand |
| * @spinand: SPI NAND object |
| * @table: SPI NAND device description table |
| * @table_size: size of the device description table |
| + * @rdid_method: read id method to match |
| * |
| - * Should be used by SPI NAND manufacturer drivers when they want to find a |
| - * match between a device ID retrieved through the READ_ID command and an |
| + * Match between a device ID retrieved through the READ_ID command and an |
| * entry in the SPI NAND description table. If a match is found, the spinand |
| * object will be initialized with information provided by the matching |
| * spinand_info entry. |
| @@ -844,8 +884,10 @@ spinand_select_op_variant(struct spinand |
| */ |
| int spinand_match_and_init(struct spinand_device *spinand, |
| const struct spinand_info *table, |
| - unsigned int table_size, u16 devid) |
| + unsigned int table_size, |
| + enum spinand_readid_method rdid_method) |
| { |
| + u8 *id = spinand->id.data; |
| struct nand_device *nand = spinand_to_nand(spinand); |
| unsigned int i; |
| |
| @@ -853,13 +895,17 @@ int spinand_match_and_init(struct spinan |
| const struct spinand_info *info = &table[i]; |
| const struct spi_mem_op *op; |
| |
| - if (devid != info->devid) |
| + if (rdid_method != info->devid.method) |
| + continue; |
| + |
| + if (memcmp(id + 1, info->devid.id, info->devid.len)) |
| continue; |
| |
| nand->memorg = table[i].memorg; |
| nand->eccreq = table[i].eccreq; |
| spinand->eccinfo = table[i].eccinfo; |
| spinand->flags = table[i].flags; |
| + spinand->id.len = 1 + table[i].devid.len; |
| spinand->select_target = table[i].select_target; |
| |
| op = spinand_select_op_variant(spinand, |
| @@ -896,13 +942,7 @@ static int spinand_detect(struct spinand |
| if (ret) |
| return ret; |
| |
| - ret = spinand_read_id_op(spinand, spinand->id.data); |
| - if (ret) |
| - return ret; |
| - |
| - spinand->id.len = SPINAND_MAX_ID_LEN; |
| - |
| - ret = spinand_manufacturer_detect(spinand); |
| + ret = spinand_id_detect(spinand); |
| if (ret) { |
| dev_err(dev, "unknown raw ID %*phN\n", SPINAND_MAX_ID_LEN, |
| spinand->id.data); |
| Index: linux-5.4.260/include/linux/mtd/spinand.h |
| =================================================================== |
| --- linux-5.4.260.orig/include/linux/mtd/spinand.h |
| +++ linux-5.4.260/include/linux/mtd/spinand.h |
| @@ -32,9 +32,9 @@ |
| SPI_MEM_OP_NO_DUMMY, \ |
| SPI_MEM_OP_NO_DATA) |
| |
| -#define SPINAND_READID_OP(ndummy, buf, len) \ |
| +#define SPINAND_READID_OP(naddr, ndummy, buf, len) \ |
| SPI_MEM_OP(SPI_MEM_OP_CMD(0x9f, 1), \ |
| - SPI_MEM_OP_NO_ADDR, \ |
| + SPI_MEM_OP_ADDR(naddr, 0, 1), \ |
| SPI_MEM_OP_DUMMY(ndummy, 1), \ |
| SPI_MEM_OP_DATA_IN(len, buf, 1)) |
| |
| @@ -176,37 +176,46 @@ struct spinand_device; |
| * @data: buffer containing the id bytes. Currently 4 bytes large, but can |
| * be extended if required |
| * @len: ID length |
| - * |
| - * struct_spinand_id->data contains all bytes returned after a READ_ID command, |
| - * including dummy bytes if the chip does not emit ID bytes right after the |
| - * READ_ID command. The responsibility to extract real ID bytes is left to |
| - * struct_manufacurer_ops->detect(). |
| */ |
| struct spinand_id { |
| u8 data[SPINAND_MAX_ID_LEN]; |
| int len; |
| }; |
| |
| +enum spinand_readid_method { |
| + SPINAND_READID_METHOD_OPCODE, |
| + SPINAND_READID_METHOD_OPCODE_ADDR, |
| + SPINAND_READID_METHOD_OPCODE_DUMMY, |
| +}; |
| + |
| +/** |
| + * struct spinand_devid - SPI NAND device id structure |
| + * @id: device id of current chip |
| + * @len: number of bytes in device id |
| + * @method: method to read chip id |
| + * There are 3 possible variants: |
| + * SPINAND_READID_METHOD_OPCODE: chip id is returned immediately |
| + * after read_id opcode. |
| + * SPINAND_READID_METHOD_OPCODE_ADDR: chip id is returned after |
| + * read_id opcode + 1-byte address. |
| + * SPINAND_READID_METHOD_OPCODE_DUMMY: chip id is returned after |
| + * read_id opcode + 1 dummy byte. |
| + */ |
| +struct spinand_devid { |
| + const u8 *id; |
| + const u8 len; |
| + const enum spinand_readid_method method; |
| +}; |
| + |
| /** |
| * struct manufacurer_ops - SPI NAND manufacturer specific operations |
| - * @detect: detect a SPI NAND device. Every time a SPI NAND device is probed |
| - * the core calls the struct_manufacurer_ops->detect() hook of each |
| - * registered manufacturer until one of them return 1. Note that |
| - * the first thing to check in this hook is that the manufacturer ID |
| - * in struct_spinand_device->id matches the manufacturer whose |
| - * ->detect() hook has been called. Should return 1 if there's a |
| - * match, 0 if the manufacturer ID does not match and a negative |
| - * error code otherwise. When true is returned, the core assumes |
| - * that properties of the NAND chip (spinand->base.memorg and |
| - * spinand->base.eccreq) have been filled |
| * @init: initialize a SPI NAND device |
| * @cleanup: cleanup a SPI NAND device |
| * |
| * Each SPI NAND manufacturer driver should implement this interface so that |
| - * NAND chips coming from this vendor can be detected and initialized properly. |
| + * NAND chips coming from this vendor can be initialized properly. |
| */ |
| struct spinand_manufacturer_ops { |
| - int (*detect)(struct spinand_device *spinand); |
| int (*init)(struct spinand_device *spinand); |
| void (*cleanup)(struct spinand_device *spinand); |
| }; |
| @@ -215,11 +224,16 @@ struct spinand_manufacturer_ops { |
| * struct spinand_manufacturer - SPI NAND manufacturer instance |
| * @id: manufacturer ID |
| * @name: manufacturer name |
| + * @devid_len: number of bytes in device ID |
| + * @chips: supported SPI NANDs under current manufacturer |
| + * @nchips: number of SPI NANDs available in chips array |
| * @ops: manufacturer operations |
| */ |
| struct spinand_manufacturer { |
| u8 id; |
| char *name; |
| + const struct spinand_info *chips; |
| + const size_t nchips; |
| const struct spinand_manufacturer_ops *ops; |
| }; |
| |
| @@ -270,6 +284,7 @@ struct spinand_ecc_info { |
| }; |
| |
| #define SPINAND_HAS_QE_BIT BIT(0) |
| +#define SPINAND_HAS_CR_FEAT_BIT BIT(1) |
| |
| /** |
| * struct spinand_info - Structure used to describe SPI NAND chips |
| @@ -291,7 +306,7 @@ struct spinand_ecc_info { |
| */ |
| struct spinand_info { |
| const char *model; |
| - u16 devid; |
| + struct spinand_devid devid; |
| u32 flags; |
| struct nand_memory_organization memorg; |
| struct nand_ecc_req eccreq; |
| @@ -305,6 +320,13 @@ struct spinand_info { |
| unsigned int target); |
| }; |
| |
| +#define SPINAND_ID(__method, ...) \ |
| + { \ |
| + .id = (const u8[]){ __VA_ARGS__ }, \ |
| + .len = sizeof((u8[]){ __VA_ARGS__ }), \ |
| + .method = __method, \ |
| + } |
| + |
| #define SPINAND_INFO_OP_VARIANTS(__read, __write, __update) \ |
| { \ |
| .read_cache = __read, \ |
| @@ -451,9 +473,10 @@ static inline void spinand_set_of_node(s |
| nanddev_set_of_node(&spinand->base, np); |
| } |
| |
| -int spinand_match_and_init(struct spinand_device *dev, |
| +int spinand_match_and_init(struct spinand_device *spinand, |
| const struct spinand_info *table, |
| - unsigned int table_size, u16 devid); |
| + unsigned int table_size, |
| + enum spinand_readid_method rdid_method); |
| |
| int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val); |
| int spinand_select_target(struct spinand_device *spinand, unsigned int target); |
| Index: linux-5.4.260/drivers/mtd/nand/spi/winbond.c |
| =================================================================== |
| --- linux-5.4.260.orig/drivers/mtd/nand/spi/winbond.c |
| +++ linux-5.4.260/drivers/mtd/nand/spi/winbond.c |
| @@ -75,7 +75,8 @@ static int w25m02gv_select_target(struct |
| } |
| |
| static const struct spinand_info winbond_spinand_table[] = { |
| - SPINAND_INFO("W25M02GV", 0xAB, |
| + SPINAND_INFO("W25M02GV", |
| + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab), |
| NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2), |
| NAND_ECCREQ(1, 512), |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| @@ -84,7 +85,8 @@ static const struct spinand_info winbond |
| 0, |
| SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL), |
| SPINAND_SELECT_TARGET(w25m02gv_select_target)), |
| - SPINAND_INFO("W25N01GV", 0xAA, |
| + SPINAND_INFO("W25N01GV", |
| + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa), |
| NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), |
| NAND_ECCREQ(1, 512), |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| @@ -94,31 +96,6 @@ static const struct spinand_info winbond |
| SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)), |
| }; |
| |
| -/** |
| - * winbond_spinand_detect - initialize device related part in spinand_device |
| - * struct if it is a Winbond device. |
| - * @spinand: SPI NAND device structure |
| - */ |
| -static int winbond_spinand_detect(struct spinand_device *spinand) |
| -{ |
| - u8 *id = spinand->id.data; |
| - int ret; |
| - |
| - /* |
| - * Winbond SPI NAND read ID need a dummy byte, |
| - * so the first byte in raw_id is dummy. |
| - */ |
| - if (id[1] != SPINAND_MFR_WINBOND) |
| - return 0; |
| - |
| - ret = spinand_match_and_init(spinand, winbond_spinand_table, |
| - ARRAY_SIZE(winbond_spinand_table), id[2]); |
| - if (ret) |
| - return ret; |
| - |
| - return 1; |
| -} |
| - |
| static int winbond_spinand_init(struct spinand_device *spinand) |
| { |
| struct nand_device *nand = spinand_to_nand(spinand); |
| @@ -138,12 +115,13 @@ static int winbond_spinand_init(struct s |
| } |
| |
| static const struct spinand_manufacturer_ops winbond_spinand_manuf_ops = { |
| - .detect = winbond_spinand_detect, |
| .init = winbond_spinand_init, |
| }; |
| |
| const struct spinand_manufacturer winbond_spinand_manufacturer = { |
| .id = SPINAND_MFR_WINBOND, |
| .name = "Winbond", |
| + .chips = winbond_spinand_table, |
| + .nchips = ARRAY_SIZE(winbond_spinand_table), |
| .ops = &winbond_spinand_manuf_ops, |
| }; |