Skip to contentSkip to conversation

Updates for asm-generic/pci.h

PATCH Superseded Stafford Horne 5 participants 21 messages Jul 17, 2022 – Jul 20, 2022 1 message not in the archive

Subsystems (22)
Arm (32-bit) x86 Sound PowerPC +18 more subsystems

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v2 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, this turns out to only be x86.

Next, we create the new pci.h definition.

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 (2):
asm-generic: Remove pci.h copying remaining code to x86
asm-generic: Add new pci.h and use it

 arch/alpha/include/asm/pci.h   |  1 -
 arch/arm64/include/asm/pci.h   | 12 +++------
 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    |  1 -
 arch/sparc/include/asm/pci.h   |  9 -------
 arch/um/include/asm/pci.h      | 24 ++---------------
 arch/x86/include/asm/pci.h     |  6 +++--
 arch/xtensa/include/asm/pci.h  |  3 ---
 include/asm-generic/pci.h      | 47 ++++++++++++++++++++++++----------
 13 files changed, 54 insertions(+), 107 deletions(-)
Signature · 1 line
2.36.1
#1 lore raw

PATCH v2 1/2 asm-generic: Remove pci.h copying remaining code to x86

The generic pci.h header now only provides a definition of pci_get_legacy_ide_irq which is used by architectures that support PNP. Of the architectures that use asm-generic/pci.h this is only x86.

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 x86. On other architectures we clean up any outstanding references.

---
 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    |  1 -
 arch/sparc/include/asm/pci.h   |  9 ---------
 arch/x86/include/asm/pci.h     |  6 ++++--
 arch/xtensa/include/asm/pci.h  |  3 ---
 include/asm-generic/pci.h      | 17 -----------------
 9 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 include/asm-generic/pci.h
arch/alpha/include/asm/pci.h +0 -1
index cf6bc1e64d66..8ac5af0fc4da 100644
@@ -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
index 8c163d1d0189..218412d963c2 100644
@@ -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
index 5a4bc223743b..0c272ff515cc 100644
@@ -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
index 915d6ee4b40a..f9da506751bb 100644
@@ -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
index fdb9745ee998..5889ddcbc374 100644
@@ -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/sparc/include/asm/pci.h +0 -9
index 4deddf430e5d..0c58f65bd172 100644
@@ -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 +4 -2
index f3fd5928bcbb..7da27f665cfe 100644
@@ -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 +0 -3
index 8e2b48a268db..b56de9635b6c 100644
@@ -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 */
include/asm-generic/pci.h deleted +0 -17
deleted file mode 100644
index 6bb3cd3d695a..000000000000
@@ -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
#2 lore raw

Re: [PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86

Hi Stafford,

Quoted 7 lines · Stafford Horne

The generic pci.h header now only provides a definition of pci_get_legacy_ide_irq which is used by architectures that support PNP. Of the architectures that use asm-generic/pci.h this is only x86.

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.

Quoted 6 lines

The existing code in pci.h is moved out to x86. On other architectures we clean up any outstanding references.

Thanks for your patch!

Quoted 8 lines
arch/m68k/include/asm/pci.h +0 -2
@@ -2,11 +2,14 @@
 #ifndef _ASM_M68K_PCI_H
 #define _ASM_M68K_PCI_H
 
-#include <asm-generic/pci.h>
-

arch/m68k/include/asm/pci.h line 14

Quoted 10 lines
arch/m68k/include/asm/pci.h +5 -0
 #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;
+}
+

I thought you were not going to add this?

Gr{oetje,eeting}s,

Geert

#3 lore raw

Re: [PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86

Quoted 33 lines · Geert Uytterhoeven

Hi Stafford,

Quoted 4 lines · Stafford Horne

The generic pci.h header now only provides a definition of pci_get_legacy_ide_irq which is used by architectures that support PNP. Of the architectures that use asm-generic/pci.h this is only x86.

Quoted 8 lines

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 x86. On other architectures we clean up any outstanding references.

Link:

https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/

Quoted 1 line

Thanks for your patch!

Quoted 13 lines
arch/m68k/include/asm/pci.h +0 -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
 
Quoted 9 lines

arch/m68k/include/asm/pci.h line 10

Quoted 1 line
arch/m68k/include/asm/pci.h +1 -0
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int

channel)

