[PATCH] spi: cadence-xspi: Revert COMPILE_TEST support

[PATCH] spi: cadence-xspi: Revert COMPILE_TEST support

[Nathan Chancellor]

Commit 0c5b5c40dc31 ("spi: cadence-xspi: Add COMPILE_TEST support")
allows this driver to be built for 32-bit platforms, which causes a
semantic conflict with commit 4954d4eca469 ("spi: cadence-xspi: Support
32bit and 64bit slave dma interface"), as readsq() and writesq() are
only available when targeting 64-bit platforms:

  drivers/spi/spi-cadence-xspi.c: In function 'cdns_xspi_sdma_read':
  drivers/spi/spi-cadence-xspi.c:601:25: error: implicit declaration of function 'readsq'; did you mean 'readsl'? [-Wimplicit-function-declaration]
    601 |                         readsq(src, buf, len >> 3);
        |                         ^~~~~~
        |                         readsl
  drivers/spi/spi-cadence-xspi.c: In function 'cdns_xspi_sdma_write':
  drivers/spi/spi-cadence-xspi.c:623:25: error: implicit declaration of function 'writesq'; did you mean 'writesl'? [-Wimplicit-function-declaration]
    623 |                         writesq(dst, buf, len >> 3);
        |                         ^~~~~~~
        |                         writesl

As there are no known 32-bit platforms that use this controller, revert
compile testing support to restrict the driver to 64-bit platforms to
avoid burdening the driver with workarounds.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 drivers/spi/Kconfig            | 3 +--
 drivers/spi/spi-cadence-xspi.c | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 957c3e065b83..8782514bb89b 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -321,8 +321,7 @@ config SPI_CADENCE_QUADSPI
 
 config SPI_CADENCE_XSPI
 	tristate "Cadence XSPI controller"
-	depends on HAS_IOMEM || COMPILE_TEST
-	depends on OF
+	depends on OF && HAS_IOMEM && 64BIT
 	depends on SPI_MEM
 	help
 	  Enable support for the Cadence XSPI Flash controller.
diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index e2bfb0c78b82..e1b337789fce 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -22,10 +22,6 @@
 #include <linux/bitrev.h>
 #include <linux/util_macros.h>
 
-#ifndef CONFIG_64BIT
-#include <linux/io-64-nonatomic-lo-hi.h>
-#endif
-
 #define CDNS_XSPI_MAGIC_NUM_VALUE	0x6522
 #define CDNS_XSPI_MAX_BANKS		8
 #define CDNS_XSPI_NAME			"cadence-xspi"

---
base-commit: 4954d4eca469419339452cb5fea26dd0fc678c54
change-id: 20260606-spi-cadence-xspi-revert-compile-testing-7919284daf5f

Best regards,
--  
Cheers,
Nathan

Re: [PATCH] spi: cadence-xspi: Revert COMPILE_TEST support

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]

Hello,

On Sat, Jun 06, 2026 at 03:26:04PM -0700, Nathan Chancellor wrote:
> Commit 0c5b5c40dc31 ("spi: cadence-xspi: Add COMPILE_TEST support")
> allows this driver to be built for 32-bit platforms, which causes a
> semantic conflict with commit 4954d4eca469 ("spi: cadence-xspi: Support
> 32bit and 64bit slave dma interface"), as readsq() and writesq() are
> only available when targeting 64-bit platforms:
> 
>   drivers/spi/spi-cadence-xspi.c: In function 'cdns_xspi_sdma_read':
>   drivers/spi/spi-cadence-xspi.c:601:25: error: implicit declaration of function 'readsq'; did you mean 'readsl'? [-Wimplicit-function-declaration]
>     601 |                         readsq(src, buf, len >> 3);
>         |                         ^~~~~~
>         |                         readsl
>   drivers/spi/spi-cadence-xspi.c: In function 'cdns_xspi_sdma_write':
>   drivers/spi/spi-cadence-xspi.c:623:25: error: implicit declaration of function 'writesq'; did you mean 'writesl'? [-Wimplicit-function-declaration]
>     623 |                         writesq(dst, buf, len >> 3);
>         |                         ^~~~~~~
>         |                         writesl
> 
> As there are no known 32-bit platforms that use this controller, revert
> compile testing support to restrict the driver to 64-bit platforms to
> avoid burdening the driver with workarounds.

Given this fixes a build failure in next and we're at -rc7 already, it
would be great to get this in.

Fixes: 4954d4eca469 ("spi: cadence-xspi: Support 32bit and 64bit slave dma interface")
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>

Thanks for preparing the patch
Uwe

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] spi: cadence-xspi: Revert COMPILE_TEST support

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]

On Sat, Jun 06, 2026 at 03:26:04PM -0700, Nathan Chancellor wrote:
> Commit 0c5b5c40dc31 ("spi: cadence-xspi: Add COMPILE_TEST support")
> allows this driver to be built for 32-bit platforms, which causes a
> semantic conflict with commit 4954d4eca469 ("spi: cadence-xspi: Support
> 32bit and 64bit slave dma interface"), as readsq() and writesq() are
> only available when targeting 64-bit platforms:

>  config SPI_CADENCE_XSPI
>  	tristate "Cadence XSPI controller"
> -	depends on HAS_IOMEM || COMPILE_TEST
> -	depends on OF
> +	depends on OF && HAS_IOMEM && 64BIT
>  	depends on SPI_MEM

Why combine all these, they're not obviously related and HAS_IOMEM can
be turned off.

>  	help
>  	  Enable support for the Cadence XSPI Flash controller.
> diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
> index e2bfb0c78b82..e1b337789fce 100644
> --- a/drivers/spi/spi-cadence-xspi.c
> +++ b/drivers/spi/spi-cadence-xspi.c
> @@ -22,10 +22,6 @@
>  #include <linux/bitrev.h>
>  #include <linux/util_macros.h>
>  
> -#ifndef CONFIG_64BIT
> -#include <linux/io-64-nonatomic-lo-hi.h>
> -#endif
> -
>  #define CDNS_XSPI_MAGIC_NUM_VALUE	0x6522
>  #define CDNS_XSPI_MAX_BANKS		8
>  #define CDNS_XSPI_NAME			"cadence-xspi"
> 
> ---
> base-commit: 4954d4eca469419339452cb5fea26dd0fc678c54
> change-id: 20260606-spi-cadence-xspi-revert-compile-testing-7919284daf5f
> 
> Best regards,
> --  
> Cheers,
> Nathan
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] spi: cadence-xspi: Revert COMPILE_TEST support

[Nathan Chancellor]

On Mon, Jun 08, 2026 at 11:31:33AM +0100, Mark Brown wrote:
> On Sat, Jun 06, 2026 at 03:26:04PM -0700, Nathan Chancellor wrote:
> > Commit 0c5b5c40dc31 ("spi: cadence-xspi: Add COMPILE_TEST support")
> > allows this driver to be built for 32-bit platforms, which causes a
> > semantic conflict with commit 4954d4eca469 ("spi: cadence-xspi: Support
> > 32bit and 64bit slave dma interface"), as readsq() and writesq() are
> > only available when targeting 64-bit platforms:
> 
> >  config SPI_CADENCE_XSPI
> >  	tristate "Cadence XSPI controller"
> > -	depends on HAS_IOMEM || COMPILE_TEST
> > -	depends on OF
> > +	depends on OF && HAS_IOMEM && 64BIT
> >  	depends on SPI_MEM
> 
> Why combine all these, they're not obviously related and HAS_IOMEM can
> be turned off.

This is just a straight revert of 0c5b5c40dc31, so it is just restoring
how it was before that change.

-- 
Cheers,
Nathan

Re: [PATCH] spi: cadence-xspi: Revert COMPILE_TEST support

[Mark Brown]

On Sat, 06 Jun 2026 15:26:04 -0700, Nathan Chancellor wrote:
> spi: cadence-xspi: Revert COMPILE_TEST support

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-7.2

Thanks!

[1/1] spi: cadence-xspi: Revert COMPILE_TEST support
      https://git.kernel.org/broonie/spi/c/2fb242e4f375

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark