Cleanups for asm-generic/pci.h
Subsystems (23)
v4 cover Cleanups 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 removing the old pci.h with the definition of pci_get_legacy_ide_irq completely. We replace it with references to ATA_PRIMARY_IRQ and ATA_SECONDARY_IRQ macros.
Next, we do further cleanups moving isa_dma_bridge_buggy to be only x86_32 specific. This avoids having to have it in dma.h or pci.h headers.
Next, we create the new pci.h definition.
Note, for the series, I am working on these fixups as part of adding PCI to OpenRISC. If the series is accepted I would like to merge via the OpenRISC tree with the OpenRISC PCI support patches to avoid having to coordinate upstream merges.
Since v3:
- We now completely remove pci_get_legacy_ide_irq and use libata.h macros.
- Added a new patch to remove isa_dma_bridge_buggy in architectures other than x86_32.
Since v2:
- Remove pci_get_legacy_ide_irq from m68k.
Since v1:
- Remove definition of pci_get_legacy_ide_irq on architectures not using CONFIG_PNP, which eliminated most.
- Add ifdef around PCIBIOS_MIN_MEM for consistency.
Stafford Horne (3):
PCI: Remove pci_get_legacy_ide_irq and asm-generic/pci.h
PCI: Move isa_dma_bridge_buggy out of dma.h
asm-generic: Add new pci.h and use it
arch/alpha/include/asm/dma.h | 9 ------ arch/alpha/include/asm/pci.h | 6 ---- arch/arc/include/asm/dma.h | 5 --- arch/arm/include/asm/dma.h | 6 ---- arch/arm/include/asm/pci.h | 5 --- arch/arm64/include/asm/pci.h | 18 ++--------- arch/csky/include/asm/pci.h | 24 +++----------- arch/ia64/include/asm/dma.h | 2 -- arch/ia64/include/asm/pci.h | 6 ---- arch/m68k/include/asm/dma.h | 6 ---- arch/m68k/include/asm/pci.h | 2 -- arch/microblaze/include/asm/dma.h | 6 ---- arch/mips/include/asm/dma.h | 8 ----- arch/mips/include/asm/pci.h | 6 ---- arch/parisc/include/asm/dma.h | 6 ---- arch/parisc/include/asm/pci.h | 5 --- arch/powerpc/include/asm/dma.h | 6 ---- arch/powerpc/include/asm/pci.h | 1 - arch/riscv/include/asm/pci.h | 25 ++------------- arch/s390/include/asm/dma.h | 6 ---- arch/s390/include/asm/pci.h | 1 - arch/sh/include/asm/dma.h | 6 ---- arch/sh/include/asm/pci.h | 6 ---- arch/sparc/include/asm/dma.h | 8 ----- arch/sparc/include/asm/pci.h | 9 ------ arch/um/include/asm/pci.h | 24 ++------------ arch/x86/include/asm/dma.h | 8 ----- arch/x86/include/asm/pci.h | 3 -- arch/xtensa/include/asm/dma.h | 7 ----- arch/xtensa/include/asm/pci.h | 3 -- drivers/comedi/drivers/comedi_isadma.c | 2 +- drivers/pci/pci.c | 2 ++ drivers/pci/quirks.c | 4 ++- drivers/pnp/resource.c | 5 +-- include/asm-generic/pci.h | 43 +++++++++++++++++--------- include/linux/isa-dma.h | 14 +++++++++ sound/core/isadma.c | 2 +- 37 files changed, 64 insertions(+), 241 deletions(-) create mode 100644 include/linux/isa-dma.h
Signature · 1 line
2.36.1
PATCH v4 1/3 PCI: Remove pci_get_legacy_ide_irq and asm-generic/pci.h
The definition of the pci header function pci_get_legacy_ide_irq is only used in platforms that support PNP. So many of the architecutres where it is defined do not use it. This also means we can remove asm-generic/pci.h as all it provides is a definition of pci_get_legacy_ide_irq.
Where referenced, replace the usage of pci_get_legacy_ide_irq with the libata.h macros ATA_PRIMARY_IRQ and ATA_SECONDARY_IRQ which provide the same functionality. This allows removing pci_get_legacy_ide_irq from headers where it is no longer used.
---
Since v3:
- Further remove the definictions of pci_get_legacy_ide_irq from x86 and use the libata macros.
- Add Acked-bys.
arch/alpha/include/asm/pci.h | 6 ------ arch/arm/include/asm/pci.h | 5 ----- arch/arm64/include/asm/pci.h | 6 ------ arch/ia64/include/asm/pci.h | 6 ------ arch/m68k/include/asm/pci.h | 2 -- arch/mips/include/asm/pci.h | 6 ------ arch/parisc/include/asm/pci.h | 5 ----- arch/powerpc/include/asm/pci.h | 1 - arch/s390/include/asm/pci.h | 1 - arch/sh/include/asm/pci.h | 6 ------ arch/sparc/include/asm/pci.h | 9 --------- arch/x86/include/asm/pci.h | 3 --- arch/xtensa/include/asm/pci.h | 3 --- drivers/pnp/resource.c | 5 +++-- include/asm-generic/pci.h | 17 ----------------- 15 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 include/asm-generic/pci.h
arch/alpha/include/asm/pci.h +0 -6
@@ -56,12 +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 ; -} -#define pci_domain_nr (bus) ((struct pci_controller *)(bus)->sysdata)->indexstatic inline int pci_proc_domain (struct pci_bus *bus)
arch/arm/include/asm/pci.h +0 -5
@@ -22,11 +22,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)#define HAVE_PCI_MMAP #define ARCH_GENERIC_PCI_MMAP_RESOURCE -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -extern void pcibios_report_status (unsigned int status_mask,int warn);#endif /* __KERNEL__ */
arch/arm64/include/asm/pci.h +0 -6
@@ -23,12 +23,6 @@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 ;
arch/ia64/include/asm/pci.h +0 -6
@@ -63,10 +63,4 @@ 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 ); -} -#endif /* _ASM_IA64_PCI_H */
arch/m68k/include/asm/pci.h +0 -2
@@ -2,8 +2,6 @@#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
arch/mips/include/asm/pci.h +0 -6
@@ -139,10 +139,4 @@ static inline int pci_proc_domain(struct pci_bus *bus)/* Do platform specific device initialization at pci_enable_device() time */ extern int pcibios_plat_dev_init (struct pci_dev *dev); -/* Chances are this interrupt is wired PC-style ... */ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#endif /* _ASM_PCI_H */
arch/parisc/include/asm/pci.h +0 -5
@@ -162,11 +162,6 @@ extern void pcibios_init_bridge(struct pci_dev *);#define PCIBIOS_MIN_IO 0x10#define PCIBIOS_MIN_MEM 0x1000/* NBPG - but pci/setup-res.c dies */ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#define HAVE_PCI_MMAP #define ARCH_GENERIC_PCI_MMAP_RESOURCE
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 +0 -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>
arch/sh/include/asm/pci.h +0 -6
@@ -88,10 +88,4 @@ static inline int pci_proc_domain(struct pci_bus *bus) return hose->need_domain_info; } -/* Chances are this interrupt is wired PC-style ... */ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#endif /* __ASM_SH_PCI_H */
arch/sparc/include/asm/pci.h +0 -9
@@ -40,13 +40,4 @@ static inline int pci_proc_domain(struct pci_bus *bus)#define get_pci_unmapped_area get_fb_unmapped_area#endif /* CONFIG_SPARC64 */ -#if defined(CONFIG_SPARC64 ) || defined(CONFIG_LEON_PCI ) -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return PCI_IRQ_NONE ; -} -#else -#include <asm-generic/pci.h> -#endif -#endif /* ___ASM_SPARC_PCI_H */
arch/x86/include/asm/pci.h +0 -3
@@ -105,9 +105,6 @@ static inline void early_quirks(void) { }extern void pci_iommu_alloc (void ); -/* generic pci stuff */ -#include <asm-generic/pci.h> -#ifdef CONFIG_NUMA /* Returns the node based on pci bus */ static inline int __pcibus_to_node (const struct pci_bus *bus)
arch/xtensa/include/asm/pci.h +0 -3
@@ -43,7 +43,4 @@#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1#define arch_can_pci_mmap_io () 1 -/* Generic PCI */ -#include <asm-generic/pci.h> -#endif /* _XTENSA_PCI_H */
drivers/pnp/resource.c +3 -2
@@ -17,6 +17,7 @@#include <asm/dma.h> #include <asm/irq.h> #include <linux/pci.h> +#include <linux/libata.h> #include <linux/ioport.h> #include <linux/init.h>
@@ -322,8 +323,8 @@ static int pci_dev_uses_irq(struct pnp_dev *pnp, struct pci_dev *pci,* treat the compatibility IRQs as busy. */ if ((progif &0x5 ) !=0x5 ) -if (pci_get_legacy_ide_irq (pci,0 ) == irq || -pci_get_legacy_ide_irq (pci,1 ) == irq) { +if (ATA_PRIMARY_IRQ (pci) == irq || +ATA_SECONDARY_IRQ (pci) == irq) {pnp_dbg (&pnp->dev," legacy IDE device %s " "using irq %d\n" ,pci_name (pci), irq);return 1 ;
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
Re: [PATCH v4 1/3] PCI: Remove pci_get_legacy_ide_irq and asm-generic/pci.h
Looks good:
Re: [PATCH v4 1/3] PCI: Remove pci_get_legacy_ide_irq and asm-generic/pci.h
In reply to Stafford HorneQuoted 12 lines · Stafford Horne
The definition of the pci header function
pci_get_legacy_ide_irqis only used in platforms that support PNP. So many of the architecutres where it is defined do not use it. This also means we can removeasm-generic/pci.has all it provides is a definition ofpci_get_legacy_ide_irq.Where referenced, replace the usage of
pci_get_legacy_ide_irqwith thelibata.hmacrosATA_PRIMARY_IRQandATA_SECONDARY_IRQwhich provide the same functionality. This allows removingpci_get_legacy_ide_irqfrom headers where it is no longer used.
Quoted 4 lines
Acked-by Pierre Morel <[email protected]>Co-developed-by Arnd Bergmann <[email protected]>Signed-off-by Stafford Horne <[email protected]>
Quoted 266 lines
---
Since v3:
- Further remove the definictions ofpci_get_legacy_ide_irqfrom x86 and use the libata macros.
- Add Acked-bys.arch/alpha/include/asm/pci.h | 6 ------ arch/arm/include/asm/pci.h | 5 ----- arch/arm64/include/asm/pci.h | 6 ------ arch/ia64/include/asm/pci.h | 6 ------ arch/m68k/include/asm/pci.h | 2 -- arch/mips/include/asm/pci.h | 6 ------ arch/parisc/include/asm/pci.h | 5 ----- arch/powerpc/include/asm/pci.h | 1 - arch/s390/include/asm/pci.h | 1 - arch/sh/include/asm/pci.h | 6 ------ arch/sparc/include/asm/pci.h | 9 --------- arch/x86/include/asm/pci.h | 3 --- arch/xtensa/include/asm/pci.h | 3 --- drivers/pnp/resource.c | 5 +++-- include/asm-generic/pci.h | 17 ----------------- 15 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 include/asm-generic/pci.harch/alpha/include/asm/pci.h +0
-6@@ -56,12 +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 ; -} -#define pci_domain_nr (bus) ((struct pci_controller *)(bus)->sysdata)->indexstatic inline int pci_proc_domain (struct pci_bus *bus)arch/arm/include/asm/pci.h +0
-5@@ -22,11 +22,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)#define HAVE_PCI_MMAP #define ARCH_GENERIC_PCI_MMAP_RESOURCE -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -extern void pcibios_report_status (unsigned int status_mask,int warn);#endif /* __KERNEL__ */ arch/arm64/include/asm/pci.h +0
-6@@ -23,12 +23,6 @@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 ;arch/ia64/include/asm/pci.h +0
-6@@ -63,10 +63,4 @@ 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 ); -} -#endif /* _ASM_IA64_PCI_H */ arch/m68k/include/asm/pci.h +0
-2@@ -2,8 +2,6 @@#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 0x00000100arch/mips/include/asm/pci.h +0
-6@@ -139,10 +139,4 @@ static inline int pci_proc_domain(struct pci_bus *bus)/* Do platform specific device initialization at pci_enable_device() time */ extern int pcibios_plat_dev_init (struct pci_dev *dev); -/* Chances are this interrupt is wired PC-style ... */ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#endif /* _ASM_PCI_H */ arch/parisc/include/asm/pci.h +0
-5@@ -162,11 +162,6 @@ extern void pcibios_init_bridge(struct pci_dev *);#define PCIBIOS_MIN_IO 0x10#define PCIBIOS_MIN_MEM 0x1000/* NBPG - but pci/setup-res.c dies */ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#define HAVE_PCI_MMAP #define ARCH_GENERIC_PCI_MMAP_RESOURCE 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 +0
-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> arch/sh/include/asm/pci.h +0
-6@@ -88,10 +88,4 @@ static inline int pci_proc_domain(struct pci_bus *bus) return hose->need_domain_info; } -/* Chances are this interrupt is wired PC-style ... */ -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return channel ?15 :14 ; -} -#endif /* __ASM_SH_PCI_H */ arch/sparc/include/asm/pci.h +0
-9@@ -40,13 +40,4 @@ static inline int pci_proc_domain(struct pci_bus *bus)#define get_pci_unmapped_area get_fb_unmapped_area#endif /* CONFIG_SPARC64 */ -#if defined(CONFIG_SPARC64 ) || defined(CONFIG_LEON_PCI ) -static inline int pci_get_legacy_ide_irq (struct pci_dev *dev,int channel) -{ -return PCI_IRQ_NONE ; -} -#else -#include <asm-generic/pci.h> -#endif -#endif /* ___ASM_SPARC_PCI_H */ arch/x86/include/asm/pci.h +0
-3@@ -105,9 +105,6 @@ static inline void early_quirks(void) { }extern void pci_iommu_alloc (void ); -/* generic pci stuff */ -#include <asm-generic/pci.h> -#ifdef CONFIG_NUMA /* Returns the node based on pci bus */ static inline int __pcibus_to_node (const struct pci_bus *bus)arch/xtensa/include/asm/pci.h +0
-3@@ -43,7 +43,4 @@#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1#define arch_can_pci_mmap_io () 1 -/* Generic PCI */ -#include <asm-generic/pci.h> -#endif /* _XTENSA_PCI_H */ drivers/pnp/resource.c +3
-2@@ -17,6 +17,7 @@#include <asm/dma.h> #include <asm/irq.h> #include <linux/pci.h> +#include <linux/libata.h> #include <linux/ioport.h> #include <linux/init.h> @@ -322,8 +323,8 @@ static int pci_dev_uses_irq(struct pnp_dev *pnp, struct pci_dev *pci,* treat the compatibility IRQs as busy. */ if ((progif &0x5 ) !=0x5 ) -if (pci_get_legacy_ide_irq (pci,0 ) == irq || -pci_get_legacy_ide_irq (pci,1 ) == irq) { +if (ATA_PRIMARY_IRQ (pci) == irq || +ATA_SECONDARY_IRQ (pci) == irq) {pnp_dbg (&pnp->dev," legacy IDE device %s " "using irq %d\n" ,pci_name (pci), irq);return 1 ;include/asm-generic/pci.h deleted +0
-18@@ -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 */ --2.36.1
PATCH v4 2/3 PCI: Move isa_dma_bridge_buggy out of dma.h
In reply to Stafford HorneDuring recent PCI cleanups we noticed that the isa_dma_bridge_buggy symbol supported by all architectures is actually only used for x86_32.
This patch moves the symbol out of all architectures limiting usage to only x86_32. This is possible because only x86_32 platforms or quirks existing in PCI devices supported on x86_32 ever set this. A new global header linux/isa-dma.h is added to provide a common place to maintain the definition.
---
Since v3:
- New patch.
arch/alpha/include/asm/dma.h | 9 --------- arch/arc/include/asm/dma.h | 5 ----- arch/arm/include/asm/dma.h | 6 ------ arch/ia64/include/asm/dma.h | 2 -- arch/m68k/include/asm/dma.h | 6 ------ arch/microblaze/include/asm/dma.h | 6 ------ arch/mips/include/asm/dma.h | 8 -------- arch/parisc/include/asm/dma.h | 6 ------ arch/powerpc/include/asm/dma.h | 6 ------ arch/s390/include/asm/dma.h | 6 ------ arch/sh/include/asm/dma.h | 6 ------ arch/sparc/include/asm/dma.h | 8 -------- arch/x86/include/asm/dma.h | 8 -------- arch/xtensa/include/asm/dma.h | 7 ------- drivers/comedi/drivers/comedi_isadma.c | 2 +- drivers/pci/pci.c | 2 ++ drivers/pci/quirks.c | 4 +++- include/linux/isa-dma.h | 14 ++++++++++++++ sound/core/isadma.c | 2 +- 19 files changed, 21 insertions(+), 92 deletions(-) create mode 100644 include/linux/isa-dma.h
arch/alpha/include/asm/dma.h +0 -9
@@ -365,13 +365,4 @@ extern void free_dma(unsigned int dmanr); /* release it again */#define KERNEL_HAVE_CHECK_DMA extern int check_dma (unsigned int dmanr); -/* From PCI */ - -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif - -#endif /* _ASM_DMA_H */
arch/arc/include/asm/dma.h +0 -5
@@ -7,10 +7,5 @@#define ASM_ARC_DMA_H #define MAX_DMA_ADDRESS 0xC0000000 -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy 0 -#endif #endif
arch/arm/include/asm/dma.h +0 -6
@@ -143,10 +143,4 @@ extern int get_dma_residue(unsigned int chan);#endif /* CONFIG_ISA_DMA_API */ -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* __ASM_ARM_DMA_H */
arch/ia64/include/asm/dma.h +0 -2
@@ -12,8 +12,6 @@extern unsigned long MAX_DMA_ADDRESS ; -extern int isa_dma_bridge_buggy; -#define free_dma (x)#endif /* _ASM_IA64_DMA_H */
arch/m68k/include/asm/dma.h +0 -6
@@ -6,10 +6,4 @@bootmem allocator (but this should do it for this) */ #define MAX_DMA_ADDRESS PAGE_OFFSET -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* _M68K_DMA_H */
arch/microblaze/include/asm/dma.h +0 -6
@@ -9,10 +9,4 @@/* Virtual address corresponding to last available physical memory address. */ #define MAX_DMA_ADDRESS (CONFIG_KERNEL_START + memory_size - 1) -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* _ASM_MICROBLAZE_DMA_H */
arch/mips/include/asm/dma.h +0 -8
@@ -307,12 +307,4 @@ static __inline__ int get_dma_residue(unsigned int dmanr)extern int request_dma (unsigned int dmanr,const char * device_id);/* reserve a DMA channel */ extern void free_dma (unsigned int dmanr);/* release it again */ -/* From PCI */ - -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* _ASM_DMA_H */
arch/parisc/include/asm/dma.h +0 -6
@@ -176,10 +176,4 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count)#define free_dma (dmanr) -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* _ASM_DMA_H */
arch/powerpc/include/asm/dma.h +0 -6
@@ -340,11 +340,5 @@ extern int request_dma(unsigned int dmanr, const char *device_id);/* release it again */ extern void free_dma (unsigned int dmanr); -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_DMA_H */
arch/s390/include/asm/dma.h +0 -6
@@ -11,10 +11,4 @@*/ #define MAX_DMA_ADDRESS 0x80000000 -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* _ASM_S390_DMA_H */
arch/sh/include/asm/dma.h +0 -6
@@ -137,10 +137,4 @@ extern int register_chan_caps(const char *dmac, struct dma_chan_caps *capslist);extern int dma_create_sysfs_files (struct dma_channel *,struct dma_info *);extern void dma_remove_sysfs_files (struct dma_channel *,struct dma_info *); -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* __ASM_SH_DMA_H */
arch/sparc/include/asm/dma.h +0 -8
@@ -82,14 +82,6 @@#define DMA_BURST64 0x40#define DMA_BURSTBITS 0x7f -/* From PCI */ - -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#ifdef CONFIG_SPARC32 struct device ;
arch/x86/include/asm/dma.h +0 -8
@@ -307,12 +307,4 @@ extern int request_dma(unsigned int dmanr, const char *device_id);extern void free_dma (unsigned int dmanr);#endif -/* From PCI */ - -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif -#endif /* _ASM_X86_DMA_H */
arch/xtensa/include/asm/dma.h +0 -7
@@ -52,11 +52,4 @@extern int request_dma (unsigned int dmanr,const char * device_id);extern void free_dma (unsigned int dmanr); -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else -#define isa_dma_bridge_buggy (0) -#endif - -#endif
drivers/comedi/drivers/comedi_isadma.c +1 -1
@@ -8,7 +8,7 @@#include <linux/slab.h> #include <linux/delay.h> #include <linux/dma-mapping.h> -#include <asm/dma.h> +#include <linux/isa-dma.h> #include <linux/comedi/comedidev.h> #include <linux/comedi/comedi_isadma.h>
drivers/pci/pci.c +2 -0
@@ -41,8 +41,10 @@ const char *pci_power_names[] = { };EXPORT_SYMBOL_GPL (pci_power_names); +#ifdef CONFIG_X86_32 int isa_dma_bridge_buggy;EXPORT_SYMBOL (isa_dma_bridge_buggy); +#endif int pci_pci_problems;EXPORT_SYMBOL (pci_pci_problems);
drivers/pci/quirks.c +3 -1
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/export.h> #include <linux/pci.h> +#include <linux/isa-dma.h> /* isa_dma_bridge_buggy */ #include <linux/init.h> #include <linux/delay.h> #include <linux/acpi.h>
@@ -30,7 +31,6 @@#include <linux/pm_runtime.h> #include <linux/suspend.h> #include <linux/switchtec.h> -#include <asm/dma.h> /* isa_dma_bridge_buggy */ #include "pci.h" static ktime_t fixup_debug_start(struct pci_dev *dev,
@@ -239,6 +239,7 @@ static void quirk_passive_release(struct pci_dev *dev)DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82441 , quirk_passive_release);DECLARE_PCI_FIXUP_RESUME (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82441 , quirk_passive_release); +#ifdef CONFIG_X86_32 /* * The VIA VP2/VP3/MVP3 seem to have some 'features'. There may be a * workaround but VIA don't answer queries. If you happen to have good
@@ -265,6 +266,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, quirk_isa_dmaDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_NEC ,PCI_DEVICE_ID_NEC_CBUS_1 , quirk_isa_dma_hangs);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_NEC ,PCI_DEVICE_ID_NEC_CBUS_2 , quirk_isa_dma_hangs);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_NEC ,PCI_DEVICE_ID_NEC_CBUS_3 , quirk_isa_dma_hangs); +#endif /* * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear
include/linux/isa-dma.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_ISA_DMA_H +#define __LINUX_ISA_DMA_H + +#include <asm/dma.h> + +#if defined(CONFIG_PCI ) && defined(CONFIG_X86_32 ) +extern int isa_dma_bridge_buggy; +#else +#define isa_dma_bridge_buggy (0) +#endif + +#endif /* __LINUX_ISA_DMA_H */
sound/core/isadma.c +1 -1
@@ -12,8 +12,8 @@#undef HAVE_REALLY_SLOW_DMA_CONTROLLER#include <linux/export.h> +#include <linux/isa-dma.h> #include <sound/core.h> -#include <asm/dma.h> /** * snd_dma_program - program an ISA DMA transfer
Signature · 1 line
2.36.1
Re: [PATCH v4 2/3] PCI: Move isa_dma_bridge_buggy out of dma.h
Quoted 9 lines · Stafford Horne
During recent PCI cleanups we noticed that the
isa_dma_bridge_buggysymbol supported by all architectures is actually only used forx86_32.This patch moves the symbol out of all architectures limiting usage to only
x86_32. This is possible because onlyx86_32platforms or quirks existing in PCI devices supported onx86_32ever set this. A new global headerlinux/isa-dma.his added to provide a common place to maintain the definition.
Quoted 8 lines
Suggested-by Arnd Bergmann <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Signed-off-by Stafford Horne <[email protected]>---
Since v3:
- New patch.arch/m68k/include/asm/dma.h | 6 ------
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v4 2/3] PCI: Move isa_dma_bridge_buggy out of dma.h
In reply to Stafford HorneLooks good:
PATCH v4 3/3 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.
One thing to note:
- 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?
---
Since v3:
- Remove notes about pci_get_legacy_ide_irq and isa_dma_bridge_buggy.
- Change ifdef around pci_proc_domain to use CONFIG_PCI_DOMAINS to avoid compile failure on User Mode linux.
arch/arm64/include/asm/pci.h | 12 ++---------- 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 | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 74 deletions(-) create mode 100644 include/asm-generic/pci.h
arch/arm64/include/asm/pci.h +2 -10
@@ -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,15 +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_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 +32 -0
@@ -0,0 +1,32 @@ +/* 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 + +#ifndef PCIBIOS_MIN_MEM +#define PCIBIOS_MIN_MEM 0 +#endif + +#ifndef pcibios_assign_all_busses +/* For bootloaders that do not initialize the PCI bus */ +#define pcibios_assign_all_busses () 1 +#endif + +/* Enable generic resource mapping code in drivers/pci/ */ +#define ARCH_GENERIC_PCI_MMAP_RESOURCE + +#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_DOMAINS */ + +#endif /* __ASM_GENERIC_PCI_H */
Signature · 1 line
2.36.1
Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it
Quoted 10 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.One thing to note:
-
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?
If you want to resolve this, I think the easiest way is to add a patch that sets this
in csky, I'm quite sure this was just a mistake on their end.
Quoted 5 lines
Either way:
Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it
In reply to Stafford HorneLooks good:
Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it
In reply to Stafford HorneQuoted 20 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.One thing to note:
-
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?Suggested-by Arnd Bergmann <[email protected]>Link https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ open hereAcked-by Pierre Morel <[email protected]>Signed-off-by Stafford Horne <[email protected]>arch/arm64/include/asm/pci.h +0
-0
arch/arm64/include/asm/pci.h
Quoted 2 lines
arch/arm64/include/asm/pci.h +0
-1-extern int isa_dma_bridge_buggy;
Shouldn't this go in the previous patch? The only definition of a isa_dma_bridge_buggy variable is in drivers/pci/pci.c, and it's under #ifdef CONFIG_X86_32.
Same for csky, riscv, um?
Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it
Quoted 23 lines · Bjorn Helgaas
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.Quoted 8 lines
One thing to note:
-
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?Suggested-by Arnd Bergmann <[email protected]>Link:
https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/
Quoted 8 lines
Acked-by Pierre Morel <[email protected]>Signed-off-by Stafford Horne <[email protected]>arch/arm64/include/asm/pci.h +0
-0
Quoted 8 lines
Quoted 1 line
-extern int
isa_dma_bridge_buggy;Shouldn't this go in the previous patch? The only definition of a
isa_dma_bridge_buggyvariable is indrivers/pci/pci.c, and it's under #ifdefCONFIG_X86_32.Same for csky, riscv, um?
Yes, you are right. I re ordered the patches and this didn't get into the right patch. Thanks for catching this. I'll fix.
- Stafford