From patchwork Tue Feb 21 06:07:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13147418 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 D3D99C636D7 for ; Tue, 21 Feb 2023 06:07:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 756746B0075; Tue, 21 Feb 2023 01:07:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 706EE6B0078; Tue, 21 Feb 2023 01:07:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F5D96B007B; Tue, 21 Feb 2023 01:07:56 -0500 (EST) 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 4EC0B6B0075 for ; Tue, 21 Feb 2023 01:07:56 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0140D120EA8 for ; Tue, 21 Feb 2023 06:07:55 +0000 (UTC) X-FDA: 80490268110.09.5C25069 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 39CD3C0002 for ; Tue, 21 Feb 2023 06:07:53 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="T6/Er+/k"; spf=pass (imf28.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=1676959673; 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=hgqR0ygqLDetqpeTHucde422Qa7eKDiutvhSuW8M0Eo=; b=3Uo3OWWHnTvf26vbZBp4HL60ZP2OKLcUrZwwmzZ9pM/k18HhMSx4O1ByTLJ7zmud4YaJqt zBOOtZ/O5V85Zwy9+7XrsTXvCX64BooSaBgZkz8XzDEG3grtm8WSSdQbot/gOxMEDrsXT5 BGLjqrdrqYq5C9CowRviN9sT4V6mQIA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="T6/Er+/k"; spf=pass (imf28.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676959673; a=rsa-sha256; cv=none; b=Q+A2JtN2jYWReY1Y/YB7HkxHk5HkHQlPpITRdgc5L6+0Y5PjQJKs0VELBN6KXe/hIzfQIW jfjt3Yd+jD9sxUg4e9uBmh4S2tD/HhG434wr4yDw6YC3sQTWUUjsMZR605mIJgh6tvzsHq S0rr9Y2xfeZzvJG2+XyJ9fTsTf+lB4k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676959672; 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=hgqR0ygqLDetqpeTHucde422Qa7eKDiutvhSuW8M0Eo=; b=T6/Er+/kcWKcFAmtrLwOk6bt/9Wfj5vHSvqtw+sTFLBEFHtvyO8j6zDwRkQYD6rrklFVpl kr4EsTy1pIdts46ZPyYcIiXv455/BVKu8Ohg9GMhhLdziIGTVGctuVxXTRs2Otm1wR//1M 4K40EwypZKupNo6zCQS2tMqF1wk1diI= 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-231-le87--KeOZebpduoxv08BQ-1; Tue, 21 Feb 2023 01:07:51 -0500 X-MC-Unique: le87--KeOZebpduoxv08BQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B81D18483B3; Tue, 21 Feb 2023 06:07:50 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-7.pek2.redhat.com [10.72.13.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CAF5492B04; Tue, 21 Feb 2023 06:07:37 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, arnd@arndb.de, hch@infradead.org, mcgrof@kernel.org, Baoquan He Subject: [RFC PATCH 2/2] arch/*/io.h: remove ioremap_uc in some architectures Date: Tue, 21 Feb 2023 14:07:23 +0800 Message-Id: <20230221060723.26291-3-bhe@redhat.com> In-Reply-To: <20230221060723.26291-1-bhe@redhat.com> References: <20230221060723.26291-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 39CD3C0002 X-Stat-Signature: n96h9ub6inzrxe3ei8b3prsdhc9ao3z5 X-Rspam-User: X-HE-Tag: 1676959673-749841 X-HE-Meta: U2FsdGVkX1+tsC3cIX6Pb33hMUPgDAqmZmjSTVlVh4wmWUHn5WiDvUuycvbNy9vmTexiRvIDzCq/WYCaigaBHGrrHJoN1e7dB6rznSZqgvKPMlRA9QZRpmiwvfEdTIyLA6aE0PlSzARbSV5N+T1G+YuVLeGGQ0LFi0gqSYPhVmclC3r4zpuERPNmwhDDE03TsqRFbA45EpieqN3lR63yC0CQ7Fex4EepHmxORl/I4zXuqp6e7dRuOkyw9IzbeOuSodx+2fboXlsc2TNonTAwa7BWbzwlRbQwDIlOhaerD0N4gUXStALrLq0xYURUhS+oxdiKZ3xJMfq8GpvSx/SrY/7UmRWSqHVekAXmixEeqlCjEO/f43/MRZfqXApXYXjHaCm+hrecmQrWh6N5P/+tLw+f2fFgaMICYI9/nn7gGBZe4zWZ/5HBq4b49EUSXNZse0uea5Kpx86EmUmYudWYbb3Cn9RP61bBD/aT+goOZPo+DTkFQqN3VXEuTayJ0oj0UzbT2OlWkiih7tu2sP02CePCTy/YThq8J0bGKtflNcVs4IY12YdF5sy5B/cmLiHJ/BjCDRdV9rDW7gQR52qcLR2aLyqO8PP471OCS9Gf88UIj1DLeYn9LCklFJrUK1gpWpndeYwCdy1FQh7uAxX0F7caNd2Rsthpkm/3jg5VP86EqwJUk9/o2f/iRsCpLxVtUE5STjWRQNJ6PmF+xDZmhE+Q0byQDcBjWnnfv8P3Qh3gR9lf5PzoyJR6/WCXo9EUhAcVsWq8Gow6dPklP65iCd/VJghFBS/OjUOvSpK3nH3F+ZIqjs189Yzzl0yOV2KmropxK71vC/+WGarX/EHR9lrIlBlOYwjo8z+Eod8CPp6KqVPAIPpRM4nImHg88G091ZsSq7Roi+/7R10IHwN0nOb1BScaLPm/V4geGF1UclscqXEm+WdcK8a1h7VYvVU8j9f8f4THrbvJN0wt4ng /4DFK1dl QhoPkFOOBxe6tAUgyWHa1EbTVQ9BQ/xtDvZKlclJiWrlZ/PFwptWDS+NmC6w5gjWoE800HiSr6JMrpIDnvfhl7LXu/GgsfT1iQ35MvCPNyyzvZYiqbK7pPRGFb39ewSNcTFYMF+AlJUXpsPDbhTmuTAubrKNCVorcThgo6Vacn2RzH3OSFjj16BAo/eJXWI/EQvRbWq9sU7Xbl4bwZHnwGUIycfiMYz+xjrB0UlMK+9/0uxk8jWKYq0UzjLL2ZCCiTJmR9D1jMvf4WyrmUEnIAABBpuNngwZyOIMuqcl7TP5cNrc= 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: ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension, and on ia64 with its slightly unconventional ioremap() behavior, everywhere else this is the same as ioremap() anyway. So here, remove the ioremap_uc() definition in architecutures other than x86 and ia64. These architectures all have asm-generic/io.h included and will have the default ioremap_uc() definition which returns NULL. If any ARCH really needs a specific ioremap_uc() for its own usage, one ioremap_uc() can be added in the ARH. Link: https://lore.kernel.org/all/20191112105507.GA7122@lst.de/#t Signed-off-by: Baoquan He Acked-by: Geert Uytterhoeven --- arch/alpha/include/asm/io.h | 1 - arch/hexagon/include/asm/io.h | 3 --- arch/m68k/include/asm/kmap.h | 1 - arch/mips/include/asm/io.h | 1 - arch/parisc/include/asm/io.h | 2 -- arch/powerpc/include/asm/io.h | 1 - arch/sh/include/asm/io.h | 2 -- arch/sparc/include/asm/io_64.h | 1 - 8 files changed, 12 deletions(-) diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index 1c3605d874e9..0d519f96a20e 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -312,7 +312,6 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size) } #define ioremap_wc ioremap -#define ioremap_uc ioremap static inline void iounmap(volatile void __iomem *addr) { diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h index dcd9cbbf5934..b9847472f25c 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -176,9 +176,6 @@ static inline void writel(u32 data, volatile void __iomem *addr) #define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \ (__HEXAGON_C_DEV << 6)) -#define ioremap_uc(addr, size) ioremap((addr), (size)) - - #define __raw_writel writel static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h index dec05743d426..d3c9934b9475 100644 --- a/arch/m68k/include/asm/kmap.h +++ b/arch/m68k/include/asm/kmap.h @@ -27,7 +27,6 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size) return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -#define ioremap_uc ioremap #define ioremap_wt ioremap_wt static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index c89804a5802a..aa6c55d6cb6c 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -170,7 +170,6 @@ void iounmap(const volatile void __iomem *addr); */ #define ioremap(offset, size) \ ioremap_prot((offset), (size), _CACHE_UNCACHED) -#define ioremap_uc ioremap /* * ioremap_cache - map bus memory into CPU space diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index 4c386b0cee08..8aaa79017131 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h @@ -134,8 +134,6 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr) #define ioremap_wc(addr, size) \ ioremap_prot((addr), (size), _PAGE_IOREMAP) -#define ioremap_uc(addr, size) \ - ioremap_prot((addr), (size), _PAGE_IOREMAP) #define pci_iounmap pci_iounmap diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 127d8300b40b..cfbb6df9f55f 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -870,7 +870,6 @@ void __iomem *ioremap_wt(phys_addr_t address, unsigned long size); #endif void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size); -#define ioremap_uc(addr, size) ioremap((addr), (size)) #define ioremap_cache(addr, size) \ ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index b3a26b405c8d..12a892804082 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -278,8 +278,6 @@ unsigned long long poke_real_address_q(unsigned long long addr, ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) #endif /* CONFIG_MMU */ -#define ioremap_uc ioremap - /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h index 9303270b22f3..d8ee1442f303 100644 --- a/arch/sparc/include/asm/io_64.h +++ b/arch/sparc/include/asm/io_64.h @@ -423,7 +423,6 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) return (void __iomem *)offset; } -#define ioremap_uc(X,Y) ioremap((X),(Y)) #define ioremap_wc(X,Y) ioremap((X),(Y)) #define ioremap_wt(X,Y) ioremap((X),(Y)) static inline void __iomem *ioremap_np(unsigned long offset, unsigned long size)