| Message ID | 20211008095311.26475-1-sergio.paracuellos@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | MIPS: asm: pci: define arch-specific 'pci_remap_iospace()' dependent on 'CONFIG_PCI_DRIVERS_GENERIC' | expand |
On Fri, Oct 08, 2021 at 11:53:11AM +0200, Sergio Paracuellos wrote: > Some MIPS defconfigs that don't define 'CONFIG_PCI_DRIVERS_GENERIC' but > define 'CONFIG_PCI_DRIVERS_LEGACY' or none of them, can fail when they are > built since definition for 'pci_remap_iospace' is being done in include > file 'arch/mips/include/asm/pci.h' and the specific function implemented > in 'arch/mips/pci/pci-generic.c'. MIPS PCI drivers that don't use generic > PCI core APIs don't really need 'pci_remap_iospace' to be defined at all. > Hence, change definition for 'pci_remap_iospace' to be dependent on the > preprocessor 'CONFIG_PCI_DRIVERS_GENERIC' definition to avoid possible > build problems. > > CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > Fixes: 9f76779f2418 ("MIPS: implement architecture-specific 'pci_remap_iospace()'") > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> > --- > Hi Greg, Thomas, Stephen, > > I guess this should also go through the staging-tree. Now queued up, thanks! greg k-h
On Sat, Oct 9, 2021 at 10:37 AM Greg KH <gregkh@linuxfoundation.org> wrote: > > On Fri, Oct 08, 2021 at 11:53:11AM +0200, Sergio Paracuellos wrote: > > Some MIPS defconfigs that don't define 'CONFIG_PCI_DRIVERS_GENERIC' but > > define 'CONFIG_PCI_DRIVERS_LEGACY' or none of them, can fail when they are > > built since definition for 'pci_remap_iospace' is being done in include > > file 'arch/mips/include/asm/pci.h' and the specific function implemented > > in 'arch/mips/pci/pci-generic.c'. MIPS PCI drivers that don't use generic > > PCI core APIs don't really need 'pci_remap_iospace' to be defined at all. > > Hence, change definition for 'pci_remap_iospace' to be dependent on the > > preprocessor 'CONFIG_PCI_DRIVERS_GENERIC' definition to avoid possible > > build problems. > > > > CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > Fixes: 9f76779f2418 ("MIPS: implement architecture-specific 'pci_remap_iospace()'") > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > > Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> > > --- > > Hi Greg, Thomas, Stephen, > > > > I guess this should also go through the staging-tree. > > Now queued up, thanks! Thanks, Greg! Best regards, Sergio Paracuellos > > greg k-h
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 35270984a5f0..421231f55935 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h @@ -20,7 +20,9 @@ #include <linux/list.h> #include <linux/of.h> +#ifdef CONFIG_PCI_DRIVERS_GENERIC #define pci_remap_iospace pci_remap_iospace +#endif #ifdef CONFIG_PCI_DRIVERS_LEGACY
Some MIPS defconfigs that don't define 'CONFIG_PCI_DRIVERS_GENERIC' but define 'CONFIG_PCI_DRIVERS_LEGACY' or none of them, can fail when they are built since definition for 'pci_remap_iospace' is being done in include file 'arch/mips/include/asm/pci.h' and the specific function implemented in 'arch/mips/pci/pci-generic.c'. MIPS PCI drivers that don't use generic PCI core APIs don't really need 'pci_remap_iospace' to be defined at all. Hence, change definition for 'pci_remap_iospace' to be dependent on the preprocessor 'CONFIG_PCI_DRIVERS_GENERIC' definition to avoid possible build problems. CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Fixes: 9f76779f2418 ("MIPS: implement architecture-specific 'pci_remap_iospace()'") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> --- Hi Greg, Thomas, Stephen, I guess this should also go through the staging-tree. Thanks in advance for your time. Best regards, Sergio Paracuellos arch/mips/include/asm/pci.h | 2 ++ 1 file changed, 2 insertions(+)