pci: j721e: fix host/endpoint dependencies
Subsystems (4)
PATCH 1/1 pci: j721e: fix host/endpoint dependencies
From: Arnd Bergmann <[email protected]>
The j721e driver has a single platform driver that can be built-in or a loadable module, but it calls two separate backend drivers depending on whether it is a host or endpoint.
If the two modes are not the same, we can end up with a situation where the built-in pci-j721e driver tries to call the modular host or endpoint driver, which causes a link failure:
ld.lld-21: error: undefined symbol: cdns_pcie_ep_setup
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by
pci-j721e.c
drivers/pci/controller/cadence/pci-j721e.o:(j721e_pcie_probe) in archive vmlinux.a
ld.lld-21: error: undefined symbol: cdns_pcie_host_setup
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by
pci-j721e.c
drivers/pci/controller/cadence/pci-j721e.o:(j721e_pcie_probe) in archive vmlinux.a
Rework the dependencies so that the 'select' is done by the common Kconfig symbol, based on which of the two are enabled. Effectively this means that having one built-in makes the other either built-in or disabled, but all configurations will now build.
--- drivers/pci/controller/cadence/Kconfig | 4 ++-- drivers/pci/controller/cadence/pci-j721e.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/pci/controller/cadence/Kconfig +2 -2
@@ -44,12 +44,13 @@ config PCIE_CADENCE_PLAT_EP config PCI_J721E tristate + select PCIE_CADENCE_HOST if PCI_J721E_HOST != n + select PCIE_CADENCE_EP if PCI_J721E_EP != n config PCI_J721E_HOST tristate "TI J721E PCIe controller (host mode)" depends on ARCH_K3 || COMPILE_TEST depends on OF - select PCIE_CADENCE_HOST select PCI_J721E help Say Y here if you want to support the TI J721E PCIe platform
@@ -61,7 +62,6 @@ config PCI_J721E_EP depends on ARCH_K3 || COMPILE_TEST depends on OF depends on PCI_ENDPOINT - select PCIE_CADENCE_EP select PCI_J721E help Say Y here if you want to support the TI J721E PCIe platform
drivers/pci/controller/cadence/pci-j721e.c +2 -2
@@ -475,7 +475,7 @@ static int j721e_pcie_probe(struct platform_device *pdev)switch (mode) {case PCI_MODE_RC : -if (!IS_ENABLED (CONFIG_PCIE_CADENCE_HOST )) +if (!IS_ENABLED (CONFIG_PCI_J721E_HOST ))return -ENODEV ; bridge =devm_pci_alloc_host_bridge (dev,sizeof (*rc));
@@ -494,7 +494,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) pcie->cdns_pcie = cdns_pcie;break ;case PCI_MODE_EP : -if (!IS_ENABLED (CONFIG_PCIE_CADENCE_EP )) +if (!IS_ENABLED (CONFIG_PCI_J721E_EP ))return -ENODEV ; ep =devm_kzalloc (dev,sizeof (*ep),GFP_KERNEL );
Signature · 1 line
2.39.5
On Wed, Apr 23, 2025 at 06:25:16PM +0200, Arnd Bergmann wrote:
Hello Arnd,
Thank you for the Fix.
Quoted 18 lines
From: Arnd Bergmann <[email protected]>
The j721e driver has a single platform driver that can be built-in or a loadable module, but it calls two separate backend drivers depending on whether it is a host or endpoint.
If the two modes are not the same, we can end up with a situation where the built-in pci-j721e driver tries to call the modular host or endpoint driver, which causes a link failure:
ld.lld-21: error: undefined symbol:
cdns_pcie_ep_setupQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by
pci-j721e.c
drivers/pci/controller/cadence/pci-j721e.o:(j721e_pcie_probe) in archive vmlinux.ald.lld-21: error: undefined symbol:
cdns_pcie_host_setupQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by
pci-j721e.c
drivers/pci/controller/cadence/pci-j721e.o:(j721e_pcie_probe) in archive vmlinux.a
Quoted 6 lines
Rework the dependencies so that the 'select' is done by the common
Kconfigsymbol, based on which of the two are enabled. Effectively this means that having one built-in makes the other either built-in or disabled, but all configurations will now build.Signed-off-by Arnd Bergmann <[email protected]>
Regards,
Siddharth.
Manivannan Sadhasivam
AppliedQuoted 9 lines · Arnd Bergmann
The j721e driver has a single platform driver that can be built-in or a loadable module, but it calls two separate backend drivers depending on whether it is a host or endpoint.
If the two modes are not the same, we can end up with a situation where the built-in pci-j721e driver tries to call the modular host or endpoint driver, which causes a link failure:
[...]
Applied, thanks!
[1/1] pci: j721e: fix host/endpoint dependencies
commit: 10aae64c2fb5148409cc9beba7f849a79fe82f17
Best regards,
Signature · 1 line
Manivannan Sadhasivam <[email protected]>