From patchwork Tue Jun 20 13:13:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13285827 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F520EB64D7 for ; Tue, 20 Jun 2023 13:14:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C1EE8D0005; Tue, 20 Jun 2023 09:14:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 971278D0001; Tue, 20 Jun 2023 09:14:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EB408D0005; Tue, 20 Jun 2023 09:14:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6BCEF8D0001 for ; Tue, 20 Jun 2023 09:14:57 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2EA8980EF7 for ; Tue, 20 Jun 2023 13:14:57 +0000 (UTC) X-FDA: 80923171434.16.B2672D4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id B5EC91C0017 for ; Tue, 20 Jun 2023 13:14:53 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TyHK79jd; spf=pass (imf21.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687266893; a=rsa-sha256; cv=none; b=gzHtbhUp2CoEh/1v6XwvzE1RsLL9PttTkGsmQzFj+8tWHFmHVeXdBgR3s284rGeI1XGsFd oMIPDTN0116WvYJO+UbeRXNsFeC6aB4O6DlDtJ1AC75yHNk/MoKi3iUROGwrkfwwaShRt1 FXVgnwLADMHJhmBTrpCA6IJ3liu3N9o= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TyHK79jd; spf=pass (imf21.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687266893; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=b4XJFulpmTS+bblieBNYOcNV6+2R6Ew6Cf1SgYEpLuE=; b=LZ0aWQ5Oz62sOgqF7fqYMBqdBvXmftut2/UwJNrq0CjVtaTXNet9COjmO3xcHSS50vPYVs xayCbj58tDrPMIWtAhU4COJD2pGHRhHBi7syExjEVeotJT41aG4fLh+XS0wV6wwPUtoGQJ e0feuVIY5R6kR1PqO924uox7+1MVfSo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687266893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b4XJFulpmTS+bblieBNYOcNV6+2R6Ew6Cf1SgYEpLuE=; b=TyHK79jddl/oDHhbOfFIAKY5Dsc0XV8PztUB9gPj2JMEM5JBpm1FMXY9lwsNF+d+CsjFLi giQrj5tiD/pbfk9wpdmOv98TLCbX4/hzr8Ta4CTsHS9C/e2Fe7OzDCpG2G4623nDunBz/8 BRdkGKTTlLmzQxJX3zam3r1K3D2pD24= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-GG6MyXnuMMKE9JR0NGzIKQ-1; Tue, 20 Jun 2023 09:14:48 -0400 X-MC-Unique: GG6MyXnuMMKE9JR0NGzIKQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5455080123E; Tue, 20 Jun 2023 13:14:17 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-166.pek2.redhat.com [10.72.12.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EB80C1ED97; Tue, 20 Jun 2023 13:14:08 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, hch@lst.de, christophe.leroy@csgroup.eu, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , Geert Uytterhoeven Subject: [PATCH v7 01/19] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP_xx macros Date: Tue, 20 Jun 2023 21:13:38 +0800 Message-Id: <20230620131356.25440-2-bhe@redhat.com> In-Reply-To: <20230620131356.25440-1-bhe@redhat.com> References: <20230620131356.25440-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: B5EC91C0017 X-Stat-Signature: 6ne34xp5q78ur31k1zyyf5wf89xygc3g X-Rspam-User: X-HE-Tag: 1687266893-592724 X-HE-Meta: U2FsdGVkX19LrX6hAPTFcPPMWmZf01oLzihzxSNN/KUrbaHDlO/RwFkMGROJtP+UEVeHgnP0yuz/CPRYlCJoIqCfxvNMeQD8e9Rqg4ta5A6OEfeTVsf0uEekaQSDVkOCau/PjpouhECZjg47rZ8GeymE4sSQ9IQdJA5WGGjr0dKWtVzqmIfSkP0/M7T9l0N+pmlqa9ultEaNWGd220q0+zsJ9XhrTHkI2BxIg2pJ5QOli/ygeLQZeSAImtugV7t6eDvdJpKoTeMwlBDE92H7KlEhOjcbJ00boLE2ccY8E5XJpQ1TWu3S05LM5G2NLt7OUXu1jmaYy6mA5rXd+bAHb+6lqNcwykusiXnd18hzqdyWY/W6T6YvGW5OF+YcTdHroVrlE6IQfQoOmGL3GJX472vYUE2yyew1nQ0+wPNQN6z+upGA71LSzTJTKGrgBpkI1muPDCPdncWEyYzjtBJl0xalZaQ3oB5mFGIbW2gkZl9pkk59sxwFdRpHKz1F1/SpLC72aTFtI9DygM/EJD/YGQBEuCaEIl7seodYF7MFvNB3gTs3Lj6rNCgRXzkRmdMMjeBlWx9k80mMNnrktgXIzo6QigOsVslc+mSwgWcEkQgz8vffO4f7XMEda2w03z167EiNx0BLEXBFdnTvFfsAggE7O5M59GtPkATwoU9R9Q08nCncor5t0SpriodF3OO2hhF6w9X715qPAswuCTCWQua1vBArBM2faNSvlrIhwSh6p2cWlK3kbXxCwKTyxOs2fzkD7OErH+gRIHTySyfY2LRPqsWt7kmlVeRGfnhXJ8UGOVmSKW/HkbivCNqG1KIO0GMjJx5Ii/uajrc6K5MBwUar+BiHgsHHMieWzpy3HO+8By2x9pLzHi36d4mPs2zD1SIZaEgqxSMMMNMu8ccaoe/WLlaY8vMxbTEkJODsl9BV8eBABC2bOxl6tQ9PkVR2ETf+asJ7qnoLykNrJLc DwLiqFPS cAJFGN/fYzM9+N2fFz86rFVHsuTR8Jub7r6X2YHwcZCFKZnmaOqaNuKlBwfOmN33OeJr/DMxTrEguebESFcIzpBIJLnAGH2A+IO4nf1ZFOH7n3UTqmwixPgreaE4MThd05yzMrP5YmE/gldjFvPbc0esR37CDx7in2/RwgAZRe1PuYW3xXElxu063rNtdgSErW0TJF3TovtmTupF6JQZVJuILC78RoyUkOC8QdgROwKVrWMKiAOMr4LMF2IsAgC89u4Zy4/3Zu8MAGg2NVopN2IBc4/9xkpn5EbLFOuZGmkyso9oJGhbPKS3pWtuxNhpOAFQ7gPGIawsQPJXN2m0CrvCffHL5W8L3ORQmf3sdtOdubv56u+nzaVtZ+ISJfkoUzKbt3ksQLxjvHlawWpXuL8HsNQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Let's use '#define ioremap_xx' and "#ifdef ioremap_xx" instead. To remove defined ARCH_HAS_IOREMAP_xx macros in of each ARCH, the ARCH's own ioremap_wc|wt|np definition need be above "#include . Otherwise the redefinition error would be seen during compiling. So the relevant adjustments are made to avoid compiling error: loongarch: - doesn't include , defining ARCH_HAS_IOREMAP_WC is redundant, so simply remove it. m68k: - selected GENERIC_IOMAP, has been added in , and is included above , so simply remove ARCH_HAS_IOREMAP_WT defining. mips: - move "#include " below ioremap_wc definition in powerpc: - remove "#include " in because it's duplicated with the one in , let's rely on the latter. x86: - selected GENERIC_IOMAP, remove #include in the middle of . Let's rely on . Signed-off-by: Baoquan He Acked-by: Geert Uytterhoeven Reviewed-by: Mike Rapoport (IBM) Reviewed-by: Christoph Hellwig --- arch/loongarch/include/asm/io.h | 2 -- arch/m68k/include/asm/io_mm.h | 2 -- arch/m68k/include/asm/kmap.h | 2 -- arch/mips/include/asm/io.h | 5 ++--- arch/powerpc/include/asm/io.h | 9 +-------- arch/x86/include/asm/io.h | 5 ----- drivers/net/ethernet/sfc/io.h | 2 +- drivers/net/ethernet/sfc/siena/io.h | 2 +- include/asm-generic/iomap.h | 6 +++--- 9 files changed, 8 insertions(+), 27 deletions(-) diff --git a/arch/loongarch/include/asm/io.h b/arch/loongarch/include/asm/io.h index 545e2708fbf7..5fef1246c6fb 100644 --- a/arch/loongarch/include/asm/io.h +++ b/arch/loongarch/include/asm/io.h @@ -5,8 +5,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#define ARCH_HAS_IOREMAP_WC - #include #include diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index d41fa488453b..6a0abd4846c6 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -26,8 +26,6 @@ #include #include -#include - #ifdef CONFIG_ATARI #define atari_readb raw_inb #define atari_writeb raw_outb diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h index dec05743d426..4efb3efa593a 100644 --- a/arch/m68k/include/asm/kmap.h +++ b/arch/m68k/include/asm/kmap.h @@ -4,8 +4,6 @@ #ifdef CONFIG_MMU -#define ARCH_HAS_IOREMAP_WT - /* Values for nocacheflag and cmode */ #define IOMAP_FULL_CACHING 0 #define IOMAP_NOCACHE_SER 1 diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index cc28d207a061..477773328a06 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -12,8 +12,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#define ARCH_HAS_IOREMAP_WC - #include #include #include @@ -25,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -210,6 +207,8 @@ void iounmap(const volatile void __iomem *addr); #define ioremap_wc(offset, size) \ ioremap_prot((offset), (size), boot_cpu_data.writecombine) +#include + #if defined(CONFIG_CPU_CAVIUM_OCTEON) #define war_io_reorder_wmb() wmb() #else diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index f1e657c9bbe8..67a3fb6de498 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -3,11 +3,6 @@ #define _ASM_POWERPC_IO_H #ifdef __KERNEL__ -#define ARCH_HAS_IOREMAP_WC -#ifdef CONFIG_PPC32 -#define ARCH_HAS_IOREMAP_WT -#endif - /* */ @@ -732,9 +727,7 @@ static inline void name at \ #define writel_relaxed(v, addr) writel(v, addr) #define writeq_relaxed(v, addr) writeq(v, addr) -#ifdef CONFIG_GENERIC_IOMAP -#include -#else +#ifndef CONFIG_GENERIC_IOMAP /* * Here comes the implementation of the IOMAP interfaces. */ diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index e9025640f634..76238842406a 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -35,9 +35,6 @@ * - Arnaldo Carvalho de Melo */ -#define ARCH_HAS_IOREMAP_WC -#define ARCH_HAS_IOREMAP_WT - #include #include #include @@ -212,8 +209,6 @@ void memset_io(volatile void __iomem *, int, size_t); #define memcpy_toio memcpy_toio #define memset_io memset_io -#include - /* * ISA space is 'always mapped' on a typical x86 system, no need to * explicitly ioremap() it. The fact that the ISA IO space is mapped diff --git a/drivers/net/ethernet/sfc/io.h b/drivers/net/ethernet/sfc/io.h index 30439cc83a89..07f99ad14bf3 100644 --- a/drivers/net/ethernet/sfc/io.h +++ b/drivers/net/ethernet/sfc/io.h @@ -70,7 +70,7 @@ */ #ifdef CONFIG_X86_64 /* PIO is a win only if write-combining is possible */ -#ifdef ARCH_HAS_IOREMAP_WC +#ifdef ioremap_wc #define EFX_USE_PIO 1 #endif #endif diff --git a/drivers/net/ethernet/sfc/siena/io.h b/drivers/net/ethernet/sfc/siena/io.h index 30439cc83a89..07f99ad14bf3 100644 --- a/drivers/net/ethernet/sfc/siena/io.h +++ b/drivers/net/ethernet/sfc/siena/io.h @@ -70,7 +70,7 @@ */ #ifdef CONFIG_X86_64 /* PIO is a win only if write-combining is possible */ -#ifdef ARCH_HAS_IOREMAP_WC +#ifdef ioremap_wc #define EFX_USE_PIO 1 #endif #endif diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h index 08237ae8b840..196087a8126e 100644 --- a/include/asm-generic/iomap.h +++ b/include/asm-generic/iomap.h @@ -93,15 +93,15 @@ extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *); #endif -#ifndef ARCH_HAS_IOREMAP_WC +#ifndef ioremap_wc #define ioremap_wc ioremap #endif -#ifndef ARCH_HAS_IOREMAP_WT +#ifndef ioremap_wt #define ioremap_wt ioremap #endif -#ifndef ARCH_HAS_IOREMAP_NP +#ifndef ioremap_np /* See the comment in asm-generic/io.h about ioremap_np(). */ #define ioremap_np ioremap_np static inline void __iomem *ioremap_np(phys_addr_t offset, size_t size)