From: Greg Kroah-Hartman Date: Sat, 30 Dec 2023 11:24:00 +0000 (+0000) Subject: 6.6-stable patches X-Git-Tag: v6.1.70~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=222cbad480edb569d84f09e3326d65bf885d7e99;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: spi-cadence-revert-add-spi-transfer-delays.patch --- diff --git a/queue-6.6/series b/queue-6.6/series index ab3c590a962..8a4eb770f2f 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -153,3 +153,4 @@ kvm-arm64-vgic-force-vcpu-vgic-teardown-on-vcpu-destroy.patch x86-alternatives-sync-core-before-enabling-interrupts.patch x86-alternatives-disable-interrupts-and-sync-when-optimizing-nops-in-place.patch x86-smpboot-64-handle-x2apic-bios-inconsistency-gracefully.patch +spi-cadence-revert-add-spi-transfer-delays.patch diff --git a/queue-6.6/spi-cadence-revert-add-spi-transfer-delays.patch b/queue-6.6/spi-cadence-revert-add-spi-transfer-delays.patch new file mode 100644 index 00000000000..0fd613a6de3 --- /dev/null +++ b/queue-6.6/spi-cadence-revert-add-spi-transfer-delays.patch @@ -0,0 +1,32 @@ +From 7a733e060bd20edb63b1f27f0b29cf9b184e0e8b Mon Sep 17 00:00:00 2001 +From: Nam Cao +Date: Wed, 6 Dec 2023 15:52:33 +0100 +Subject: spi: cadence: revert "Add SPI transfer delays" + +From: Nam Cao + +commit 7a733e060bd20edb63b1f27f0b29cf9b184e0e8b upstream. + +The commit 855a40cd8ccc ("spi: cadence: Add SPI transfer delays") adds a +delay after each transfer into the driver's transfer_one(). However, +the delay is already done in SPI core. So this commit unnecessarily +doubles the delay amount. Revert this commit. + +Signed-off-by: Nam Cao +Link: https://lore.kernel.org/r/20231206145233.74982-1-namcao@linutronix.de +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-cadence.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/spi/spi-cadence.c ++++ b/drivers/spi/spi-cadence.c +@@ -451,7 +451,6 @@ static int cdns_transfer_one(struct spi_ + udelay(10); + + cdns_spi_process_fifo(xspi, xspi->tx_fifo_depth, 0); +- spi_transfer_delay_exec(transfer); + + cdns_spi_write(xspi, CDNS_SPI_IER, CDNS_SPI_IXR_DEFAULT); + return transfer->len;