arch/m68k/include/asm/pci.h line 14

Quoted 4 lines
arch/m68k/include/asm/pci.h +4 -0
+{
+       return channel ? 15 : 14;
+}
+

I thought you were not going to add this?

I though so too. Somehow I lost track of a fixup.

I'll send a v3 tomorrow.

-Stafford

Quoted 1 line
#4 lore raw

Re: [PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86

In reply to Stafford Horne
Quoted 3 lines · Stafford Horne

The generic pci.h header now only provides a definition of pci_get_legacy_ide_irq which is used by architectures that support PNP. Of the architectures that use asm-generic/pci.h this is only x86.

Please move this into a separate header, ike legacy-ide.h. It doens't have anyting to do with actual PCI support.

maintainer
#5 lore raw

Re: [PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86

Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Stafford Horne

The generic pci.h header now only provides a definition of pci_get_legacy_ide_irq which is used by architectures that support PNP. Of the architectures that use asm-generic/pci.h this is only x86.

Please move this into a separate header, ike legacy-ide.h. It doens't have anyting to do with actual PCI support.

It looks like asm/libata-portmap.h is meant to have this information already, and this is what libata uses, while drivers/ide used the pci_get_legacy_ide_irq()
function for the same purpose.

Only ia64 and powerpc have interesting definitions of both, and they return the same thing, so I think this is sufficient to remove the last caller:

drivers/pnp/resource.c +1 -1
index 2fa0f7d55259..d7a6250589d6 100644
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #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 +322,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;

This is fine on the architectures that currently return an error from pci_get_legacy_ide_irq() but will change to returning 15/14 instead, because they do not support ISA devices, so pci_dev_uses_irq() will never be called either.

Arnd

#6 lore raw

Re: [PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86

Quoted 44 lines · Arnd Bergmann
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Stafford Horne

The generic pci.h header now only provides a definition of pci_get_legacy_ide_irq which is used by architectures that support PNP. Of the architectures that use asm-generic/pci.h this is only x86.

Please move this into a separate header, ike legacy-ide.h. It doens't have anyting to do with actual PCI support.

It looks like asm/libata-portmap.h is meant to have this information already, and this is what libata uses, while drivers/ide used the pci_get_legacy_ide_irq()
function for the same purpose.

Only ia64 and powerpc have interesting definitions of both, and they return the same thing, so I think this is sufficient to remove the last caller:

drivers/pnp/resource.c +3 -3
index 2fa0f7d55259..d7a6250589d6 100644
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #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 +322,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;
Quoted 4 lines

This is fine on the architectures that currently return an error from pci_get_legacy_ide_irq() but will change to returning 15/14 instead, because they do not support ISA devices, so pci_dev_uses_irq() will never be called either.

I like this, I didn't know about the ATA_PRIMARY_IRQ/ATA_SECONDARY_IRQ macro. Let me add this to the series before 1/2. I will keep you as the author via Signed-off-by annotation.

-Stafford

#7 lore raw

PATCH v2 2/2 asm-generic: Add new pci.h and use it

In reply to Stafford Horne

The 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?
- pci_get_legacy_ide_irq, This function is only used on architectures that support PNP. It is only maintained for arm64, in other architectures it is removed.

---
 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    | 36 ++++++++++++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 73 deletions(-)
 create mode 100644 include/asm-generic/pci.h
arch/arm64/include/asm/pci.h +3 -9
index b33ca260e3c9..1180e83712f5 100644
@@ -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,9 +17,6 @@
 	(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)
@@ -28,11 +24,9 @@ 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
index ebc765b1f78b..44866c1ad461 100644
@@ -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
index 7fd52a30e605..12ce8150cfb0 100644
@@ -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
index da13fd5519ef..34fe4921b5fa 100644
@@ -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 +36 -0
new file mode 100644
index 000000000000..fbc25741696a
@@ -0,0 +1,36 @@
+/* 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
+
+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_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
#8 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 5 lines · Stafford Horne

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.

This doesn't have anyting to do with PCI support. I think adding a separate header just for this that always stubs it out unless a config option is set (which x86 then selects) is the besy idea here. I also think the isa_dma_bridge_buggy needs to move out of the PCI code as well.

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

maintainer
#9 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 8 lines · Christoph Hellwig
Quoted 5 lines · Stafford Horne

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.

Quoted 5 lines

This doesn't have anyting to do with PCI support. I think adding a separate header just for this that always stubs it out unless a config option is set (which x86 then selects) is the besy idea here. I also think the isa_dma_bridge_buggy needs to move out of the PCI code as well.

Most architectures have it in asm/dma.h, which is probably the right place (if we end up keeping it), since this is for the ISA DMA API.

I would copy this declaration from x86

#ifdef CONFIG_PCI
extern int isa_dma_bridge_buggy;
#else
#define isa_dma_bridge_buggy (0)
#endif

to asm-generic/dma.h and remove it from arch/sh to avoid the one duplicate definition. The architectures that have the declaration in asm/pci.h (arm64, csky, riscv) already get the asm-generic version of asm/dma.h.

As mentioned before, it would be even better to just remove it entirely from everything except x86, and enclose the four references in an explicit "#ifdef X86_32". The variable declaration only exists because drivers/pci/quirks.c is compiled on all architecture, but the individual quirk is only active based on the PCI device ID of certain early PCI-ISA bridges.

Arnd

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

A message that is not in the archive (sent off-list or not yet received): CAAfxs740yz1vJmtFHOPTXT6fqi0+37SR_OhoGsONe4mx_21+_g@mail.gmail.com

maintainer
#11 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 10 lines · Stafford Horne
Quoted 7 lines · Arnd Bergmann

As mentioned before, it would be even better to just remove it entirely from everything except x86, and enclose the four references in an explicit "#ifdef X86_32". The variable declaration only exists because drivers/pci/quirks.c is compiled on all architecture, but the individual quirk is only active based on the PCI device ID of certain early PCI-ISA bridges.

Quoted 2 lines

Ok, I was thinking of that route but once I saw the pci device IDs I wasn't so sure it was limited to x86. I'll go ahead with that approach.

Ok, thanks!

I checked all the PCI IDs yesterday, and I'm fairly sure they are x86 specific. While some related products are general-purpose PCI-ISA bridges that have shown up on mips or arm boards, the ones listed here should all be safe.

Arnd

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#12 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 14 lines · Arnd Bergmann
Quoted 10 lines · Stafford Horne
Quoted 7 lines · Arnd Bergmann

As mentioned before, it would be even better to just remove it entirely from everything except x86, and enclose the four references in an explicit "#ifdef X86_32". The variable declaration only exists because drivers/pci/quirks.c is compiled on all architecture, but the individual quirk is only active based on the PCI device ID of certain early PCI-ISA bridges.

Quoted 2 lines

Ok, I was thinking of that route but once I saw the pci device IDs I wasn't so sure it was limited to x86. I'll go ahead with that approach.

Quoted 6 lines

Ok, thanks!

I checked all the PCI IDs yesterday, and I'm fairly sure they are x86 specific. While some related products are general-purpose PCI-ISA bridges that have shown up on mips or arm boards, the ones listed here should all be safe.

This is what I have now, I will add a similar patch between 1/2 and 2/2, if this looks ok.

It adds a few ifdef's which might be controversial but I think it provides more cleanup than added complexity. I compile tested with x86_64, x86_32 and OpenRISC.

arch/alpha/include/asm/dma.h +0 -9
index 28610ea7786d..a04d76b96089 100644
@@ -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
index 5b744f4b10a7..02431027ed2f 100644
@@ -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
index a81dda65c576..907d139be431 100644
@@ -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
index 59625e9c1f9c..eaed2626ffda 100644
@@ -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
index f6c5e0dfb4e5..1c8d9c5bc2fa 100644
@@ -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
index f801582be912..7484c9eb66c4 100644
@@ -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
index be726b943530..d6186e6bea7e 100644
@@ -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
index eea80ed34e6d..9e8c101de902 100644
@@ -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
index 6161a9596196..d97c66d9ae34 100644
@@ -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
index 6f26f35d4a71..dec1c4ce628c 100644
@@ -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
index 17d23ae98c77..c8bee3f985a2 100644
@@ -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
index 462e7c794a09..08043f35b110 100644
@@ -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 +3 -1
index 8e95aa4b0d17..0c34c658f57d 100644
@@ -309,10 +309,12 @@ extern void free_dma(unsigned int dmanr);
 
 /* From PCI */
 
+#ifdef CONFIG_X86_32
 #ifdef CONFIG_PCI
 extern int isa_dma_bridge_buggy;
 #else
 #define isa_dma_bridge_buggy	(0)
-#endif
+#endif /* CONFIG_PCI */
+#endif /* CONFIG_X86_32 */
 
 #endif /* _ASM_X86_DMA_H */
arch/xtensa/include/asm/dma.h +0 -7
index bb099a373b5a..172644539032 100644
@@ -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 +4 -0
index 700982464c53..508421809128 100644
@@ -104,8 +104,10 @@ unsigned int comedi_isadma_poll(struct comedi_isadma *dma)
 
 	flags = claim_dma_lock();
 	clear_dma_ff(desc->chan);
+#ifdef CONFIG_X86_32
 	if (!isa_dma_bridge_buggy)
 		disable_dma(desc->chan);
+#endif
 	result = get_dma_residue(desc->chan);
 	/*
 	 * Read the counter again and choose higher value in order to
@@ -113,8 +115,10 @@ unsigned int comedi_isadma_poll(struct comedi_isadma *dma)
 	 * isa_dma_bridge_buggy is set.
 	 */
 	result1 = get_dma_residue(desc->chan);
+#ifdef CONFIG_X86_32
 	if (!isa_dma_bridge_buggy)
 		enable_dma(desc->chan);
+#endif
 	release_dma_lock(flags);
 
 	if (result < result1)
drivers/pci/pci.c +2 -0
index cfaf40a540a8..60c55d2cb2cc 100644
@@ -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 +2 -0
index 41aeaa235132..cb7715a0f339 100644
@@ -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_dma
 DECLARE_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/asm-generic/pci.h +0 -2
index 556147983911..3ceb0cb12321 100644
@@ -18,8 +18,6 @@
 #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
 
sound/core/isadma.c +4 -0
index 1f45ede023b4..8a6397109c56 100644
@@ -73,8 +73,10 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
 
 	flags = claim_dma_lock();
 	clear_dma_ff(dma);
+#ifdef CONFIG_X86_32
 	if (!isa_dma_bridge_buggy)
 		disable_dma(dma);
+#endif
 	result = get_dma_residue(dma);
 	/*
 	 * HACK - read the counter again and choose higher value in order to
@@ -82,8 +84,10 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
 	 * isa_dma_bridge_buggy is set.
 	 */
 	result1 = get_dma_residue(dma);
+#ifdef CONFIG_X86_32
 	if (!isa_dma_bridge_buggy)
 		enable_dma(dma);
+#endif
 	release_dma_lock(flags);
 	if (unlikely(result < result1))
 		result = result1;

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

maintainer
#13 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

drivers/comedi/drivers/comedi_isadma.c unsigned int comedi_isadma_poll(struct comedi_isadma *dma) · line 110

Quoted 12 lines · Stafford Horne
drivers/comedi/drivers/comedi_isadma.c +2 -0
index 700982464c53..508421809128 100644
@@ -104,8 +104,10 @@ unsigned int comedi_isadma_poll(struct comedi_isadma *dma)
 
        flags = claim_dma_lock();
        clear_dma_ff(desc->chan);
+#ifdef CONFIG_X86_32
        if (!isa_dma_bridge_buggy)
                disable_dma(desc->chan);
+#endif

There is a logic mistake here: if we are on something other than x86-32, this always needs to call the disable_dma()/enable_dma().

Not sure how to best express this in a readable way, something like this would work:

#ifdef CONFIG_X86_32
if (!isa_dma_bridge_buggy)

#endif
               disable_dma(desc->chan);

or possibly at the start of this file, a

#ifndef CONFIG_X86_32
#define isa_dma_bridge_buggy 0
#endif

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

sound/core/isadma.c unsigned int snd_dma_pointer(unsigned long dma, unsigned int size) · line 81

Quoted 12 lines
sound/core/isadma.c +2 -0
@@ -73,8 +73,10 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
 
        flags = claim_dma_lock();
        clear_dma_ff(dma);
+#ifdef CONFIG_X86_32
        if (!isa_dma_bridge_buggy)
                disable_dma(dma);
+#endif
        result = get_dma_residue(dma);
        /*

Same here.

Arnd

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#14 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Stafford Horne
drivers/comedi/drivers/comedi_isadma.c +0 -0
index 700982464c53..508421809128 100644
@@ -104,8 +104,10 @@ unsigned int comedi_isadma_poll(struct comedi_isadma *dma)
 
Quoted 9 lines

drivers/comedi/drivers/comedi_isadma.c unsigned int comedi_isadma_poll(struct comedi_isadma *dma) · line 110

Quoted 6 lines
drivers/comedi/drivers/comedi_isadma.c +2 -0
        flags = claim_dma_lock();
        clear_dma_ff(desc->chan);
+#ifdef CONFIG_X86_32
        if (!isa_dma_bridge_buggy)
                disable_dma(desc->chan);
+#endif

There is a logic mistake here: if we are on something other than x86-32, this always needs to call the disable_dma()/enable_dma().

Oops, thats right. Sorry, I should have noticed that.

Quoted 2 lines

Not sure how to best express this in a readable way, something like this would work:

Option 1:

Quoted 7 lines

#ifdef CONFIG_X86_32
if (!isa_dma_bridge_buggy)

#endif
               disable_dma(desc->chan);

or possibly at the start of this file, a

Option 2:

Quoted 3 lines

#ifndef CONFIG_X86_32
#define isa_dma_bridge_buggy 0
#endif

Option 3:

Quoted 2 lines

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

Perhaps option 3 makes the whole patch the most clean.

-Stafford

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#15 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 40 lines · Stafford Horne
Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Stafford Horne
drivers/comedi/drivers/comedi_isadma.c +0 -0
index 700982464c53..508421809128 100644
@@ -104,8 +104,10 @@ unsigned int comedi_isadma_poll(struct comedi_isadma *dma)
 
Quoted 9 lines

drivers/comedi/drivers/comedi_isadma.c unsigned int comedi_isadma_poll(struct comedi_isadma *dma) · line 110

Quoted 6 lines
drivers/comedi/drivers/comedi_isadma.c +2 -0
        flags = claim_dma_lock();
        clear_dma_ff(desc->chan);
+#ifdef CONFIG_X86_32
        if (!isa_dma_bridge_buggy)
                disable_dma(desc->chan);
+#endif

There is a logic mistake here: if we are on something other than x86-32, this always needs to call the disable_dma()/enable_dma().

Oops, thats right. Sorry, I should have noticed that.

Quoted 2 lines

Not sure how to best express this in a readable way, something like this would work:

Option 1:

Quoted 7 lines

#ifdef CONFIG_X86_32
if (!isa_dma_bridge_buggy)

#endif
               disable_dma(desc->chan);

or possibly at the start of this file, a

Option 2:

Quoted 3 lines

#ifndef CONFIG_X86_32
#define isa_dma_bridge_buggy 0
#endif

Quoted 6 lines

Option 3:

Quoted 2 lines

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

Perhaps option 3 makes the whole patch the most clean.

And this is the result, I will get this into the series and create a v4 tomorrow if no issues.

-Stafford

--

arch/alpha/include/asm/dma.h +0 -9
index 28610ea7786d..a04d76b96089 100644
@@ -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
index 5b744f4b10a7..02431027ed2f 100644
@@ -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
index a81dda65c576..907d139be431 100644
@@ -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
index 59625e9c1f9c..eaed2626ffda 100644
@@ -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
index f6c5e0dfb4e5..1c8d9c5bc2fa 100644
@@ -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
index f801582be912..7484c9eb66c4 100644
@@ -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
index be726b943530..d6186e6bea7e 100644
@@ -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
index eea80ed34e6d..9e8c101de902 100644
@@ -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
index 6161a9596196..d97c66d9ae34 100644
@@ -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
index 6f26f35d4a71..dec1c4ce628c 100644
@@ -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
index 17d23ae98c77..c8bee3f985a2 100644
@@ -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
index 462e7c794a09..08043f35b110 100644
@@ -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
index 8e95aa4b0d17..8ae6e0e11b8b 100644
@@ -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
index bb099a373b5a..172644539032 100644
@@ -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 -0
index 700982464c53..1d470b0da34c 100644
@@ -8,6 +8,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/isa-dma.h>
 #include <asm/dma.h>
 #include <linux/comedi/comedidev.h>
 #include <linux/comedi/comedi_isadma.h>
drivers/pci/pci.c +2 -0
index cfaf40a540a8..60c55d2cb2cc 100644
@@ -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
index 41aeaa235132..6fc64509eee7 100644
@@ -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_dma
 DECLARE_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/asm-generic/pci.h +0 -2
index 556147983911..3ceb0cb12321 100644
@@ -18,8 +18,6 @@
 #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
 
include/linux/isa-dma.h new file +12 -0
new file mode 100644
index 000000000000..9514f0949fa1
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __LINUX_ISA_DMA_H
+#define __LINUX_ISA_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 -0
index 1f45ede023b4..9516cfb3d237 100644
@@ -12,6 +12,7 @@
 #undef HAVE_REALLY_SLOW_DMA_CONTROLLER
 
 #include <linux/export.h>
+#include <linux/isa-dma.h>
 #include <sound/core.h>
 #include <asm/dma.h>
 

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

maintainer
#16 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 6 lines · Stafford Horne
Quoted 1 line · Stafford Horne

On Tue, Jul 19, 2022 at 01:55:03PM +0200, Arnd Bergmann wrote:

And this is the result, I will get this into the series and create a v4 tomorrow if no issues.

Looks good to me, just one detail:

Quoted 8 lines
include/linux/isa-dma.h new file +2 -0
new file mode 100644
index 000000000000..9514f0949fa1
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+

include/linux/isa-dma.h line 12

Quoted 10 lines
include/linux/isa-dma.h new file +10 -0
+#ifndef __LINUX_ISA_DMA_H
+#define __LINUX_ISA_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 */

I would make this file #include <asm/dma.h> as a step towards making linux/isa-dma.h the official replacement for it in the driver api.

Including asm/dma.h from a driver is already a bit awkward, since we are generally moving towards including only linux/*.h type headers, and the dma.h name is too generic for something that is completely obsolete.

Arnd

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#17 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 32 lines · Arnd Bergmann
Quoted 6 lines · Stafford Horne
Quoted 1 line · Stafford Horne

On Tue, Jul 19, 2022 at 01:55:03PM +0200, Arnd Bergmann wrote:

And this is the result, I will get this into the series and create a v4 tomorrow if no issues.

Looks good to me, just one detail:

Quoted 8 lines
include/linux/isa-dma.h new file +2 -0
new file mode 100644
index 000000000000..9514f0949fa1
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+

include/linux/isa-dma.h line 12

Quoted 10 lines
include/linux/isa-dma.h new file +10 -0
+#ifndef __LINUX_ISA_DMA_H
+#define __LINUX_ISA_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 */

I would make this file #include <asm/dma.h> as a step towards making linux/isa-dma.h the official replacement for it in the driver api.

Quoted 3 lines

Including asm/dma.h from a driver is already a bit awkward, since we are generally moving towards including only linux/*.h type headers, and the dma.h name is too generic for something that is completely obsolete.

OK, that makes sense. Then I can remove the asm/dma.h include from:
- drivers/comedi/drivers/comedi_isadma.c
- sound/core/isadma.c

-Stafford

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#18 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

In reply to Stafford Horne
Quoted 7 lines · Stafford Horne
Quoted 4 lines
Quoted 2 lines

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

Perhaps option 3 makes the whole patch the most clean.

And this is the result, I will get this into the series and create a v4 tomorrow if no issues.

Yes, this is what I tried to suggest earlier and it looks fine to me. If we want to overengineer it we could add a ISA_DMA_BRIDGE_BUGGY Kconfig symbol and select it from x86.

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#19 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 4 lines · Christoph Hellwig
Quoted 3 lines · Stafford Horne
Quoted 3 lines
Quoted 2 lines

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Perhaps option 3 makes the whole patch the most clean.

And this is the result, I will get this into the series and create a v4 tomorrow if no issues.

Yes, this is what I tried to suggest earlier and it looks fine to me. If we want to overengineer it we could add a ISA_DMA_BRIDGE_BUGGY Kconfig symbol and select it from x86.

I left it as X86_32, I feel it it would be more confusing/hard to maintain to add the extra level of indirection.

-Stafford

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

#20 lore raw

RE: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

In reply to Stafford Horne

From: Stafford Horne

Quoted 42 lines

Sent: 19 July 2022 13:24

Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Stafford Horne
drivers/comedi/drivers/comedi_isadma.c +0 -0
index 700982464c53..508421809128 100644
@@ -104,8 +104,10 @@ unsigned int comedi_isadma_poll(struct comedi_isadma *dma)
 
Quoted 9 lines

drivers/comedi/drivers/comedi_isadma.c unsigned int comedi_isadma_poll(struct comedi_isadma *dma) · line 110

Quoted 6 lines
drivers/comedi/drivers/comedi_isadma.c +2 -0
        flags = claim_dma_lock();
        clear_dma_ff(desc->chan);
+#ifdef CONFIG_X86_32
        if (!isa_dma_bridge_buggy)
                disable_dma(desc->chan);
+#endif

There is a logic mistake here: if we are on something other than x86-32, this always needs to call the disable_dma()/enable_dma().

Oops, thats right. Sorry, I should have noticed that.

Quoted 2 lines

Not sure how to best express this in a readable way, something like this would work:

Option 1:

Quoted 7 lines

#ifdef CONFIG_X86_32
if (!isa_dma_bridge_buggy)

#endif
               disable_dma(desc->chan);

or possibly at the start of this file, a

Option 2:

Quoted 3 lines

#ifndef CONFIG_X86_32
#define isa_dma_bridge_buggy 0
#endif

Quoted 6 lines

Option 3:

Quoted 2 lines

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

Perhaps option 3 makes the whole patch the most clean.

Isn't there a define that can be used inside an if? So you could do:

		if (!IS_CONFIG_X86_32 || !isa_dma_bridge_buggy)
			disable_dma();

(but I can't remember the name!)

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)

#21 lore raw

Re: [PATCH v2 2/2] asm-generic: Add new pci.h and use it

Quoted 11 lines · David Laight

From: Stafford Horne

Quoted 10 lines

Sent: 19 July 2022 13:24

Quoted 1 line · Arnd Bergmann

On Tue, Jul 19, 2022 at 12:55 PM Stafford Horne <[email protected]> wrote:

Option 3:

Quoted 2 lines

Or we could try to keep the generic definition in a global header like linux/isa-dma.h.

Quoted 7 lines
Quoted 1 line

Perhaps option 3 makes the whole patch the most clean.

Isn't there a define that can be used inside an if? So you could do:

		if (!IS_CONFIG_X86_32 || !isa_dma_bridge_buggy)
			disable_dma();

(but I can't remember the name!)

I think you probably mean:

if (IS_ENABLED(CONFIG_X86_32) ... )

That could work too, but we still want to move the definition of isa_dma_bridge_buggy out of architectures and into the global header. I have gone with option 3 for now.

-Stafford

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um