From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Lars-Peter Clausen <lars@metafoo.de>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
linux-spi@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 02/41] spi: cadence: Detect transmit FIFO depth
Date: Mon, 27 Jun 2022 22:20:21 -0400 [thread overview]
Message-ID: <20220628022100.595243-2-sashal@kernel.org> (raw)
In-Reply-To: <20220628022100.595243-1-sashal@kernel.org>
From: Lars-Peter Clausen <lars@metafoo.de>
[ Upstream commit 7b40322f7183a92c4303457528ae7cda571c60b9 ]
The depth of the transmit FIFO for the Cadence SPI controller is currently
hardcoded to 128. But the depth is a synthesis configuration parameter of
the core and can vary between different SoCs.
If the configured FIFO size is less than 128 the driver will busy loop in
the cdns_spi_fill_tx_fifo() function waiting for FIFO space to become
available.
Depending on the length and speed of the transfer it can spin for a
significant amount of time. The cdns_spi_fill_tx_fifo() function is called
from the drivers interrupt handler, so it can leave interrupts disabled for
a prolonged amount of time.
In addition the read FIFO will also overflow and data will be discarded.
To avoid this detect the actual size of the FIFO and use that rather than
the hardcoded value.
To detect the FIFO size the FIFO threshold register is used. The register
is sized so that it can hold FIFO size - 1 as its maximum value. Bits that
are not needed to hold the threshold value will always read 0. By writing
0xffff to the register and then reading back the value in the register we
get the FIFO size.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20220527091143.3780378-1-lars@metafoo.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/spi/spi-cadence.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index 90b18c32f859..32117722ae8d 100644
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -93,9 +93,6 @@
#define CDNS_SPI_ER_ENABLE 0x00000001 /* SPI Enable Bit Mask */
#define CDNS_SPI_ER_DISABLE 0x0 /* SPI Disable Bit Mask */
-/* SPI FIFO depth in bytes */
-#define CDNS_SPI_FIFO_DEPTH 128
-
/* Default number of chip select lines */
#define CDNS_SPI_DEFAULT_NUM_CS 4
@@ -111,6 +108,7 @@
* @rx_bytes: Number of bytes requested
* @dev_busy: Device busy flag
* @is_decoded_cs: Flag for decoder property set or not
+ * @tx_fifo_depth: Depth of the TX FIFO
*/
struct cdns_spi {
void __iomem *regs;
@@ -124,6 +122,7 @@ struct cdns_spi {
int rx_bytes;
u8 dev_busy;
u32 is_decoded_cs;
+ unsigned int tx_fifo_depth;
};
/* Macros for the SPI controller read/write */
@@ -305,7 +304,7 @@ static void cdns_spi_fill_tx_fifo(struct cdns_spi *xspi)
{
unsigned long trans_cnt = 0;
- while ((trans_cnt < CDNS_SPI_FIFO_DEPTH) &&
+ while ((trans_cnt < xspi->tx_fifo_depth) &&
(xspi->tx_bytes > 0)) {
/* When xspi in busy condition, bytes may send failed,
@@ -468,6 +467,24 @@ static int cdns_unprepare_transfer_hardware(struct spi_master *master)
return 0;
}
+/**
+ * cdns_spi_detect_fifo_depth - Detect the FIFO depth of the hardware
+ * @xspi: Pointer to the cdns_spi structure
+ *
+ * The depth of the TX FIFO is a synthesis configuration parameter of the SPI
+ * IP. The FIFO threshold register is sized so that its maximum value can be the
+ * FIFO size - 1. This is used to detect the size of the FIFO.
+ */
+static void cdns_spi_detect_fifo_depth(struct cdns_spi *xspi)
+{
+ /* The MSBs will get truncated giving us the size of the FIFO */
+ cdns_spi_write(xspi, CDNS_SPI_THLD, 0xffff);
+ xspi->tx_fifo_depth = cdns_spi_read(xspi, CDNS_SPI_THLD) + 1;
+
+ /* Reset to default */
+ cdns_spi_write(xspi, CDNS_SPI_THLD, 0x1);
+}
+
/**
* cdns_spi_probe - Probe method for the SPI driver
* @pdev: Pointer to the platform_device structure
@@ -540,6 +557,8 @@ static int cdns_spi_probe(struct platform_device *pdev)
if (ret < 0)
xspi->is_decoded_cs = 0;
+ cdns_spi_detect_fifo_depth(xspi);
+
/* SPI controller initializations */
cdns_spi_init_hw(xspi);
--
2.35.1
next prev parent reply other threads:[~2022-06-28 2:24 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-28 2:20 [PATCH AUTOSEL 5.15 01/41] spi: spi-cadence: Fix SPI CS gets toggling sporadically Sasha Levin
2022-06-28 2:20 ` Sasha Levin [this message]
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 03/41] spi: spi-mem: Fix spi_mem_poll_status() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 04/41] regulator: qcom_smd: correct MP5496 ranges Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 05/41] ALSA: usb-audio: US16x08: Move overflow check before array access Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 06/41] bus: bt1-apb: Don't print error on -EPROBE_DEFER Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 07/41] bus: bt1-axi: " Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 08/41] drm/vc4: plane: Prevent async update if we don't have a dlist Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 09/41] drm/vc4: crtc: Use an union to store the page flip callback Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 10/41] drm/vc4: crtc: Move the BO handling out of common page-flip callback Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 11/41] selftests: vm: Fix resource leak when return error Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 12/41] scsi: ufs: Simplify ufshcd_clear_cmd() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 13/41] scsi: ufs: Support clearing multiple commands at once Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 14/41] ALSA: x86: intel_hdmi_audio: enable pm_runtime and set autosuspend delay Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 15/41] ALSA: x86: intel_hdmi_audio: use pm_runtime_resume_and_get() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 16/41] hamradio: 6pack: fix array-index-out-of-bounds in decode_std_command() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 17/41] drivers/net/ethernet/neterion/vxge: Fix a use-after-free bug in vxge-main.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 18/41] powerpc/prom_init: Fix build failure with GCC_PLUGIN_STRUCTLEAK_BYREF_ALL and KASAN Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 19/41] spi: rockchip: Unmask IRQ at the final to avoid preemption Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 20/41] video: fbdev: skeletonfb: Fix syntax errors in comments Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 21/41] video: fbdev: intelfb: Use aperture size from pci_resource_len Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 22/41] video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write Sasha Levin
2022-09-19 8:21 ` Vitaly Chikunov
2022-09-19 22:24 ` Sasha Levin
2022-09-21 5:10 ` Vitaly Chikunov
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 23/41] video: fbdev: simplefb: Check before clk_put() not needed Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 24/41] btrfs: add missing inode updates on each iteration when replacing extents Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 25/41] btrfs: do not BUG_ON() on failure to migrate space " Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 26/41] io_uring: fix merge error in checking send/recv addr2 flags Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 27/41] arch: mips: generic: Add missing of_node_put() in board-ranchu.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 28/41] mips: mti-malta: Fix refcount leak in malta-time.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 29/41] mips: ralink: Fix refcount leak in of.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 30/41] mips: lantiq: falcon: Fix refcount leak bug in sysctrl Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 31/41] mips: lantiq: xway: " Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 32/41] mips/pic32/pic32mzda: Fix refcount leak bugs Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 33/41] mips: dts: ingenic: Add TCU clock to x1000/x1830 tcu device node Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 34/41] mips: lantiq: Add missing of_node_put() in irq.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 35/41] drm/sun4i: Add DMA mask and segment size Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 36/41] drm/sun4i: Return if frontend is not present Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 37/41] hinic: Replace memcpy() with direct assignment Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 38/41] drm/amdgpu: Adjust logic around GTT size (v3) Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 39/41] nvme: add a bogus subsystem NQN quirk for Micron MTFDKBA2T0TFH Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 40/41] gpio: grgpio: Fix device removing Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220628022100.595243-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox