Updates for asm-generic/pci.h
cover Updates for asm-generic/pci.h
When reviewing the OpenRISC PCI support patch Arnd suggested that we avoid copying arm64 and riscv asm/pci.h and moving that to be the new asm-generic/pci.h.
This patch does that by first moving the old pci.h definition of pci_get_legacy_ide_irq out to the architectures that use it. Next, we create the new pci.h definition.
Stafford Horne (2):
asm-generic: Remove pci.h copying code out to architectures
asm-generic: Add new pci.h and use it
arch/alpha/include/asm/pci.h | 1 - arch/arm64/include/asm/pci.h | 18 ++----------- arch/csky/include/asm/pci.h | 24 +++-------------- arch/ia64/include/asm/pci.h | 1 - arch/m68k/include/asm/pci.h | 7 +++-- arch/powerpc/include/asm/pci.h | 1 - arch/riscv/include/asm/pci.h | 25 +++-------------- arch/s390/include/asm/pci.h | 6 ++++- arch/sparc/include/asm/pci.h | 5 +++- arch/um/include/asm/pci.h | 24 ++--------------- arch/x86/include/asm/pci.h | 6 +++-- arch/xtensa/include/asm/pci.h | 6 +++-- include/asm-generic/pci.h | 49 +++++++++++++++++++++++++--------- 13 files changed, 69 insertions(+), 104 deletions(-)
Signature · 1 line
2.36.1
RFC PATCH 1/2 asm-generic: Remove pci.h copying code out to architectures
The generic pci.h header provides a definition of pci_get_legacy_ide_irq which is used by architectures that use PC-style interrupt numbers.
This patch removes the old pci.h in order to make room for a new pci.h to be used by arm64, riscv, openrisc, etc.
The existing code in pci.h is moved out to architectures.
--- arch/alpha/include/asm/pci.h | 1 - arch/ia64/include/asm/pci.h | 1 - arch/m68k/include/asm/pci.h | 7 +++++-- arch/powerpc/include/asm/pci.h | 1 - arch/s390/include/asm/pci.h | 6 +++++- arch/sparc/include/asm/pci.h | 5 ++++- arch/x86/include/asm/pci.h | 6 ++++-- arch/xtensa/include/asm/pci.h | 6 ++++-- include/asm-generic/pci.h | 17 ----------------- 9 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 include/asm-generic/pci.h
arch/alpha/include/asm/pci.h +0 -1
@@ -56,7 +56,6 @@ struct pci_controller {/* IOMMU controls. */ -/* TODO: integrate with include/asm-generic/pci.h ? */ static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) {return channel ?15 :14 ;
arch/ia64/include/asm/pci.h +0 -1
@@ -63,7 +63,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)return (pci_domain_nr (bus) !=0 ); } -#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) {return channel ?isa_irq_to_vector (15 ) :isa_irq_to_vector (14 );
arch/m68k/include/asm/pci.h +5 -2
@@ -2,11 +2,14 @@#ifndef _ASM_M68K_PCI_H#define _ASM_M68K_PCI_H -#include <asm-generic/pci.h> -#define pcibios_assign_all_busses () 1#define PCIBIOS_MIN_IO 0x00000100#define PCIBIOS_MIN_MEM 0x02000000 +static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +} +#endif /* _ASM_M68K_PCI_H */
arch/powerpc/include/asm/pci.h +0 -1
@@ -39,7 +39,6 @@#define pcibios_assign_all_busses () \ (pci_has_flag(PCI_REASSIGN_ALL_BUS)) -#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) {if (ppc_md.pci_get_legacy_ide_irq)
arch/s390/include/asm/pci.h +5 -1
@@ -6,7 +6,6 @@#include <linux/mutex.h> #include <linux/iommu.h> #include <linux/pci_hotplug.h> -#include <asm-generic/pci.h> #include <asm/pci_clp.h> #include <asm/pci_debug.h> #include <asm/sclp.h>
@@ -233,6 +232,11 @@ int zpci_init_iommu(struct zpci_dev *zdev);void zpci_destroy_iommu (struct zpci_dev *zdev);#ifdef CONFIG_PCI +static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +} +static inline bool zpci_use_mio (struct zpci_dev *zdev) {return static_branch_likely (&have_mio) && zdev->mio_capable;
arch/sparc/include/asm/pci.h +4 -1
@@ -46,7 +46,10 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)return PCI_IRQ_NONE ; }#else -#include <asm-generic/pci.h> +static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +}#endif #endif /* ___ASM_SPARC_PCI_H */
arch/x86/include/asm/pci.h +4 -2
@@ -105,8 +105,10 @@ static inline void early_quirks(void) { }extern void pci_iommu_alloc (void ); -/* generic pci stuff */ -#include <asm-generic/pci.h> +static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +}#ifdef CONFIG_NUMA /* Returns the node based on pci bus */
arch/xtensa/include/asm/pci.h +4 -2
@@ -43,7 +43,9 @@#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1#define arch_can_pci_mmap_io () 1 -/* Generic PCI */ -#include <asm-generic/pci.h> +static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +}#endif /* _XTENSA_PCI_H */
include/asm-generic/pci.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* linux/include/asm-generic/pci.h -* -* Copyright (C) 2003 Russell King -*/ -#ifndef _ASM_GENERIC_PCI_H -#define _ASM_GENERIC_PCI_H - -#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#endif /* HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ */ - -#endif /* _ASM_GENERIC_PCI_H */
Signature · 1 line
2.36.1
Max Filippov
maintainerRe: [RFC PATCH 1/2] asm-generic: Remove pci.h copying code out to architectures
Quoted 24 lines · Stafford Horne
The generic
pci.hheader provides a definition ofpci_get_legacy_ide_irqwhich is used by architectures that use PC-style interrupt numbers.This patch removes the old
pci.hin order to make room for a newpci.hto be used by arm64, riscv, openrisc, etc.The existing code in
pci.his moved out to architectures.Suggested-by Arnd Bergmann <[email protected]>Link https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ open hereSigned-off-by Stafford Horne <[email protected]>--- arch/alpha/include/asm/pci.h | 1 - arch/ia64/include/asm/pci.h | 1 - arch/m68k/include/asm/pci.h | 7 +++++-- arch/powerpc/include/asm/pci.h | 1 - arch/s390/include/asm/pci.h | 6 +++++- arch/sparc/include/asm/pci.h | 5 ++++- arch/x86/include/asm/pci.h | 6 ++++-- arch/xtensa/include/asm/pci.h | 6 ++++-- include/asm-generic/pci.h | 17 ----------------- 9 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 include/asm-generic/pci.h
[...]
arch/xtensa/include/asm/pci.h line 47
Quoted 10 lines
arch/xtensa/include/asm/pci.h +0
-2@@ -43,7 +43,9 @@#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1#define arch_can_pci_mmap_io () 1 -/* Generic PCI */ -#include <asm-generic/pci.h>
Ok.
arch/xtensa/include/asm/pci.h line 49
Quoted 4 lines
arch/xtensa/include/asm/pci.h +4
-0+static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +}
This addition does not make sense for the xtensa as it isn't even possible to enable PNP support (the only user of this function) on xtensa.
Signature · 2 lines
Thanks. -- Max
Re: [RFC PATCH 1/2] asm-generic: Remove pci.h copying code out to architectures
Quoted 41 lines · Max Filippov
Quoted 24 lines · Stafford Horne
The generic
pci.hheader provides a definition ofpci_get_legacy_ide_irqwhich is used by architectures that use PC-style interrupt numbers.This patch removes the old
pci.hin order to make room for a newpci.hto be used by arm64, riscv, openrisc, etc.The existing code in
pci.his moved out to architectures.Suggested-by Arnd Bergmann <[email protected]>Link https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ open hereSigned-off-by Stafford Horne <[email protected]>--- arch/alpha/include/asm/pci.h | 1 - arch/ia64/include/asm/pci.h | 1 - arch/m68k/include/asm/pci.h | 7 +++++-- arch/powerpc/include/asm/pci.h | 1 - arch/s390/include/asm/pci.h | 6 +++++- arch/sparc/include/asm/pci.h | 5 ++++- arch/x86/include/asm/pci.h | 6 ++++-- arch/xtensa/include/asm/pci.h | 6 ++++-- include/asm-generic/pci.h | 17 ----------------- 9 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 include/asm-generic/pci.h[...]
arch/xtensa/include/asm/pci.h line 47
Quoted 10 lines
arch/xtensa/include/asm/pci.h +0
-2@@ -43,7 +43,9 @@#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1#define arch_can_pci_mmap_io () 1 -/* Generic PCI */ -#include <asm-generic/pci.h> Ok.
Quoted 7 lines
arch/xtensa/include/asm/pci.h line 49
Quoted 4 lines
arch/xtensa/include/asm/pci.h +4
-0+static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +}This addition does not make sense for the xtensa as it isn't even possible to enable PNP support (the only user of this function) on xtensa.
Thanks for your feedback, this is the kind of feedback I was hoping to fish out with this patch. I will look into completely removing this then.
-Stafford
Arnd Bergmann
maintainerRe: [RFC PATCH 1/2] asm-generic: Remove pci.h copying code out to architectures
In reply to Max FilippovQuoted 9 lines · Max Filippov
arch/m68k/include/asm/pci.h line 13
Quoted 4 lines · Stafford Horne
arch/m68k/include/asm/pci.h +4
-0+static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +return channel ?15 :14 ; +}This addition does not make sense for the xtensa as it isn't even possible to enable PNP support (the only user of this function) on xtensa.
Nice catch! I had looked at this function earlier and only tried to infer which architectures might have this based on who has those interrupt numbers reserved for ISA devices, but looking at CONFIG_PNP is clearly better here.
PNP depends on "ISA || ACPI", and this already rules out most architectures. The remaining ones are:
* x86, ia64, alpha: These clearly use PNP based on-board devices on common machines, and use PC-style interrupts
* arm64, loongarch: These select PNP when ACPI is enabled. I don't think they actually use PNP, but for the moment the function needs to be defined, probably returning 0. Loongarch still lacks PCI support though, so asm/pci.h is not yet there.
* arm, mips, powerpc: Only a few older machines in each of these support ISA devices, and the function is probably machine specific. These all have a custom pci.h already and don't use the asm-generic version.
* m68k: there are two that enable CONFIG_ISA and one that enables CONFIG_PCI, but nothing that has both, so we don't need this function.
In summary, I think only x86 actually uses this function, and it is correct there, everything else either has its own implementation or does not need it, so the existing asm-generic/pci.h file can just be folded into the x86 asm/pci.h. That is a great cleanup.
Arnd
RFC PATCH 2/2 asm-generic: Add new pci.h and use it
In reply to Stafford HorneThe asm/pci.h used for many newer architectures share similar definitions. Move the common parts to asm-generic/pci.h to allow for sharing code.
Two things to note are:
- isa_dma_bridge_buggy, traditionally this is defined in asm/dma.h but these architectures avoid creating that file and add the definition to asm/pci.h.
- ARCH_GENERIC_PCI_MMAP_RESOURCE, csky does not define this so we undefine it after including asm-generic/pci.h. Why doesn't csky define it?
--- arch/arm64/include/asm/pci.h | 18 ++-------------- arch/csky/include/asm/pci.h | 24 ++++------------------ arch/riscv/include/asm/pci.h | 25 +++------------------- arch/um/include/asm/pci.h | 24 ++-------------------- include/asm-generic/pci.h | 40 ++++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 80 deletions(-) create mode 100644 include/asm-generic/pci.h
arch/arm64/include/asm/pci.h +2 -16
@@ -9,7 +9,6 @@#include <asm/io.h> #define PCIBIOS_MIN_IO 0x1000 -#define PCIBIOS_MIN_MEM 0/* * Set to 1 if the kernel should re-assign all PCI bus numbers
@@ -18,21 +17,8 @@ (pci_has_flag(PCI_REASSIGN_ALL_BUS))#define arch_can_pci_mmap_wc () 1 -#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 -extern int isa_dma_bridge_buggy; - -#ifdef CONFIG_PCI -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -/* no legacy IRQ on arm64 */ -return -ENODEV ; -} - -static inline int pci_proc_domain (struct pci_bus *bus) -{ -return 1 ; -} -#endif /* CONFIG_PCI */ +/* Generic PCI */ +#include <asm-generic/pci.h> #endif /* __ASM_PCI_H */
arch/csky/include/asm/pci.h +4 -20
@@ -9,26 +9,10 @@#include <asm/io.h> -#define PCIBIOS_MIN_IO 0 -#define PCIBIOS_MIN_MEM 0 +/* Generic PCI */ +#include <asm-generic/pci.h> -/* C-SKY shim does not initialize PCI bus */ -#define pcibios_assign_all_busses () 1 - -extern int isa_dma_bridge_buggy; - -#ifdef CONFIG_PCI -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -/* no legacy IRQ on csky */ -return -ENODEV ; -} - -static inline int pci_proc_domain (struct pci_bus *bus) -{ -/* always show the domain in /proc */ -return 1 ; -} -#endif /* CONFIG_PCI */ +/* csky doesn't use generic pci resource mapping */ +#undef ARCH_GENERIC_PCI_MMAP_RESOURCE#endif /* __ASM_CSKY_PCI_H */
arch/riscv/include/asm/pci.h +3 -22
@@ -12,29 +12,7 @@#include <asm/io.h> -#define PCIBIOS_MIN_IO 0 -#define PCIBIOS_MIN_MEM 0 - -/* RISC-V shim does not initialize PCI bus */ -#define pcibios_assign_all_busses () 1 - -#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 - -extern int isa_dma_bridge_buggy; -#ifdef CONFIG_PCI -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -/* no legacy IRQ on risc-v */ -return -ENODEV ; -} - -static inline int pci_proc_domain (struct pci_bus *bus) -{ -/* always show the domain in /proc */ -return 1 ; -} -#ifdef CONFIG_NUMA static inline int pcibus_to_node (struct pci_bus *bus)
@@ -50,4 +28,7 @@ static inline int pcibus_to_node(struct pci_bus *bus)#endif /* CONFIG_PCI */ +/* Generic PCI */ +#include <asm-generic/pci.h> +#endif /* _ASM_RISCV_PCI_H */
arch/um/include/asm/pci.h +2 -22
@@ -4,28 +4,8 @@#include <linux/types.h> #include <asm/io.h> -#define PCIBIOS_MIN_IO 0 -#define PCIBIOS_MIN_MEM 0 - -#define pcibios_assign_all_busses () 1 - -extern int isa_dma_bridge_buggy; - -#ifdef CONFIG_PCI -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -/* no legacy IRQs */ -return -ENODEV ; -} -#endif - -#ifdef CONFIG_PCI_DOMAINS -static inline int pci_proc_domain (struct pci_bus *bus) -{ -/* always show the domain in /proc */ -return 1 ; -} -#endif /* CONFIG_PCI */ +/* Generic PCI */ +#include <asm-generic/pci.h> #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN /*
include/asm-generic/pci.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_GENERIC_PCI_H +#define __ASM_GENERIC_PCI_H + +#include <linux/types.h> + +#ifndef PCIBIOS_MIN_IO +#define PCIBIOS_MIN_IO 0 +#endif + +#define PCIBIOS_MIN_MEM 0 + +#ifndef pcibios_assign_all_busses +/* For bootloaders that do not initialize the PCI bus */ +#define pcibios_assign_all_busses () 1 +#endif + +extern int isa_dma_bridge_buggy; + +/* Enable generic resource mapping code in drivers/pci/ */ +#define ARCH_GENERIC_PCI_MMAP_RESOURCE + +#ifdef CONFIG_PCI + +static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +/* no legacy ide irq support */ +return -ENODEV ; +} + +static inline int pci_proc_domain (struct pci_bus *bus) +{ +/* always show the domain in /proc */ +return 1 ; +} + +#endif /* CONFIG_PCI */ + +#endif /* __ASM_GENERIC_PCI_H */
Signature · 7 lines
2.36.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Arnd Bergmann
maintainerRe: [RFC PATCH 2/2] asm-generic: Add new pci.h and use it
Quoted 4 lines · Stafford Horne
The
asm/pci.hused for many newer architectures share similar definitions. Move the common parts toasm-generic/pci.hto allow for sharing code.
This looks very nice, thanks for doing it!
Quoted 5 lines
Two things to note are:
-
isa_dma_bridge_buggy, traditionally this is defined inasm/dma.hbut these architectures avoid creating that file and add the definition toasm/pci.h.
I would prefer if we could just kill off this variable for non-x86, as it's only set to a nonzero value in two implementations that are both x86-specific and most of the references are gone. That does not have to be part of this series though, if you don't want to address it here, just add a comment to the new pci.h file.
Quoted 3 lines
-
ARCH_GENERIC_PCI_MMAP_RESOURCE, csky does not define this so we undefine it after includingasm-generic/pci.h. Why doesn't csky define it?
Adding David Woodhouse to Cc, as he introduced this interface. As I understand it, this was meant as a replacement for the old architecture specific pci_mmap_page_range interface, and is ideally used everywhere.
It's probably something that slipped through the review of csky and should have been there.
As an aside, it seems the pci_mmap_page_range() cleanup was left almost complete, with sparc being the only one left after David Miller found a problem with the generic code. Not sure if this was ever resolved:
https://lore.kernel.org/lkml/[email protected]/t/#u
include/asm-generic/pci.h line 12
Quoted 5 lines
include/asm-generic/pci.h new file +5
-0+#ifndef PCIBIOS_MIN_IO +#define PCIBIOS_MIN_IO 0 +#endif + +#define PCIBIOS_MIN_MEM 0
We should probably #ifdef both of these for consistency.
include/asm-generic/pci.h line 30
Quoted 5 lines
include/asm-generic/pci.h new file +5
-0+static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +/* no legacy ide irq support */ +return -ENODEV ; +}
And this can just go away now, according to what we found.
Arnd
Re: [RFC PATCH 2/2] asm-generic: Add new pci.h and use it
Quoted 14 lines · Arnd Bergmann
Quoted 4 lines · Stafford Horne
The
asm/pci.hused for many newer architectures share similar definitions. Move the common parts toasm-generic/pci.hto allow for sharing code.This looks very nice, thanks for doing it!
Quoted 5 lines
Two things to note are:
-
isa_dma_bridge_buggy, traditionally this is defined inasm/dma.hbut these architectures avoid creating that file and add the definition toasm/pci.h.
Quoted 5 lines
I would prefer if we could just kill off this variable for non-x86, as it's only set to a nonzero value in two implementations that are both x86-specific and most of the references are gone. That does not have to be part of this series though, if you don't want to address it here, just add a comment to the new
pci.hfile.
I will look at it, maybe in a v3.
Quoted 9 lines
Quoted 3 lines
-
ARCH_GENERIC_PCI_MMAP_RESOURCE, csky does not define this so we undefine it after includingasm-generic/pci.h. Why doesn't csky define it?Adding David Woodhouse to Cc, as he introduced this interface. As I understand it, this was meant as a replacement for the old architecture specific
pci_mmap_page_rangeinterface, and is ideally used everywhere.
Quoted 8 lines
It's probably something that slipped through the review of csky and should have been there.
As an aside, it seems the
pci_mmap_page_range()cleanup was left almost complete, with sparc being the only one left after David Miller found a problem with the generic code. Not sure if this was ever resolved:
https://lore.kernel.org/lkml/[email protected]/t/#u
I see, I will leave it foe now.
Quoted 7 lines
include/asm-generic/pci.h line 12
Quoted 5 lines
include/asm-generic/pci.h new file +5
-0+#ifndef PCIBIOS_MIN_IO +#define PCIBIOS_MIN_IO 0 +#endif + +#define PCIBIOS_MIN_MEM 0We should probably #ifdef both of these for consistency.
OK.
Quoted 7 lines
include/asm-generic/pci.h line 30
Quoted 5 lines
include/asm-generic/pci.h new file +5
-0+static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) +{ +/* no legacy ide irq support */ +return -ENODEV ; +}And this can just go away now, according to what we found.
Yeah, that will be nice.
-Stafford