From patchwork Wed Jul 20 13:19:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 12923971 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9962C43334 for ; Wed, 20 Jul 2022 13:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=/n9YoyE3wQR+Qi7lzXHvSa8Z+7oFnXUPoBQcMUdP6+4=; b=BmeqGDv52NRYzF PbAOPyNpu6DfWdS3yfXkFClencfHDt7sXTt6kGi1U7kpwtX98ZIShKcN1Rb/NR27AE9QIVrjINYGp vmxGd2n7DO1jLPAOe7shkApjlxw4IuMXUt41pY3jpXKfHOlbXl3q/rEC972gANRA67e5F+C1WbdB3 fLPRUEakx64yKLZCCobs7vx70IziDS71+KU/Rwt0oJLLYHoKokmWd6YC1BIHuZpqRjuVcfbhSBjWt TLwtbIjfp7cMzAxz18UGb4vJWZ7hdd0sx6Ab81UbuNfYwG28xHWvKRoVXRqTc7pEra/Tj74Pd433O Kwv2+1WO1M2/s6POBGQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oE9c9-005uUA-3x; Wed, 20 Jul 2022 13:19:45 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oE9c5-005uQw-WE for linux-riscv@lists.infradead.org; Wed, 20 Jul 2022 13:19:43 +0000 Received: by mail-pl1-x62e.google.com with SMTP id y24so1689530plh.7 for ; Wed, 20 Jul 2022 06:19:38 -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:mime-version :content-transfer-encoding; bh=6L5s6bowO6qitLYG2OCtNOs5gt9AhxRdQFqZVW9zhIg=; b=W/mSQeRFEY4VCjg+VDolqQCfRBElGv/3AiMkl4gd7XS1baupuj9+mr/+jZSVf5lIlZ kTx9qAT4OzatQNM5RUKDA2WjJPBuI+Yi3QXkLM1rg8tIQQClULRUyuUpq0kK2TJvE2Hf KcJ0x+RVMCBxrIJOcZcmdhPqLCSjV/og0aA0uG54O06Qhhib8Jrrfy2ll0IK2dWsIEC8 CqM+YjwHA2mV/JqIIJcPeZKB1+JUIFvOJBjGWBMnArXtMxUWLjbQ0A7o6k0vaSIAzArk UaRDZ/4niPjGY+IHLAY7TJfU3M/2ONkWUHy30HoKu238laXCY+PfoOYV1R9hgfpcXBaL K0og== 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:mime-version :content-transfer-encoding; bh=6L5s6bowO6qitLYG2OCtNOs5gt9AhxRdQFqZVW9zhIg=; b=TZm+BZQtb6YW0Ws39Kn0iLPwR61Wz8R1f1q7ZMu6gIrjPG9330YMzpz8vKqoF0kCPx E4eh5RvbcE5xK345lfyqM29ymh3lIUzj7neWcphzVD747+edo3A7IWwPQOZ4+E8cRIfd uM7t1nczmgPRiIWD11mm/0zgTx6adMlDbDOeK4EGsXLOvkM6S2edcbzDyXU2ihB5tuJ1 2Knvoe2+YXRVFuaLm7uwh7fkWlDv051vaZ2TjYm014Buo4pxXXDj9F9kvi42B8LcVNE7 cPrIr2j6R8gmpEnizMHOh+wJAuHvRWtAgTVHgajIX17u/NvEVwmxgg8HKDq9Q+cQKkZe GcLg== X-Gm-Message-State: AJIora9AriNqZJoU+TFEj9Wg4XjGqRiX6kr0aZeCvz3Yjo2Vyiw37SAs zOXmyfw0vjY+RU2M27gRD5E= X-Google-Smtp-Source: AGRyM1sdxwIBYX1/l+0yxcq9Emi2HTOcPl29jI2KpdaiR+BmYsFP35rTk7GJYu1Suo9CkuG9sD+9ow== X-Received: by 2002:a17:902:cccf:b0:168:e13c:5cd9 with SMTP id z15-20020a170902cccf00b00168e13c5cd9mr39310489ple.53.1658323178275; Wed, 20 Jul 2022 06:19:38 -0700 (PDT) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id g8-20020aa796a8000000b0051be16492basm13620223pfk.195.2022.07.20.06.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 06:19:37 -0700 (PDT) From: Stafford Horne To: LKML Cc: Arnd Bergmann , Stafford Horne , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , linux-riscv@lists.infradead.org, linux-csky@vger.kernel.org Subject: [PATCH v4 0/3] Cleanups for asm-generic/pci.h Date: Wed, 20 Jul 2022 22:19:31 +0900 Message-Id: <20220720131934.373932-1-shorne@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220720_061942_078201_120D6301 X-CRM114-Status: GOOD ( 16.76 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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