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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AB0FC7EE25 for ; Fri, 9 Jun 2023 07:55:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A10F68E0005; Fri, 9 Jun 2023 03:55:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C1148E0001; Fri, 9 Jun 2023 03:55:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 888B38E0005; Fri, 9 Jun 2023 03:55:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7AFBE8E0001 for ; Fri, 9 Jun 2023 03:55:54 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 41C6D4016F for ; Fri, 9 Jun 2023 07:55:54 +0000 (UTC) X-FDA: 80882450628.19.AAD9CF3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 66C05100012 for ; Fri, 9 Jun 2023 07:55:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="hmcbE/kv"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686297351; 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=r3g4ZP9oM4r19WBz6/w6ckLHluvVzIZl/J+34OobsOk=; b=w9FNbILS3vclOz/bOA/jKL+H7QRS1JChf36xzXgPl3/rMHqlDnlfoHjK7T170gstxGAa9R s2KQu9QAX7E/F+BFLpAL9nEVL5kQWUerJCkLQrXIrBMMQ2t1yKpxn0DhDqSSL+7rmTvO1E NwLNhdZ15zUbrZJbMSw0wdwvthFxOF0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="hmcbE/kv"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686297351; a=rsa-sha256; cv=none; b=cue95zGwyvca4goHknAt7wpWRL37fzWi+wopYbEQGtlqBv/+Hv6lkrfC65tclcoal6ZQvg h/KWzRX1O7dSRMhZgQHkuJkMhkcGrwCojZYLOQtI3Jh7JxFd6k5iKpdi1Z4YKgY15tJ6Bf uinkkquevPcFIQhwu+kipLRr/2Fjyy0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297350; 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=r3g4ZP9oM4r19WBz6/w6ckLHluvVzIZl/J+34OobsOk=; b=hmcbE/kvDethtAP8U2xJ2gGQkqa2qGccCQ0yOH36dqXDd0o3Kjbw+134B+h/mc5Hl7dzLS s3gKEuwHMd/Av6jNrXPCxIhCB2bcMnoWwjeDx8PIe9EBFBhhe4yn2YKO1pnmH1nrZXAT1Y N3Zug0+jkiReOWX0KbEx34qOaIouonA= 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-475-fy6Y5YnIOTejxLrYBdqUWQ-1; Fri, 09 Jun 2023 03:55:46 -0400 X-MC-Unique: fy6Y5YnIOTejxLrYBdqUWQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8EB6A858EEC; Fri, 9 Jun 2023 07:55:45 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-92.pek2.redhat.com [10.72.12.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id B776D20268C7; Fri, 9 Jun 2023 07:55:39 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@lst.de, 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, Baoquan He , Geert Uytterhoeven Subject: [PATCH v6 01/19] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP_xx macros Date: Fri, 9 Jun 2023 15:55:10 +0800 Message-Id: <20230609075528.9390-2-bhe@redhat.com> In-Reply-To: <20230609075528.9390-1-bhe@redhat.com> References: <20230609075528.9390-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspamd-Queue-Id: 66C05100012 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: y4p43c3aobwn1xfjquhr6hfpyiotzqqf X-HE-Tag: 1686297351-266124 X-HE-Meta: U2FsdGVkX1+6IKgrgL4AsWHAsZrfCSeWvOXmFNtrPuUHJ4LT6KtusPkNwCtbq5x3r1BDDbbHy52PNYepytyHsZQzJN2m2RKo13UJaB6mcD/uMjHYolH0d0JOoWUsq6ejM11DxM8MAChjh20AOHYGER7pV8LmPVXVKt/hoYRHP48XATE1+aymaB6r503cLl9WVy7/FRM691ob4nQgrq+kTTHSJMlSrsGzwc45S1wMoKL5gmwPnCDQ5gRPOo1yx5Bf4TDYwlvw/1n6kCW71tm3bqMYXtXyPL63HEWjA0trlDPblwmkHKdIJXoAwHNlrWChrAv3V+9wDaGZswcou5jfh9vRMU2yhR42wBvli5wC3GO1DOJ0dapaSrCedHV9t8/v6q+rSbJNuSHj91JXPd8kVVCLJMCqb/IA2oD/OenIOTCeU93YEknAjk51VrqmbJeLbRQ9isE5+xu3n3onHY1Ai6Q1+nCzmPSO87rT7bBYyyBTgnJPy54o7yMo9jg20I3usxw/JyFAM5hwjHIs0FBw8/hjD3J3+hb9i0PSLT1OLJl9uJM8SSHdHofWdZsXHmPlYqnC2CK5VP9O+jlQKMq47ROC6cEYY0ZCLtNZOQ7OmcTRq1oNyPIBb/IN6pDF2viIuR/jx82PQ2cMRjwpyaquvwrIP3QhYOm8gqga0UEchjDFR8TozO53R/Rx1wCJdgEowxY2hJkWE/ePEbnspcQ0BfU2CjkeWNGBlRTBQQT1EK8o/mnKXOci2AyCnERghvUDzUzDkx4V3ILHmS5G+U4bMXUSyIDnRHUlBnToi+dJS9/HRZV5I3c6OArCJLDajHIyI0RAFasEzyVSyHRLWBLvu1EnBYgO0InI8s/gkGfsywys2OA+WMDICd/egqP8quUWXrZQKA1mTFPe1PH7dXDjRL7WuEWAzPuSbZBZYkwY1fp4KmsM0DAY1Khohhu+HtP75OKE7X/gbWHdMJvdruC eStrfNNQ +7rJxjRczbfCZdjwna8fdRrxR0WTzeXjI27wnqSx8w6fYqWVwqepJML3cDxnqbekzrJTfgCTaOo8Q9NucGt2cKWSwrDJsFs56H2GcEBM/qCAXz7BQgxpB+qjTV74825a+lQ88bSw91a4zgjNcKi4Soa0k9dHH39KHQ2GydCjb75BiupmdhRmYL2rLcm1UgNphCSoShjvn0W2DoEM/42aUHazE+4ZSkgIobv9zXvmH9phW3XkEfcc1JxqwwZmPBnPXnzlUvkV/nj/QYC4z3zIMkN+s/HKhkbmIz5BrUTrNg64x4DY1Ou334nI3jo2YcpUvyDczltSh2yh6tbgOQvraXpW7edFx6602fGo3ROCW1qSDTX/lHIx66K4p6/wmfCSB5jKMGvzrIEUhWEtSbS+41t7RnQ== 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 --- v5->v6: Remove stale sentence in log - Mike. 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) -- 2.34.1