From: rjui@broadcom•com (Ray Jui)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] PCI: iproc: fix msi driver selection
Date: Fri, 18 Dec 2015 09:23:51 -0800 [thread overview]
Message-ID: <56744127.5060106@broadcom.com> (raw)
In-Reply-To: <1541985.1Jq5kHC7MS@wuerfel>
Hi Arnd,
On 12/18/2015 6:57 AM, Arnd Bergmann wrote:
> The newly added MSI support for iproc causes a link error when its
> Kconfig option is disabled:
>
> ERROR: "iproc_msi_exit" [drivers/pci/host/pcie-iproc.ko] undefined!
> ERROR: "iproc_msi_init" [drivers/pci/host/pcie-iproc.ko] undefined!
>
> This changes the header file so we use stub functions whenever
> the driver is not built, even when CONFIG_MSI is enabled.
>
> As the Kconfig logic for the driver is a bit off, I'm rectifying
> that as well, by making it depend on the specific drivers that
> call into the driver, and moving the option behind those instead
> of before them.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb•de>
> Fixes: 610894347cbf ("PCI: iproc: Add iProc PCIe MSI support")
> ---
> Found on ARM randconfig builds a couple of days ago
>
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 490476e172fd..d7c05894af70 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -124,15 +124,6 @@ config PCIE_IPROC
> iProc family of SoCs. An appropriate bus interface driver needs
> to be enabled to select this.
>
I was actually not aware of the change that makes PCIE_IPROC hidden and
selected by the bus drivers. But I know, :)
> -config PCIE_IPROC_MSI
> - bool "Broadcom iProc PCIe MSI support"
> - depends on ARCH_BCM_IPROC && PCI_MSI
> - select PCI_MSI_IRQ_DOMAIN
> - default ARCH_BCM_IPROC
> - help
> - Say Y here if you want to enable MSI support for Broadcom's iProc
> - PCIe controller
> -
> config PCIE_IPROC_PLATFORM
> tristate "Broadcom iProc PCIe platform bus driver"
> depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
> @@ -154,6 +145,16 @@ config PCIE_IPROC_BCMA
> Say Y here if you want to use the Broadcom iProc PCIe controller
> through the BCMA bus interface
>
> +config PCIE_IPROC_MSI
> + bool "Broadcom iProc PCIe MSI support"
> + depends on PCIE_IPROC_PLATFORM || PCIE_IPROC_BCMA
> + depends on PCI_MSI
> + select PCI_MSI_IRQ_DOMAIN
> + default ARCH_BCM_IPROC
> + help
> + Say Y here if you want to enable MSI support for Broadcom's iProc
> + PCIe controller
> +
> config PCIE_ALTERA
> bool "Altera PCIe controller"
> depends on ARM || NIOS2
> diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h
> index 6def23a7eb54..e84d93c53c7b 100644
> --- a/drivers/pci/host/pcie-iproc.h
> +++ b/drivers/pci/host/pcie-iproc.h
> @@ -79,7 +79,7 @@ struct iproc_pcie {
> int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res);
> int iproc_pcie_remove(struct iproc_pcie *pcie);
>
> -#ifdef CONFIG_PCI_MSI
> +#ifdef CONFIG_PCIE_IPROC_MSI
> int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node);
> void iproc_msi_exit(struct iproc_pcie *pcie);
> #else
>
>
This fix looks good to me. Thanks!
Reviewed-by: Ray Jui <rjui@broadcom•com>
Ray
next prev parent reply other threads:[~2015-12-18 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 14:57 [PATCH] PCI: iproc: fix msi driver selection Arnd Bergmann
2015-12-18 17:23 ` Ray Jui [this message]
2016-01-07 0:10 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56744127.5060106@broadcom.com \
--to=rjui@broadcom$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox