[PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI

[PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI

[Jason A. Donenfeld]

Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
guard, but it is used from inside of a CONFIG_PCI_MSI_IRQ_DOMAIN guard,
which does not require CONFIG_PCI. This breaks builds on !CONFIG_PCI
machines. This commit fixes the ifdef to require CONFIG_PCI.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
Cc: Christoph Hellwig <hch@lst.de>
---
 arch/x86/include/asm/pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 40ac1330adb2..d8772b75236d 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -119,7 +119,7 @@ void native_restore_msi_irqs(struct pci_dev *dev);
 /* generic pci stuff */
 #include <asm-generic/pci.h>
 
-#ifdef CONFIG_NUMA
+#if defined(CONFIG_NUMA) && defined(CONFIG_PCI)
 /* Returns the node based on pci bus */
 static inline int __pcibus_to_node(const struct pci_bus *bus)
 {
-- 
2.25.0

Re: [PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI

[Bjorn Helgaas]

On Mon, Feb 03, 2020 at 07:19:06PM +0100, Jason A. Donenfeld wrote:
> Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
> guard, but it is used from inside of a CONFIG_PCI_MSI_IRQ_DOMAIN guard,
> which does not require CONFIG_PCI.

AFAICT, CONFIG_PCI_MSI_IRQ_DOMAIN *does* require CONFIG_PCI.

Do you mean to_pci_sysdata() is used inside a *CONFIG_NUMA* guard by
__pcibus_to_node()?

The patch below makes __pcibus_to_node() available only when
CONFIG_PCI, when previously it was always available.  Maybe that's
fine, I dunno.

Another possibility would be to move the to_pci_sysdata() definition
outside of #ifdef CONFIG_PCI, just as the struct pci_sysdata is.  Then
we wouldn't have to change the availability of __pcibus_to_node().

> This breaks builds on !CONFIG_PCI
> machines. This commit fixes the ifdef to require CONFIG_PCI.
> 
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
> Cc: Christoph Hellwig <hch@lst.de>
> ---
>  arch/x86/include/asm/pci.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
> index 40ac1330adb2..d8772b75236d 100644
> --- a/arch/x86/include/asm/pci.h
> +++ b/arch/x86/include/asm/pci.h
> @@ -119,7 +119,7 @@ void native_restore_msi_irqs(struct pci_dev *dev);
>  /* generic pci stuff */
>  #include <asm-generic/pci.h>
>  
> -#ifdef CONFIG_NUMA
> +#if defined(CONFIG_NUMA) && defined(CONFIG_PCI)
>  /* Returns the node based on pci bus */
>  static inline int __pcibus_to_node(const struct pci_bus *bus)
>  {
> -- 
> 2.25.0
> 

Re: [PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI

[Jason A. Donenfeld]

On Mon, Feb 3, 2020 at 9:09 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
> Another possibility would be to move the to_pci_sysdata() definition
> outside of #ifdef CONFIG_PCI, just as the struct pci_sysdata is.  Then
> we wouldn't have to change the availability of __pcibus_to_node().

Seems more reasonable. v2 coming your way momentarily.

[PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI

[Jason A. Donenfeld]

Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
guard, but it is used from inside of a CONFIG_NUMA guard, which does not
require CONFIG_PCI. This breaks builds on !CONFIG_PCI machines. This
commit makes that function available in all configurations.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
Cc: Christoph Hellwig <hch@lst.de>
---
 arch/x86/include/asm/pci.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 40ac1330adb2..7ccb338507e3 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -33,13 +33,13 @@ extern int pci_routeirq;
 extern int noioapicquirk;
 extern int noioapicreroute;
 
-#ifdef CONFIG_PCI
-
 static inline struct pci_sysdata *to_pci_sysdata(const struct pci_bus *bus)
 {
 	return bus->sysdata;
 }
 
+#ifdef CONFIG_PCI
+
 #ifdef CONFIG_PCI_DOMAINS
 static inline int pci_domain_nr(struct pci_bus *bus)
 {
-- 
2.25.0

Re: [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI

[Randy Dunlap]

On 2/3/20 1:53 PM, Jason A. Donenfeld wrote:
> Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
> guard, but it is used from inside of a CONFIG_NUMA guard, which does not
> require CONFIG_PCI. This breaks builds on !CONFIG_PCI machines. This
> commit makes that function available in all configurations.
> 
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
> Cc: Christoph Hellwig <hch@lst.de>

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks.

> ---
>  arch/x86/include/asm/pci.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
> index 40ac1330adb2..7ccb338507e3 100644
> --- a/arch/x86/include/asm/pci.h
> +++ b/arch/x86/include/asm/pci.h
> @@ -33,13 +33,13 @@ extern int pci_routeirq;
>  extern int noioapicquirk;
>  extern int noioapicreroute;
>  
> -#ifdef CONFIG_PCI
> -
>  static inline struct pci_sysdata *to_pci_sysdata(const struct pci_bus *bus)
>  {
>  	return bus->sysdata;
>  }
>  
> +#ifdef CONFIG_PCI
> +
>  #ifdef CONFIG_PCI_DOMAINS
>  static inline int pci_domain_nr(struct pci_bus *bus)
>  {
> 


-- 
~Randy

Re: [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI

[Christoph Hellwig]

On Mon, Feb 03, 2020 at 10:53:06PM +0100, Jason A. Donenfeld wrote:
> Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
> guard, but it is used from inside of a CONFIG_NUMA guard, which does not
> require CONFIG_PCI. This breaks builds on !CONFIG_PCI machines. This
> commit makes that function available in all configurations.
> 
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
> Cc: Christoph Hellwig <hch@lst.de>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI

[Bjorn Helgaas]

On Mon, Feb 03, 2020 at 10:53:06PM +0100, Jason A. Donenfeld wrote:
> Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
> guard, but it is used from inside of a CONFIG_NUMA guard, which does not
> require CONFIG_PCI. This breaks builds on !CONFIG_PCI machines. This
> commit makes that function available in all configurations.
> 
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
> Cc: Christoph Hellwig <hch@lst.de>

Thanks, applied with Randy's and Christoph's
reported/acked/reviewed-by to for-linus.  I'll try to get this in
v5.6-rc1 so the build issue is fixed.

> ---
>  arch/x86/include/asm/pci.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
> index 40ac1330adb2..7ccb338507e3 100644
> --- a/arch/x86/include/asm/pci.h
> +++ b/arch/x86/include/asm/pci.h
> @@ -33,13 +33,13 @@ extern int pci_routeirq;
>  extern int noioapicquirk;
>  extern int noioapicreroute;
>  
> -#ifdef CONFIG_PCI
> -
>  static inline struct pci_sysdata *to_pci_sysdata(const struct pci_bus *bus)
>  {
>  	return bus->sysdata;
>  }
>  
> +#ifdef CONFIG_PCI
> +
>  #ifdef CONFIG_PCI_DOMAINS
>  static inline int pci_domain_nr(struct pci_bus *bus)
>  {
> -- 
> 2.25.0
>