Re: [PATCH] cdx: don't select CONFIG_GENERIC_MSI_IRQ

[Robin Murphy <robin.murphy@arm.com>]

On 2025-08-05 5:10 pm, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> x86 does not use CONFIG_GENERIC_MSI_IRQ, and trying to enable it anyway
> results in a build failure:
> 
> In file included from include/linux/ssb/ssb.h:10,
>                   from drivers/ssb/pcihost_wrapper.c:18:
> include/linux/gpio/driver.h:41:33: error: field 'msiinfo' has incomplete type
>     41 |         msi_alloc_info_t        msiinfo;
>        |                                 ^~~~~~~
> In file included from include/linux/kvm_host.h:19,
>                   from arch/x86/events/intel/core.c:17:
> include/linux/msi.h:528:33: error: field 'alloc_info' has incomplete type
>    528 |         msi_alloc_info_t        alloc_info;
> 
> Change the driver to actually build without this symbol and remove the
> incorrect 'select' statements.

Looks OK to me, the Makefile is clearly trying to support building 
without this force-enabled anyway. In fact I'd go as far as saying that 
this also deserves a

Fixes: e8b18c11731d ("cdx: Fix missing GENERIC_MSI_IRQ on compile test")

And FWIW,

Reviewed-by: Robin Murphy <robin.murphy@arm.com>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   drivers/cdx/Kconfig                     | 1 -
>   drivers/cdx/cdx.c                       | 2 +-
>   drivers/cdx/controller/Kconfig          | 1 -
>   drivers/cdx/controller/cdx_controller.c | 3 ++-
>   4 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/cdx/Kconfig b/drivers/cdx/Kconfig
> index 3af41f51cf38..1f1e360507d7 100644
> --- a/drivers/cdx/Kconfig
> +++ b/drivers/cdx/Kconfig
> @@ -8,7 +8,6 @@
>   config CDX_BUS
>   	bool "CDX Bus driver"
>   	depends on OF && ARM64 || COMPILE_TEST
> -	select GENERIC_MSI_IRQ
>   	help
>   	  Driver to enable Composable DMA Transfer(CDX) Bus. CDX bus
>   	  exposes Fabric devices which uses composable DMA IP to the
> diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c
> index 092306ca2541..1a5c95ba09ba 100644
> --- a/drivers/cdx/cdx.c
> +++ b/drivers/cdx/cdx.c
> @@ -310,7 +310,7 @@ static int cdx_probe(struct device *dev)
>   	 * Setup MSI device data so that generic MSI alloc/free can
>   	 * be used by the device driver.
>   	 */
> -	if (cdx->msi_domain) {
> +	if (IS_ENABLED(CONFIG_GENERIC_MSI_IRQ) && cdx->msi_domain) {
>   		error = msi_setup_device_data(&cdx_dev->dev);
>   		if (error)
>   			return error;
> diff --git a/drivers/cdx/controller/Kconfig b/drivers/cdx/controller/Kconfig
> index 0641a4c21e66..a480b62cbd1f 100644
> --- a/drivers/cdx/controller/Kconfig
> +++ b/drivers/cdx/controller/Kconfig
> @@ -10,7 +10,6 @@ if CDX_BUS
>   config CDX_CONTROLLER
>   	tristate "CDX bus controller"
>   	depends on HAS_DMA
> -	select GENERIC_MSI_IRQ
>   	select REMOTEPROC
>   	select RPMSG
>   	help
> diff --git a/drivers/cdx/controller/cdx_controller.c b/drivers/cdx/controller/cdx_controller.c
> index fca83141e3e6..5e3fd89b6b56 100644
> --- a/drivers/cdx/controller/cdx_controller.c
> +++ b/drivers/cdx/controller/cdx_controller.c
> @@ -193,7 +193,8 @@ static int xlnx_cdx_probe(struct platform_device *pdev)
>   	cdx->ops = &cdx_ops;
>   
>   	/* Create MSI domain */
> -	cdx->msi_domain = cdx_msi_domain_init(&pdev->dev);
> +	if (IS_ENABLED(CONFIG_GENERIC_MSI_IRQ))
> +		cdx->msi_domain = cdx_msi_domain_init(&pdev->dev);
>   	if (!cdx->msi_domain) {
>   		ret = dev_err_probe(&pdev->dev, -ENODEV, "cdx_msi_domain_init() failed");
>   		goto cdx_msi_fail;