Skip to contentSkip to conversation

misc: mrvl-cn10k-dpi: add PCI_IOV dependency

PATCH In review Arnd Bergmann 2 participants 2 messages Jul 19, 2024 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc: mrvl-cn10k-dpi: add PCI_IOV dependency

From: Arnd Bergmann <[email protected]>

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")
---
 drivers/misc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/Kconfig +1 -1
index a1ae3f9c0707..b6f5733a6ee2 100644
@@ -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
Signature · 1 line
2.39.2
Tested-by on v1 1/1
#1 lore raw
Quoted 56 lines

-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Friday, July 19, 2024 4:08 PM
To: Greg Kroah-Hartman <[email protected]>
Cc: Arnd Bergmann <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; Srujana Challa <[email protected]>; linux- [email protected]
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 <[email protected]>

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")

---
drivers/misc/Kconfig | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/Kconfig index renamed from drivers/misc/Kconfig +0 -0

a1ae3f9c0707..b6f5733a6ee2 100644

drivers/misc/Kconfig +0 -0
@@ -589,7 +589,7 @@ config NSM
 

config MARVELL_CN10K_DPI
tristate "Octeon CN10K DPI driver"

drivers/misc/Kconfig +1 -1
-	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
Quoted 2 lines

--
2.39.2

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