From patchwork Mon May 15 09:08:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13240980 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 5612EC7EE22 for ; Mon, 15 May 2023 09:09:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D429C900004; Mon, 15 May 2023 05:09:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF2FB900002; Mon, 15 May 2023 05:09:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9573900004; Mon, 15 May 2023 05:09:16 -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 AAA9C900002 for ; Mon, 15 May 2023 05:09:16 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 74B19A13C1 for ; Mon, 15 May 2023 09:09:16 +0000 (UTC) X-FDA: 80791915512.12.D33B8E9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id B51024000D for ; Mon, 15 May 2023 09:09:13 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gSm70LfV; spf=pass (imf17.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1684141754; 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=awWutqv7Tku6RTy5++zNn2CsetnK4SAvTciCez0pzMg=; b=VHlo3gzwK7eUMDlal4mK0TkScGIE2gaw2ykUp/F7L7frxeb4lxK964YPAQAaR3D2kNtMxt qZ86qZxScTKVgAQph1+nUmqnhHoCYaxmy1D9uOBwoxCUgmdc46lPys7wptC14VqYiVfELa 9iYZI/BAndr64qSrlVurfVwbDvSC9jM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684141754; a=rsa-sha256; cv=none; b=sMl33zvGgm3jN2Zj9cKXvC2EbPBUJ9zwPomt7DbEoHKTblM+rwnTADTVITTsxB2dhM8Jxg EYOsY3FECybf4l7YqH5UQIr1yjOe+SlOo4etfvB5Sdz8/p2OYMjG9Yx0aGeqekqOcro3D/ v/lgmFEJTS4IfrneP2JaQ3kB8J77hDw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gSm70LfV; spf=pass (imf17.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1684141752; 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=awWutqv7Tku6RTy5++zNn2CsetnK4SAvTciCez0pzMg=; b=gSm70LfVjv3ikRzcupF66FCR5+IVhCgSElqc04GIgpBEmw3dL4VMTgGpV8DsZuP4sKSfgo xHocvB/Y4lwXZCt86ZLTD5sylxDq8j1LW5wIQ9T/5uctzNNMoor881kfdOOF0K5gDCKQfS dSOKdEqxg8ixlPKEE5V1h/kKSfKUszo= 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-659-KJdy53drOYK6CyyGE_o-bQ-1; Mon, 15 May 2023 05:09:08 -0400 X-MC-Unique: KJdy53drOYK6CyyGE_o-bQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB828800047; Mon, 15 May 2023 09:09:07 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-32.pek2.redhat.com [10.72.12.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FF2D40C2063; Mon, 15 May 2023 09:08:59 +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@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, Baoquan He , 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: [PATCH v5 RESEND 01/17] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP_xx macros Date: Mon, 15 May 2023 17:08:32 +0800 Message-Id: <20230515090848.833045-2-bhe@redhat.com> In-Reply-To: <20230515090848.833045-1-bhe@redhat.com> References: <20230515090848.833045-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Stat-Signature: 5t7iq1u7pj3aw8q6eazg947dye9mxbfw X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B51024000D X-Rspam-User: X-HE-Tag: 1684141753-366430 X-HE-Meta: U2FsdGVkX1+jWfZkbm84vnYpHc65Cee+1dEULdq15UzXvebNjnBy7cHxtAPhVx5Ms6A5RFn3q322QkuhHdqhFHWWqy9RO1jcC0iQKA4zsm9Kcw/vvw9St9X90JdYBUpGZAOUQQ82P2eXnp9pR2pBLKLyYdVDciSU9M2OIGgQ/Z9eVPRjTshaXiNPLSDD8W5FrueyBjf1Rp6jQdd6Y/irO68nYsFdT3mpNOQm50Neby2rx6oy3lpt/jsQs8d8cbmN3vKytxLAvWH1cM6gJFzf1aCqh/WgF2qltfSWNsC76EcVD2lgFi0XlUxe+nmM1t8bkqFtnT7K0Kh3IFePJ9HDyCzIwHKB8QGzJjPrgh24ZK+Kq4cFTtm8yzz3DvUaVBIvgImsdHSbA+13yxLAk0U+x6nh0Ccayk2F9bD3JoNskX2oGqtjqkkZxru+Za+UIJWnNgk0iVLji3q2iZLGqtyry0NzhH/CW5VS3BHqkojC3F1K1XspEvOHp3C4813ZcPT1GcUPCHDYHcHjKrcZFImCglG/3kgHSgrllqiPY/lW81eT9lcODW4aWIQWlO573lhVNjI5ysPoKAH8hcHKjORTDp48CPXHtzQ0xZFdXiP21UoGiO9ra3lQMgbBicP99Yx/ZjgcZLXj/khFWLs+xR5bh0qJPXDrSI215rPgeZ147CDqqIdzEhqMAQyrRXJdhintVvOR9/CsWhMbwnY90+TA9ySBBamOiIEug6/M1ssqi0HkdW31qE868AFCtW0XWkp/6GYX4reZjE3l5aeGd4e87cdZ2m+vqGcg9ABnMthMnIRrGG1qH8HuW9mxinn0AemycLqLGsj67HbZC7IS8TGZR3hsG+SSGENmKG/RNGTlorBtcGF7wDGttPhy4H2OSqHdxngDg5LUsP6NkDJxpxYXP0N4IB+/7Vz7XxtHXJ1aec9qVAfJ7U+WZbXW8bKxJF6dxBu+uwQU8s83lFAz3Ae N7iGqZcX ul87IkgwhHSRxKfpFlxJx7nddG/jMW5JGjVuG9EDdlUEf/qEO70sQcLBzFbDAi/qv1CI793oSHbjI4ZiTT7VcP5Em4NvCYG01SVM+cpwnK+j4bFur8cZBD8EDv3bb+SYAxxwuQtRU+ZGe6EMq35bAjv1fERWZY8SQuiRz9XIruOmu8xIoQLfn0DlLSWaPtHtF2ecTAlIhWVpsXF2pC2NSCkajP5vCxlc7DsR8+EbcB2C90fzxU/oLwdZWcT7fns+4COhfZ63DMWNuUP8DinbmPTRqt1DOZ71ySNmpQRvVw1to9nlCUOYCdBE5ttYnN4T12q6MVCMHN1HkRr36yNgxtw1bpEN5u+x8VGeceORDLE0nrKgwDRU7chNVFIA0gI+3nP7kuMoyjeFMBUUy37Eb62F6NI+hyRiz/q95A3LKlj93XA21EjAnd4uPWmpcKNYgVVkq5J+5g3TrVD4= 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. For each architecture to remove defined ARCH_HAS_IOREMAP_xx macros in 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) Acked-by: Geert Uytterhoeven 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)