mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-12 01:44:54 +00:00
1b310cff0f
Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Remove upstreamed: - 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch - 001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -1032,6 +1032,7 @@ static const struct flash_info spi_nor_i
|
|
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
|
|
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
|
|
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
+ { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
|
|
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
|
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
|
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
|
|
@@ -1205,11 +1206,12 @@ static const struct flash_info spi_nor_i
|
|
{ },
|
|
};
|
|
|
|
-static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
|
|
+static const struct flash_info *spi_nor_read_id(struct spi_nor *nor,
|
|
+ const char *name)
|
|
{
|
|
int tmp;
|
|
u8 id[SPI_NOR_MAX_ID_LEN];
|
|
- const struct flash_info *info;
|
|
+ const struct flash_info *info, *first_match = NULL;
|
|
|
|
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
|
|
if (tmp < 0) {
|
|
@@ -1220,10 +1222,16 @@ static const struct flash_info *spi_nor_
|
|
for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
|
|
info = &spi_nor_ids[tmp];
|
|
if (info->id_len) {
|
|
- if (!memcmp(info->id, id, info->id_len))
|
|
- return &spi_nor_ids[tmp];
|
|
+ if (!memcmp(info->id, id, info->id_len)) {
|
|
+ if (!name || !strcmp(name, info->name))
|
|
+ return info;
|
|
+ if (!first_match)
|
|
+ first_match = info;
|
|
+ }
|
|
}
|
|
}
|
|
+ if (first_match)
|
|
+ return first_match;
|
|
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
|
id[0], id[1], id[2]);
|
|
return ERR_PTR(-ENODEV);
|
|
@@ -2683,7 +2691,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
info = spi_nor_match_id(name);
|
|
/* Try to auto-detect if chip name wasn't specified or not found */
|
|
if (!info)
|
|
- info = spi_nor_read_id(nor);
|
|
+ info = spi_nor_read_id(nor, NULL);
|
|
if (IS_ERR_OR_NULL(info))
|
|
return -ENOENT;
|
|
|
|
@@ -2694,7 +2702,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
if (name && info->id_len) {
|
|
const struct flash_info *jinfo;
|
|
|
|
- jinfo = spi_nor_read_id(nor);
|
|
+ jinfo = spi_nor_read_id(nor, name);
|
|
if (IS_ERR(jinfo)) {
|
|
return PTR_ERR(jinfo);
|
|
} else if (jinfo != info) {
|