mirror of https://github.com/torvalds/linux.git
b005d618c8
Merge series from Mateusz Litwin <mateusz.litwin@nokia.com>:
On the Stratix10 platform, indirect reads can become very slow due to lost
interrupts and/or missed `complete()` calls, causing
`wait_for_completion_timeout()` to expire.
Three issues were identified:
1) A race condition exists between the read loop and IRQ `complete()`
call:
An IRQ can call `complete()` after the inner loop ends, but before
`reinit_completion()`, losing the completion event and leading to
`wait_for_completion_timeout()` expire. This function will not return
an error because `bytes_to_read` > 0 (indicating data is already in the
FIFO) and the final `ret` value is overwritten by
`cqspi_wait_for_bit()` return value (indicating request completion),
masking the timeout.
For test purpose, logging was added to print the count of timeouts and
the outer loop count.
$ dd if=/dev/mtd0 of=/dev/null bs=64M count=1
[ 2232.925219] cadence-qspi ff8d2000.spi: Indirect read error timeout
(1) loop (12472)
[ 2236.200391] cadence-qspi ff8d2000.spi: Indirect read error timeout
(1) loop (12460)
[ 2239.482836] cadence-qspi ff8d2000.spi: Indirect read error timeout
(5) loop (12450)
This indicates that such an event is rare, but possible.
Tested on the Stratix10 platform.
2) The quirk assumes the indirect read path never leaves the inner loop on
SoCFPGA. This assumption is incorrect when using slow flash. Disabling
IRQs in the inner loop can cause lost interrupts.
3) The `CQSPI_SLOW_SRAM` quirk disables `CQSPI_REG_IRQ_IND_COMP` (indirect
completion) interrupt, relying solely on the `CQSPI_REG_IRQ_WATERMARK`
(FIFO watermark) interrupt. For small transfers sizes, the final data
read might not fill the FIFO sufficiently to trigger the watermark,
preventing completion and leading to wait_for_completion_timeout()
expiration.
Two patches have been prepared to resolve these issues.
- [1/2] spi: cadence-quadspi: Prevent lost complete() call during
indirect read
Moving `reinit_completion()` before the inner loop prevents a race
condition. This might cause a premature IRQ complete() call to occur;
however, in the worst case, this will result in a spurious wakeup and
another wait cycle, which is preferable to waiting for a timeout.
- [2/2] spi: cadence-quadspi: Improve CQSPI_SLOW_SRAM quirk if flash is
slow
Re-enabling `CQSPI_REG_IRQ_IND_COMP` interrupt resolves the problem for
small reads and removes the disabling of interrupts, addressing the
issue with lost interrupts. This marginally increases the IRQ count.
Test:
$ dd if=/dev/mtd0 of=/dev/null bs=1M count=64
Results from the Stratix10 platform with mt25qu02g flash.
FIFO size in all tests: 128
Serviced interrupt call counts:
Without `CQSPI_SLOW_SRAM` quirk: 16 668 850
With `CQSPI_SLOW_SRAM` quirk: 204 176
With `CQSPI_SLOW_SRAM` and this patch: 224 528
Patch 2/2: Delivers a substantial read‑performance improvement for the
Cadence QSPI controller on the Stratix10 platform. Patch 1/2: Applies to
all platforms and should yield a modest performance gain, most noticeable
with large `CQSPI_READ_TIMEOUT_MS` values and workloads dominated by many
small reads.
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| atmel-quadspi.c | ||
| internals.h | ||
| spi-airoha-snfi.c | ||
| spi-altera-core.c | ||
| spi-altera-dfl.c | ||
| spi-altera-platform.c | ||
| spi-amd-pci.c | ||
| spi-amd.c | ||
| spi-amd.h | ||
| spi-amlogic-spifc-a1.c | ||
| spi-amlogic-spifc-a4.c | ||
| spi-amlogic-spisg.c | ||
| spi-apple.c | ||
| spi-ar934x.c | ||
| spi-armada-3700.c | ||
| spi-aspeed-smc.c | ||
| spi-at91-usart.c | ||
| spi-ath79.c | ||
| spi-atmel.c | ||
| spi-au1550.c | ||
| spi-axi-spi-engine.c | ||
| spi-bcm-qspi.c | ||
| spi-bcm-qspi.h | ||
| spi-bcm63xx-hsspi.c | ||
| spi-bcm63xx.c | ||
| spi-bcm2835.c | ||
| spi-bcm2835aux.c | ||
| spi-bcmbca-hsspi.c | ||
| spi-bitbang-txrx.h | ||
| spi-bitbang.c | ||
| spi-brcmstb-qspi.c | ||
| spi-butterfly.c | ||
| spi-cadence-quadspi.c | ||
| spi-cadence-xspi.c | ||
| spi-cadence.c | ||
| spi-cavium-octeon.c | ||
| spi-cavium-thunderx.c | ||
| spi-cavium.c | ||
| spi-cavium.h | ||
| spi-ch341.c | ||
| spi-clps711x.c | ||
| spi-coldfire-qspi.c | ||
| spi-cs42l43.c | ||
| spi-davinci.c | ||
| spi-dln2.c | ||
| spi-dw-bt1.c | ||
| spi-dw-core.c | ||
| spi-dw-dma.c | ||
| spi-dw-mmio.c | ||
| spi-dw-pci.c | ||
| spi-dw.h | ||
| spi-ep93xx.c | ||
| spi-falcon.c | ||
| spi-fsi.c | ||
| spi-fsl-cpm.c | ||
| spi-fsl-cpm.h | ||
| spi-fsl-dspi.c | ||
| spi-fsl-espi.c | ||
| spi-fsl-lib.c | ||
| spi-fsl-lib.h | ||
| spi-fsl-lpspi.c | ||
| spi-fsl-qspi.c | ||
| spi-fsl-spi.c | ||
| spi-fsl-spi.h | ||
| spi-geni-qcom.c | ||
| spi-gpio.c | ||
| spi-gxp.c | ||
| spi-hisi-kunpeng.c | ||
| spi-hisi-sfc-v3xx.c | ||
| spi-img-spfi.c | ||
| spi-imx.c | ||
| spi-ingenic.c | ||
| spi-intel-pci.c | ||
| spi-intel-platform.c | ||
| spi-intel.c | ||
| spi-intel.h | ||
| spi-iproc-qspi.c | ||
| spi-jcore.c | ||
| spi-kspi2.c | ||
| spi-lantiq-ssc.c | ||
| spi-ljca.c | ||
| spi-lm70llp.c | ||
| spi-loongson-core.c | ||
| spi-loongson-pci.c | ||
| spi-loongson-plat.c | ||
| spi-loongson.h | ||
| spi-loopback-test.c | ||
| spi-lp8841-rtc.c | ||
| spi-mem.c | ||
| spi-meson-spicc.c | ||
| spi-meson-spifc.c | ||
| spi-microchip-core-qspi.c | ||
| spi-microchip-core-spi.c | ||
| spi-mpc52xx-psc.c | ||
| spi-mpc52xx.c | ||
| spi-mpc512x-psc.c | ||
| spi-mpfs.c | ||
| spi-mt65xx.c | ||
| spi-mt7621.c | ||
| spi-mtk-nor.c | ||
| spi-mtk-snfi.c | ||
| spi-mux.c | ||
| spi-mxic.c | ||
| spi-mxs.c | ||
| spi-npcm-fiu.c | ||
| spi-npcm-pspi.c | ||
| spi-nxp-fspi.c | ||
| spi-oc-tiny.c | ||
| spi-offload-trigger-adi-util-sigma-delta.c | ||
| spi-offload-trigger-pwm.c | ||
| spi-offload.c | ||
| spi-omap-uwire.c | ||
| spi-omap2-mcspi.c | ||
| spi-orion.c | ||
| spi-pci1xxxx.c | ||
| spi-pic32-sqi.c | ||
| spi-pic32.c | ||
| spi-pl022.c | ||
| spi-ppc4xx.c | ||
| spi-pxa2xx-dma.c | ||
| spi-pxa2xx-pci.c | ||
| spi-pxa2xx-platform.c | ||
| spi-pxa2xx.c | ||
| spi-pxa2xx.h | ||
| spi-qcom-qspi.c | ||
| spi-qpic-snand.c | ||
| spi-qup.c | ||
| spi-rb4xx.c | ||
| spi-realtek-rtl-snand.c | ||
| spi-realtek-rtl.c | ||
| spi-rockchip-sfc.c | ||
| spi-rockchip.c | ||
| spi-rpc-if.c | ||
| spi-rspi.c | ||
| spi-rzv2h-rspi.c | ||
| spi-rzv2m-csi.c | ||
| spi-s3c64xx.c | ||
| spi-sc18is602.c | ||
| spi-sg2044-nor.c | ||
| spi-sh-hspi.c | ||
| spi-sh-msiof.c | ||
| spi-sh-sci.c | ||
| spi-sh.c | ||
| spi-sifive.c | ||
| spi-slave-mt27xx.c | ||
| spi-slave-system-control.c | ||
| spi-slave-time.c | ||
| spi-sn-f-ospi.c | ||
| spi-sprd-adi.c | ||
| spi-sprd.c | ||
| spi-st-ssc4.c | ||
| spi-stm32-ospi.c | ||
| spi-stm32-qspi.c | ||
| spi-stm32.c | ||
| spi-sun4i.c | ||
| spi-sun6i.c | ||
| spi-sunplus-sp7021.c | ||
| spi-synquacer.c | ||
| spi-tegra20-sflash.c | ||
| spi-tegra20-slink.c | ||
| spi-tegra114.c | ||
| spi-tegra210-quad.c | ||
| spi-test.h | ||
| spi-ti-qspi.c | ||
| spi-tle62x0.c | ||
| spi-topcliff-pch.c | ||
| spi-uniphier.c | ||
| spi-virtio.c | ||
| spi-wpcm-fiu.c | ||
| spi-xcomm.c | ||
| spi-xilinx.c | ||
| spi-xlp.c | ||
| spi-xtensa-xtfpga.c | ||
| spi-zynq-qspi.c | ||
| spi-zynqmp-gqspi.c | ||
| spi.c | ||
| spidev.c | ||