From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 References: <20220720131934.373932-4-shorne@gmail.com> <20220720224238.GA1666095@bhelgaas> In-Reply-To: <20220720224238.GA1666095@bhelgaas> From: Stafford Horne Date: Thu, 21 Jul 2022 08:34:10 +0900 Message-ID: Subject: Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it Content-Type: multipart/alternative; boundary="000000000000de852405e4450af1" To: Bjorn Helgaas Cc: LKML , Arnd Bergmann , Pierre Morel , Geert Uytterhoeven , Catalin Marinas , Will Deacon , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Richard Weinberger , Anton Ivanov , Johannes Berg , Bjorn Helgaas , linux-arm , linux-csky@vger.kernel.org, linux-riscv , linux-um , linux-pci , linux-arch List-ID: --000000000000de852405e4450af1 Content-Type: text/plain; charset="UTF-8" On Thu, Jul 21, 2022, 7:42 AM Bjorn Helgaas wrote: > On Wed, Jul 20, 2022 at 10:19:34PM +0900, Stafford Horne wrote: > > 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. > > > > 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? > > > > Suggested-by: Arnd Bergmann > > Link: > https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ > > Acked-by: Pierre Morel > > Acked-by: Geert Uytterhoeven > > Signed-off-by: Stafford Horne > > > diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h > > index 0aebc3488c32..016eb6b46dc0 100644 > > --- a/arch/arm64/include/asm/pci.h > > +++ b/arch/arm64/include/asm/pci.h > > > -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? > 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 > --000000000000de852405e4450af1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Jul 21, 2022, 7:42 AM Bjorn Helgaas <helgaas@kernel.org> wrote:
=
On Wed, Jul 20, 2022 at 10:19:34PM +0900, St= afford Horne wrote:
> The asm/pci.h used for many newer architectures share similar
> definitions.=C2=A0 Move the common parts to asm-generic/pci.h to allow= for
> sharing code.
>
> One thing to note:
>
>=C2=A0 - ARCH_GENERIC_PCI_MMAP_RESOURCE, csky does not define this so w= e
>=C2=A0 =C2=A0 undefine it after including asm-generic/pci.h.=C2=A0 Why = doesn't csky
>=C2=A0 =C2=A0 define it?
>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn= =3DJbvf=3DnkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/
> Acked-by: Pierre Morel <pmorel@linux.ibm.com>
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Stafford Horne <shorne@gmail.com>

> diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci= .h
> index 0aebc3488c32..016eb6b46dc0 100644
> --- a/arch/arm64/include/asm/pci.h
> +++ b/arch/arm64/include/asm/pci.h

> -extern int isa_dma_bridge_buggy;

Shouldn't this go in the previous patch?=C2=A0 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?
Yes, you are right. I re ordered the patches and t= his didn't get into the right patch.=C2=A0 Thanks for catching this. I&= #39;ll fix.

