Skip to contentSkip to conversation

spi: ich: Limit slave->max_read_size

PATCH In review Bin Meng 2 participants 6 messages Jul 28, 2021 – Jul 29, 2021 SPI

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/2 spi: ich: Limit slave->max_read_size

Since commit 43c145b8b3ee ("spi: ich: Correct max-size bug in ich_spi_adjust_size()") (in v2020.04-rc1), SPI flash read no longer works with ICH SPI controller in software sequencer mode.

ICH controller can only transfer a small number of bytes at once. Before commit 43c145b8b3ee, the logic happens to make sure data.nbytes is limited to slave->max_write_size but after commit 43c145b8b3ee data.nbytes is no longer limited because slave->max_read_size is not initialized with a valid number.

Fixes 43c145b8b3ee ("spi: ich: Correct max-size bug in ich_spi_adjust_size()")

---

 drivers/spi/ich.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/ich.c +4 -2
index 3d49c22a9d..08d54e86f4 100644
@@ -918,12 +918,14 @@ static int ich_spi_child_pre_probe(struct udevice *dev)
 	struct spi_slave *slave = dev_get_parent_priv(dev);
 
 	/*
-	 * Yes this controller can only write a small number of bytes at
+	 * Yes this controller can only transfer a small number of bytes at
 	 * once! The limit is typically 64 bytes. For hardware sequencing a
 	 * a loop is used to get around this.
 	 */
-	if (!plat->hwseq)
+	if (!plat->hwseq) {
+		slave->max_read_size = priv->databytes;
 		slave->max_write_size = priv->databytes;
+	}
 	/*
 	 * ICH 7 SPI controller only supports array read command
 	 * and byte program command for SST flash
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 x86: crownbay: Disable CONFIG_SPI_FLASH_SMART_HWCAPS

Since commit 71025f013ccb ("mtd: spi-nor-core: Rework hwcaps selection") SPI flash on Intel Crown Bay board does not work anymore.

Disable CONFIG_SPI_FLASH_SMART_HWCAPS until a proper fix is made to the spi-nor core.

---

 configs/crownbay_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/crownbay_defconfig +1 -0
index af8fb0d805..1208aad42f 100644
@@ -47,6 +47,7 @@ CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
+# CONFIG_SPI_FLASH_SMART_HWCAPS is not set
 CONFIG_E1000=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] x86: crownbay: Disable CONFIG_SPI_FLASH_SMART_HWCAPS

Quoted 4 lines · Bin Meng

Since commit 71025f013ccb ("mtd: spi-nor-core: Rework hwcaps selection") SPI flash on Intel Crown Bay board does not work anymore.

Quoted 8 lines

Disable CONFIG_SPI_FLASH_SMART_HWCAPS until a proper fix is made to the spi-nor core.

---

 configs/crownbay_defconfig | 1 +
 1 file changed, 1 insertion(+)
author
#3 lore raw

Re: [PATCH 2/2] x86: crownbay: Disable CONFIG_SPI_FLASH_SMART_HWCAPS

Quoted 9 lines · Simon Glass
Quoted 7 lines · Bin Meng

Since commit 71025f013ccb ("mtd: spi-nor-core: Rework hwcaps selection") SPI flash on Intel Crown Bay board does not work anymore.

Disable CONFIG_SPI_FLASH_SMART_HWCAPS until a proper fix is made to the spi-nor core.

Quoted 7 lines
Quoted 5 lines

---

 configs/crownbay_defconfig | 1 +
 1 file changed, 1 insertion(+)

applied to u-boot-x86, thanks!

Reviewed-by on v1 1/2
#4 lore raw
In reply to Bin Meng
Quoted 11 lines · Bin Meng

Since commit 43c145b8b3ee ("spi: ich: Correct max-size bug in ich_spi_adjust_size()") (in v2020.04-rc1), SPI flash read no longer works with ICH SPI controller in software sequencer mode.

ICH controller can only transfer a small number of bytes at once. Before commit 43c145b8b3ee, the logic happens to make sure data.nbytes is limited to slave->max_write_size but after commit 43c145b8b3ee data.nbytes is no longer limited because slave->max_read_size is not initialized with a valid number.

Quoted 6 lines
Fixes 43c145b8b3ee ("spi: ich: Correct max-size bug in ich_spi_adjust_size()")

---

 drivers/spi/ich.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
author
#5 lore raw
Quoted 13 lines · Simon Glass
Quoted 11 lines · Bin Meng

Since commit 43c145b8b3ee ("spi: ich: Correct max-size bug in ich_spi_adjust_size()") (in v2020.04-rc1), SPI flash read no longer works with ICH SPI controller in software sequencer mode.

ICH controller can only transfer a small number of bytes at once. Before commit 43c145b8b3ee, the logic happens to make sure data.nbytes is limited to slave->max_write_size but after commit 43c145b8b3ee data.nbytes is no longer limited because slave->max_read_size is not initialized with a valid number.

Quoted 8 lines
Quoted 6 lines
Fixes 43c145b8b3ee ("spi: ich: Correct max-size bug in ich_spi_adjust_size()")

---

 drivers/spi/ich.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

applied to u-boot-x86, thanks!