[PATCH] misc: mrvl-cn10k-dpi: add PCI_IOV dependency

[PATCH] misc: mrvl-cn10k-dpi: add PCI_IOV dependency

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

I found one more missing dependency in the new driver: when building
without CONFIG_PCI_IOV, pci_sriov_configure_simple() cannot be
called directly:

drivers/misc/mrvl_cn10k_dpi.c: In function 'dpi_remove':
include/linux/stddef.h:9:14: error: called object is not a function or function pointer
    9 | #define NULL ((void *)0)
      |              ^
include/linux/pci.h:2416:41: note: in expansion of macro 'NULL'
 2416 | #define pci_sriov_configure_simple      NULL
      |                                         ^~~~
drivers/misc/mrvl_cn10k_dpi.c:652:9: note: in expansion of macro 'pci_sriov_configure_simple'
  652 |         pci_sriov_configure_simple(pdev, 0);

Add this to the Kconfig file as well.

Fixes: 5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/misc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a1ae3f9c0707..b6f5733a6ee2 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -589,7 +589,7 @@ config NSM
 
 config MARVELL_CN10K_DPI
 	tristate "Octeon CN10K DPI driver"
-	depends on PCI
+	depends on PCI && PCI_IOV
 	depends on ARCH_THUNDER || (COMPILE_TEST && 64BIT)
 	help
 	  Enables Octeon CN10K DMA packet interface (DPI) driver which
-- 
2.39.2

RE: [EXTERNAL] [PATCH] misc: mrvl-cn10k-dpi: add PCI_IOV dependency

[Vamsi Krishna Attunuru]

>-----Original Message-----
>From: Arnd Bergmann <arnd@kernel.org>
>Sent: Friday, July 19, 2024 4:08 PM
>To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>Cc: Arnd Bergmann <arnd@arndb.de>; Vamsi Krishna Attunuru
><vattunuru@marvell.com>; Srujana Challa <schalla@marvell.com>; linux-
>kernel@vger.kernel.org
>Subject: [EXTERNAL] [PATCH] misc: mrvl-cn10k-dpi: add PCI_IOV dependency
>
>From: Arnd Bergmann <arnd@ arndb. de> I found one more missing
>dependency in the new driver: when building without CONFIG_PCI_IOV,
>pci_sriov_configure_simple() cannot be called directly:
>drivers/misc/mrvl_cn10k_dpi. c: In function 'dpi_remove':
>
>From: Arnd Bergmann <arnd@arndb.de>
>
>I found one more missing dependency in the new driver: when building
>without CONFIG_PCI_IOV, pci_sriov_configure_simple() cannot be called
>directly:
>
>drivers/misc/mrvl_cn10k_dpi.c: In function 'dpi_remove':
>include/linux/stddef.h:9:14: error: called object is not a function or function
>pointer
>    9 | #define NULL ((void *)0)
>      |              ^
>include/linux/pci.h:2416:41: note: in expansion of macro 'NULL'
> 2416 | #define pci_sriov_configure_simple      NULL
>      |                                         ^~~~
>drivers/misc/mrvl_cn10k_dpi.c:652:9: note: in expansion of macro
>'pci_sriov_configure_simple'
>  652 |         pci_sriov_configure_simple(pdev, 0);
>
>Add this to the Kconfig file as well.
>
>Fixes: 5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI
>administrative driver")
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>---
> drivers/misc/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index
>a1ae3f9c0707..b6f5733a6ee2 100644
>--- a/drivers/misc/Kconfig
>+++ b/drivers/misc/Kconfig
>@@ -589,7 +589,7 @@ config NSM
>
> config MARVELL_CN10K_DPI
> 	tristate "Octeon CN10K DPI driver"
>-	depends on PCI
>+	depends on PCI && PCI_IOV
> 	depends on ARCH_THUNDER || (COMPILE_TEST && 64BIT)
> 	help
> 	  Enables Octeon CN10K DMA packet interface (DPI) driver which
>--
>2.39.2

Ohk, my apologies for that. Arnd, thank you for the solution.

Tested-by: Vamsi Attunuru <vattunuru@marvell.com>