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 C51F3C7EE25 for ; Tue, 16 May 2023 12:54:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A1D2900007; Tue, 16 May 2023 08:54:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5524A900002; Tue, 16 May 2023 08:54:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4413B900007; Tue, 16 May 2023 08:54:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 32B6E900002 for ; Tue, 16 May 2023 08:54:58 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 048031C6D09 for ; Tue, 16 May 2023 12:54:57 +0000 (UTC) X-FDA: 80796113076.22.8B1FA8F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 30F8E14001C for ; Tue, 16 May 2023 12:54:55 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d+XaO2Bh; spf=pass (imf23.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=1684241695; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dmTy7RERLTTlHMDvbmWoaYSTmqTCStLXSnB9hgIg4f0=; b=5uILJH+OwrZR1rYgGua1tKxGxisaNJdrX/dhgZWATH+7+G5knv6VG3jzsVYp1aBn0ifdtX pKENjusA7tHlCe2afl1/bGlnc+8el7K55T9Px46cqfJchZSv9QoaqMJbYci0Aky9MtZ+kP CxA4r78Y/OgzvCV8fuN/wugeyj5h34c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684241695; a=rsa-sha256; cv=none; b=j9j5UFl26OQ9W0jA9xuCF96izsBjJ/kdPu31rgmA44CPGQ3ZzHPjZqnJKEt4KHNPG2+PHw 3pqERo66chGOsbqej3Pk5TefihZDMLWMm/nqr/IgkK+MQPH2uLaUNeby6c1F0er5lJBapO cbEQFCit2xk1AXuqV3Hs9MrkO1NV8RY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d+XaO2Bh; spf=pass (imf23.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684241694; 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: in-reply-to:in-reply-to:references:references; bh=dmTy7RERLTTlHMDvbmWoaYSTmqTCStLXSnB9hgIg4f0=; b=d+XaO2BhTpvrSdcLm6WsjrseZJpLUM0B3dAhPMlXI9rkiIqtq0IRYWMxJHlKkw43YgFsxd NMXDcDgskgvX3E9yH5p+PVqTU2E2NjfDMzEVzptcfk66YYgtnzKCX6Xv8fEf3ZMptm2uvE h0GoMIu6lZ9r0iW9vtUvZCEmkfw2AXY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-z_NlnuGROBOnKL3k1Ydrsw-1; Tue, 16 May 2023 08:54:47 -0400 X-MC-Unique: z_NlnuGROBOnKL3k1Ydrsw-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 2C8652808E75; Tue, 16 May 2023 12:54:46 +0000 (UTC) Received: from localhost (ovpn-12-79.pek2.redhat.com [10.72.12.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA0EDC15BA0; Tue, 16 May 2023 12:54:44 +0000 (UTC) Date: Tue, 16 May 2023 20:54:41 +0800 From: Baoquan He To: Mike Rapoport Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@aculab.com, shorne@gmail.com, willy@infradead.org, deller@gmx.de, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH v5 RESEND 01/17] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP_xx macros Message-ID: References: <20230515090848.833045-1-bhe@redhat.com> <20230515090848.833045-2-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Queue-Id: 30F8E14001C X-Stat-Signature: xemtduac5u1a4jwowi64br7fb496jxog X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1684241695-59936 X-HE-Meta: U2FsdGVkX19q/igejd0vi3NnNaGDf3WNfAS6kRhWknhIG9EtXBjzdEYncydExgIHB6NgLBc1D7Qlt/ooo6HyqBGqtUzC0mCj5Km0+gZln98sc5jB2rpLbz7gdoe39IS9vY+1zkh436vsKp//CsLnO7oZ87b54DGAip0yj0WDFs/+7z/9nDYxsuWsBqQxQBReK0wJZj6A5tZkIiXCAFPJ8K1sGP1h1aX7y8/sWTPVonjf9RafBpne3Uf1MtR/pzBw6Z2bX4Db13tGCeCrY7sWhJ2kXgokoF9OLpF76eQwhHBWGHlepVCOpQi3d8uEkv3u91mUJfmzPTvYnk6Cnb9m9/E0T1tKEX+/qJLkG+Hb+C+VWa/GJYSZROl1rMR90qO0sEDP7+h13V6p5MTUpbi3bm9YeTphbZErRkRR7Hc9krVp4AkAEO1xugNxfUuEjRPPZFyJLad/CKHFxaQFRbSdq1LP2Kfdk9q0SRbrywWIwSOB5eSmvqeQGWtkAHb2MSOdR9lnut2FQyV5HVywRvezuSk2H/Oy6Zw0VGPSPDdOVmTIj6fZViazPgh1PkOcyg9cM592p5e96orcmFF6Y6fo/R1dLg8rphdUq6aV00/Dvwnl64O6HBZkNYmJVHz6uXxY8d+3+sYBFBLLtoP8wUZsRJYFUcxRdkyfNcYYQiT0GwkhSPery7KiD1J7yukHBXJn6gAvVHXJjrFNgTUMk7Te0V2JZ4TLnHpfMmeqEQF2zrVKTsGxRsGpPO6wT8zukbSA9NCpAKf8b9wr2WAozgYoIDUie8l5l8PKRP9V7PNYx9GplYVAJlBLS3h1trk0cDf8uKDWdfCiNfgCsc3wNixbW6x5DXjq38Q7L7ZbkP//PJV1bjN+IPj/aKw7UwbQFl0oxVCtLZsUL3ebgawOFE6LZLuYnS7UWE9IJ02rzG3TjTLwiD7tMOoUW9Bt+t1uzD+pRF5BHs7Jr3PA5ft54Uj TLCISyjH 2z9GWiV1lrO00m0oP2fUFiM6rOQ8uGiPdG6rPu6uM+BAGKeFxKnHtPOuAd5Qr+eTX8sWy/sDHO/PDjSWY5ZBDrk+87fdyRbLxGDxLnRuBG/kYH8DFHaBYIu0KNWeKIhF2kxIuKQVII0ZOL6/u/EZKyhks0MSUUvNVfdcHCUjLaLWF8FXnUO52NYRVblPSNKvJZ9RHuAuIFu/OYU8y/K0uAM2MLcG/Jvt96pHIGch5s78e4s4w0iQAr/V5TVm0d2M18peS4cnKcYL/sCSDN4455FmMfzMOG1j8lJNF+QDT5jLWhYU3HEeJup9Gr30fQWN2FjrV3If2jSpqX3jRpHDr5SkblhRzi9wiC/1NIa1km3i/xMGu3/SjRfNN6sIVASesKKP32A+9Bpxj09FYArHQT4XqZ5zLptNy6/7JXHEu99auzYVa7qDLgJrL3PQDr6xexC7taUsOHsGikpjkeSIXkveAyrEy4O4i6Tgj/NFalnFFYhnDbS1wlX9V2CHL1lft36E+ 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: On 05/16/23 at 09:15am, Mike Rapoport wrote: > Hi, > > On Mon, May 15, 2023 at 05:08:32PM +0800, Baoquan He wrote: > > Let's use '#define ioremap_xx' and "#ifdef ioremap_xx" instead. > > > > For each architecture to remove defined ARCH_HAS_IOREMAP_xx macros in > > This sentence seems to be stale. Right, will remove this, thanks a lot for careful reviewing. > > > 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 > > Cc: loongarch@lists.linux.dev > > Cc: linux-m68k@lists.linux-m68k.org > > Cc: linux-mips@vger.kernel.org > > Cc: linuxppc-dev@lists.ozlabs.org > > Cc: x86@kernel.org > > Cc: netdev@vger.kernel.org > > Cc: linux-arch@vger.kernel.org > > Reviewed-by: Mike Rapoport (IBM) > > > --- > > 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 > > > > > > -- > Sincerely yours, > Mike. >