- Stafford= =C2=A0
--000000000000de852405e4450af1-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 20 Jul 2022 17:42:38 -0500 From: Bjorn Helgaas Subject: Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it Message-ID: <20220720224238.GA1666095@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220720131934.373932-4-shorne@gmail.com> To: Stafford Horne Cc: LKML , Arnd Bergmann , Pierre Morel , Geert Uytterhoeven , Catalin Marinas , Will Deacon , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Richard Weinberger , Anton Ivanov , Johannes Berg , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, linux-um@lists.infradead.org, linux-pci@vger.kernel.org, linux-arch@vger.kernel.org List-ID: On Wed, Jul 20, 2022 at 10:19:34PM +0900, Stafford Horne wrote: > 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. > > 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? > > Suggested-by: Arnd Bergmann > Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ > Acked-by: Pierre Morel > Acked-by: Geert Uytterhoeven > Signed-off-by: Stafford Horne > diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h > index 0aebc3488c32..016eb6b46dc0 100644 > --- a/arch/arm64/include/asm/pci.h > +++ b/arch/arm64/include/asm/pci.h > -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? From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 20 Jul 2022 10:43:59 -0700 From: Christoph Hellwig Subject: Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it Message-ID: References: <20220720131934.373932-1-shorne@gmail.com> <20220720131934.373932-4-shorne@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220720131934.373932-4-shorne@gmail.com> To: Stafford Horne Cc: LKML , Arnd Bergmann , Pierre Morel , Geert Uytterhoeven , Catalin Marinas , Will Deacon , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Richard Weinberger , Anton Ivanov , Johannes Berg , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, linux-um@lists.infradead.org, linux-pci@vger.kernel.org, linux-arch@vger.kernel.org List-ID: Looks good: Reviewed-by: Christoph Hellwig From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 References: <20220720131934.373932-1-shorne@gmail.com> <20220720131934.373932-4-shorne@gmail.com> In-Reply-To: <20220720131934.373932-4-shorne@gmail.com> From: Arnd Bergmann Date: Wed, 20 Jul 2022 17:12:27 +0200 Message-ID: Subject: Re: [PATCH v4 3/3] asm-generic: Add new pci.h and use it Content-Type: text/plain; charset="UTF-8" To: Stafford Horne Cc: LKML , Arnd Bergmann , Pierre Morel , Geert Uytterhoeven , Catalin Marinas , Will Deacon , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Richard Weinberger , Anton Ivanov , Johannes Berg , Bjorn Helgaas , Linux ARM , linux-csky@vger.kernel.org, linux-riscv , linux-um , linux-pci , linux-arch List-ID: On Wed, Jul 20, 2022 at 3:19 PM Stafford Horne wrote: > > 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. > > 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? 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. > Suggested-by: Arnd Bergmann > Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ > Acked-by: Pierre Morel > Acked-by: Geert Uytterhoeven > Signed-off-by: Stafford Horne Either way: Reviewed-by: Arnd Bergmann From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Stafford Horne Subject: [PATCH v4 3/3] asm-generic: Add new pci.h and use it Date: Wed, 20 Jul 2022 22:19:34 +0900 Message-Id: <20220720131934.373932-4-shorne@gmail.com> In-Reply-To: <20220720131934.373932-1-shorne@gmail.com> References: <20220720131934.373932-1-shorne@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: LKML Cc: Arnd Bergmann , Stafford Horne , Pierre Morel , Geert Uytterhoeven , Catalin Marinas , Will Deacon , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Richard Weinberger , Anton Ivanov , Johannes Berg , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, linux-um@lists.infradead.org, linux-pci@vger.kernel.org, linux-arch@vger.kernel.org List-ID: 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. 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? Suggested-by: Arnd Bergmann Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ Acked-by: Pierre Morel Acked-by: Geert Uytterhoeven Signed-off-by: Stafford Horne --- 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 diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h index 0aebc3488c32..016eb6b46dc0 100644 --- a/arch/arm64/include/asm/pci.h +++ b/arch/arm64/include/asm/pci.h @@ -9,7 +9,6 @@ #include #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 #endif /* __ASM_PCI_H */ diff --git a/arch/csky/include/asm/pci.h b/arch/csky/include/asm/pci.h index ebc765b1f78b..44866c1ad461 100644 --- a/arch/csky/include/asm/pci.h +++ b/arch/csky/include/asm/pci.h @@ -9,26 +9,10 @@ #include -#define PCIBIOS_MIN_IO 0 -#define PCIBIOS_MIN_MEM 0 +/* Generic PCI */ +#include -/* 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 */ diff --git a/arch/riscv/include/asm/pci.h b/arch/riscv/include/asm/pci.h index 7fd52a30e605..12ce8150cfb0 100644 --- a/arch/riscv/include/asm/pci.h +++ b/arch/riscv/include/asm/pci.h @@ -12,29 +12,7 @@ #include -#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 + #endif /* _ASM_RISCV_PCI_H */ diff --git a/arch/um/include/asm/pci.h b/arch/um/include/asm/pci.h index da13fd5519ef..34fe4921b5fa 100644 --- a/arch/um/include/asm/pci.h +++ b/arch/um/include/asm/pci.h @@ -4,28 +4,8 @@ #include #include -#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 #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN /* diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h new file mode 100644 index 000000000000..3ceb0cb12321 --- /dev/null +++ b/include/asm-generic/pci.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_GENERIC_PCI_H +#define __ASM_GENERIC_PCI_H + +#include + +#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 */ -- 2.36.1