diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-08-12 06:36:50 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-08-13 01:55:01 +0300 |
| commit | ee41b2b489259f01585e49327377f62b76a24748 (patch) | |
| tree | 8ee5630e249b63287224557a71a9b019498f8f9a /drivers | |
| parent | b7792cea379803d70c063e8c04f3f8446c66445e (diff) | |
| download | linux-ee41b2b489259f01585e49327377f62b76a24748.tar.xz | |
mtd: spi-nor: sfdp: Revert "default to addr_width of 3 for configurable widths"
This reverts commit f9acd7fa80be6ee14aecdc54429f2a48e56224e8 which
breaks mounting of UBI volumes with the aspeed-smc driver:
ubi0: default fastmap pool size: 25
ubi0: default fastmap WL pool size: 12
ubi0: attaching mtd3
ubi0: scanning is finished
ubi0 error: ubi_read_volume_table: the layout volume was not found
ubi0 error: ubi_attach_mtd_dev: failed to attach mtd3, error -22
Found by bisecting between v5.7 and v5.8.
OpenBMC-Staging-Count: 1
Fixes: f9acd7fa80be ("mtd: spi-nor: sfdp: default to addr_width of 3 for configurable widths")
Tested-by: Alexander A. Filippov <a.filippov@yadro.com>
Tested-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi-nor/sfdp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/sfdp.c b/drivers/mtd/spi-nor/sfdp.c index 55c0c508464b..9db07182e9c8 100644 --- a/drivers/mtd/spi-nor/sfdp.c +++ b/drivers/mtd/spi-nor/sfdp.c @@ -456,7 +456,6 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor, /* Number of address bytes. */ switch (bfpt.dwords[BFPT_DWORD(1)] & BFPT_DWORD1_ADDRESS_BYTES_MASK) { case BFPT_DWORD1_ADDRESS_BYTES_3_ONLY: - case BFPT_DWORD1_ADDRESS_BYTES_3_OR_4: nor->addr_width = 3; break; |