From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF8B8C43334 for ; Sun, 17 Jul 2022 03:35:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232705AbiGQDfR (ORCPT ); Sat, 16 Jul 2022 23:35:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232578AbiGQDfP (ORCPT ); Sat, 16 Jul 2022 23:35:15 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8A73167CF; Sat, 16 Jul 2022 20:35:12 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id q5so6329935plr.11; Sat, 16 Jul 2022 20:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Tw+gjDmJoLsBiB8jh8ZvyDH4UCds4aoAQf/c7lWyids=; b=dKXkki4tGc1P2bEiBhktSDo+KHMgr9zKMGo+FvdNVmesp4zAz94R95IqCYAUo0n0SL b2lMFcvr2MY7IVgohWeQFHXBt8A4cbsY/OZIallU12nEeihqo1sVlHyGa0XfgcpV2kbf 5BDSP4BJpNhF+kLFnzOnk+PWODeegzuKnkqzjUJ9W+u0098L0PcJzO4mYbmdojWrPDOf gcIB74D/eTx/yb2Ad8o3J9clOTzLbMKGPGZQ8puM5JEoc5cV5JOu2Pa9qA4AEDjVhkCU /NXWhqDRhgQwUPfZ2BdZ+dGCTWzxWTEEFGWW5klCC4DQ3RqfLFabEt+1YqMOaglGI1/6 kzgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tw+gjDmJoLsBiB8jh8ZvyDH4UCds4aoAQf/c7lWyids=; b=xIf0152rCENhIlGoGtNWgtcggoiYF8U6GVkSJPX+dQj+s9dDF0W6AjXjzQxmSn22r7 3Knfgkzb/ZrJ1WEt5S+izi/hWCpcseVsOpUeeDMoTaDCKUKW57gIfuT2Ff2glD41TTm5 UHsgkhZiZYSPxdN0HUCv83D7lkwaYj94RhQMEUyBSC16JEVtoxQRV0PuJbkgdpdiqlWq HWP5WyfR+XAegjykfUFCdepdahiSghwd3dVBAv7/NEhJd624pt6LgnCCpJz7+y1G4y3C Xawmq2KZpNlirYhEvBSMaNtMb47d4mlkOZ6xGNn30Zh+AWXS5owWk34LB3BnA6tlxyLT uAKg== X-Gm-Message-State: AJIora8GL4YjKERX0bR70opkMiKPcdcP3ZAhm0Zif5oC8e2BsbxotXfn Eby1Nnope87Hie8jtB7SPsfDwof+CvO8mg== X-Google-Smtp-Source: AGRyM1tQ+Ab9ul66FqPFcU7j7eu9CzvXK97tnV4LJmmhXVTTWOyjXUoDLAhXp/IreTKcDzgYh630Dw== X-Received: by 2002:a17:90b:3b51:b0:1f0:5ebc:ac9 with SMTP id ot17-20020a17090b3b5100b001f05ebc0ac9mr24747678pjb.229.1658028911948; Sat, 16 Jul 2022 20:35:11 -0700 (PDT) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id o11-20020a170903210b00b001638a171558sm6243036ple.202.2022.07.16.20.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 20:35:11 -0700 (PDT) From: Stafford Horne To: LKML Cc: Arnd Bergmann , Stafford Horne , Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Chris Zankel , Max Filippov , Bjorn Helgaas , Paul Walmsley , Palmer Dabbelt , Albert Ou , Nick Child , Niklas Schnelle , Matthew Rosato , Pierre Morel , Kees Cook , "Gustavo A. R. Silva" , linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-pci@vger.kernel.org, linux-arch@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86 Date: Sun, 17 Jul 2022 12:34:52 +0900 Message-Id: <20220717033453.2896843-2-shorne@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220717033453.2896843-1-shorne@gmail.com> References: <20220717033453.2896843-1-shorne@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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. Suggested-by: Arnd Bergmann Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/ Signed-off-by: Stafford Horne --- 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 diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h index cf6bc1e64d66..8ac5af0fc4da 100644 --- a/arch/alpha/include/asm/pci.h +++ b/arch/alpha/include/asm/pci.h @@ -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; diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 8c163d1d0189..218412d963c2 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h @@ -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); diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h index 5a4bc223743b..0c272ff515cc 100644 --- a/arch/m68k/include/asm/pci.h +++ b/arch/m68k/include/asm/pci.h @@ -2,11 +2,14 @@ #ifndef _ASM_M68K_PCI_H #define _ASM_M68K_PCI_H -#include - #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 */ diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 915d6ee4b40a..f9da506751bb 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -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) diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index fdb9745ee998..5889ddcbc374 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/sparc/include/asm/pci.h b/arch/sparc/include/asm/pci.h index 4deddf430e5d..0c58f65bd172 100644 --- a/arch/sparc/include/asm/pci.h +++ b/arch/sparc/include/asm/pci.h @@ -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 -#endif - #endif /* ___ASM_SPARC_PCI_H */ diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index f3fd5928bcbb..7da27f665cfe 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -105,8 +105,10 @@ static inline void early_quirks(void) { } extern void pci_iommu_alloc(void); -/* generic pci stuff */ -#include +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 */ diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h index 8e2b48a268db..b56de9635b6c 100644 --- a/arch/xtensa/include/asm/pci.h +++ b/arch/xtensa/include/asm/pci.h @@ -43,7 +43,4 @@ #define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 #define arch_can_pci_mmap_io() 1 -/* Generic PCI */ -#include - #endif /* _XTENSA_PCI_H */ diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h deleted file mode 100644 index 6bb3cd3d695a..000000000000 --- a/include/asm-generic/pci.h +++ /dev/null @@ -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