[PATCH v3 1/2] mtd: spi-nor: add support to non-uniform SFDP SPI NOR flash memories
From: Boris Brezillon <hidden>
Date: 2018-10-22 08:02:06
Also in:
lkml
On Mon, 22 Oct 2018 06:04:13 +0000 Yogesh Narayan Gaur [off-list ref] wrote:
-static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt)
+static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt, u32 smpt_len)
{
const u32 *ret = NULL;
- u32 i, addr;
+ u32 i, addr, nmaps;
int err;
u8 addr_width, read_opcode, read_dummy;
u8 read_data_mask, data_byte, map_id;
+ bool map_id_is_valid = false;
addr_width = nor->addr_width;
read_dummy = nor->read_dummy;
read_opcode = nor->read_opcode;
+ for (i = 0; i<smpt_len; i++)
+ pr_info("%s:%i smpt[%d]=%08x\n", __func__, __LINE__, i, smpt[i]);
+
map_id = 0;
- i = 0;
/* Determine if there are any optional Detection Command Descriptors */
- while (!(smpt[i] & SMPT_DESC_TYPE_MAP)) {
+ for (i = 0; i< smpt_len; i++) {
+ if (!(smpt[i] & SMPT_DESC_TYPE_MAP))
+ break;
+
read_data_mask = SMPT_CMD_READ_DATA(smpt[i]);
nor->addr_width = spi_nor_smpt_addr_width(nor, smpt[i]);
nor->read_dummy = spi_nor_smpt_read_dummy(nor, smpt[i]);Could you also print the ->addr_width, ->read_dummy and ->read_opcode here?
quoted hunk ↗ jump to hunk
@@ -2894,18 +2900,35 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt) * Configuration that is currently in use. */ map_id = map_id << 1 | !!(data_byte & read_data_mask); + map_id_is_valid = true; i = i + 2; }