From patchwork Thu Sep 21 11:04: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: 13393860 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 31370E70719 for ; Thu, 21 Sep 2023 11:05:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF7076B0213; Thu, 21 Sep 2023 07:05:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BA7526B0246; Thu, 21 Sep 2023 07:05:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6EE66B0248; Thu, 21 Sep 2023 07:05:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 974EA6B0213 for ; Thu, 21 Sep 2023 07:05:05 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 687F4808C2 for ; Thu, 21 Sep 2023 11:05:05 +0000 (UTC) X-FDA: 81260322570.28.E5CA0C8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 8A6A840010 for ; Thu, 21 Sep 2023 11:05:03 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Uh+U4xGQ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1695294303; 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=tn5ZDFUI6iPOIWmja0Ms5+F66UgwvJBJvQvpQLjnla0=; b=BIg6Ye3aCXZlUdIoBhvLl3XkgATk0L6Kkw7sRkvlrkjjfpN3o+0fh1CoMaIGStSEl8ZVFm 4IEz+jb+ZyFFYUTUNn8GSS4Qsqh8LYGhFmTSxgWmtrQ2butPAG0w1C+xnrAo82LBuxBFyn 2LfHBq7tmEToWN4GQjlUgULeSBnsoyc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Uh+U4xGQ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695294303; a=rsa-sha256; cv=none; b=A5gfk8gfVQlum4RVmiSgMiE3uwkJB/l308da6y8/z8suF3XUrduZEZAwc9jaMHLgkEeeeH UltO9Vxj56m3dN7lI9BEsIC3lhYlgVsE15rVsu5fhY2p0wWl2tdmrwxJrAG+wuaqfUDPdR JfkfUzG5P09t/dw0nLHTOCHPt+yrUYM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695294302; 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=tn5ZDFUI6iPOIWmja0Ms5+F66UgwvJBJvQvpQLjnla0=; b=Uh+U4xGQwOoFTrrsirbcSlMpOaxvf/trtf0CTs+oKA1CM6ff40BM3tYcZ1KsQOhVRr1hwb lWlgsM0hCpPMTqEvvAacpPVPz2YUXz8lG6tqWe4b4/Omripx3n1Xmq54/bv4HlSiGxS3Ua naIkI3amXnfcsJyGCKQTjODWtVxFy1Q= 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-212-HzV00hqNNTmcFQhVDqz-Nw-1; Thu, 21 Sep 2023 07:04:57 -0400 X-MC-Unique: HzV00hqNNTmcFQhVDqz-Nw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 848AF8039CB; Thu, 21 Sep 2023 11:04:56 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BA682156701; Thu, 21 Sep 2023 11:04:48 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, arnd@arndb.de, jiaxun.yang@flygoat.com, mpe@ellerman.id.au, geert@linux-m68k.org, mcgrof@kernel.org, hch@infradead.org, tsbogend@alpha.franken.de, f.fainelli@gmail.com, deller@gmx.de, Baoquan He , linux-alpha@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH v5 3/4] arch/*/io.h: remove ioremap_uc in some architectures Date: Thu, 21 Sep 2023 19:04:23 +0800 Message-ID: <20230921110424.215592-4-bhe@redhat.com> In-Reply-To: <20230921110424.215592-1-bhe@redhat.com> References: <20230921110424.215592-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspamd-Queue-Id: 8A6A840010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 987k3so1tti7h7hogeysb9jtqgtq9frz X-HE-Tag: 1695294303-160654 X-HE-Meta: U2FsdGVkX1+uMXORheha7CIePXIUsgwHspOxuII/p1fU5SebDti2KLMymdqLVsfYzt6wFq4g5PuudOmws9wjPFaU6D4RVRld8BUwxNo1GoqOyHxZJC+aZtSwXQ3wsEqIvIZ3ypuJNQQUaobwewMcAII4r6U7V3AnfpZRxM+L6/KpFQBS38YyGREd9kCRdH2Uw/sX7LHvDmohZmPR4L3vws8gX4u8MLv8JQQj9TvBmV4g0cTkbyRzGZcZ0ILv0rN4xLYxM785EY7w/FrpXI0SXq2Mxn79GvG6Tts7PRBRU72CS7Xgw68s8FoVN8tDYheC4+AVW0DbcOKxKXLKanmuLMTYsJkFBlfU7inBkfAIoi1FXjTCDL+TRJGRAb0YtskbYX0WTGc0HMfAEPL+lRINXXXYRG2m822wJii/74uvwNpQw/N3Y6VLVuPX84HVKDjWjWYx3T4OFKHHcMnv0P55lC02Uetjvg0dQPRQhT29QW8UO+urmzP/Jeez6xEOLF0G/qFZrcaRtj3HHX2MMsNbdpEd3ppsj0fVdu41Z7FWQOgL3GEpFm0QBTlmxv46aMvnwSNG+B2fRm5/P/cSzzKJG0HpT2ggxppbUzdOjl8ebjFHEHBVz7eg6nU8Xo92usJtR8jOw4oCUJIzp2ODh3URM8AhilaKR4kEYsNMAzY6BTAZfESJEKt6TJL3pAaSuRNcpBAQVpmC0tC26HRkXyvBlY3k0ENuFzFVMYvWDxJhVLpQl2oC32HPbiDRfaWgrQUc9fCVg3uj/j3823Z4hyiJploJ+gQtppBnnu8xvlv34cvXOIzLBySbjvuOtNALcj/Jq/sHct845KaRUALAjg0iKGEq4HqKszzObUl9MkZ2DL4UAehQAGjskB15iVpndz44RdOcLDPpvF5prBF0EO/vWdCAgqBoO8Hf9z6A9rUDX7WFwy1TjMxH6+e/8qKQvZQZaot7E4w95A4awdkREQj 5PpjFHqk y4srKXiyNeb2xwkJTU+Ot6ICE5nlIiV1RhYeJ2XMZR/uE90fJvJnDAAu62izq14DAZwNk9Oo3hnyqdzLr5y3izaAlXNbfenieSnwHnimZ6jmGTvcH5pgI0A4AGOoOzfaFHo1RupQHte95owtVvfzdJciZWFecIjlcGUsXG6MZQhfB4wGjm7gKjXuaRaXSQFHwLP0DlLgDPk2PH+Udyg8cSGV2ttdv4a8gBew88FdN0CmJ23UX4dtSzaJcXoXuCZzuvWM3OG+hj8fhbxjo7tvy4Q0eh3yGdYbUKeFZ/58TZrBIUiEmrElKYVTkxvl3ds4h+fzSm4BqjV2vMjsKBGMGpUdFn0NoRR9HUnBCPz8HzX2VMIcVnr6qCiBgEusvdm+nDk3p9L32dHg8fC9SZaRJCMT519hdI52S2L4IgIZ5DzxCPvMmE1t2lhyhhK5Kjrc3q8qRmupzG4JpOk5phlmakrRrFw== 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. So 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. This changes the existing behaviour, while no need to worry about any breakage because in the only callsite of ioremap_uc(), code has been adjusted to eliminate the impact. Please see atyfb_setup_generic() of drivers/video/fbdev/aty/atyfb_base.c. If any new invocation of ioremap_uc() need be added, please consider using ioremap() intead or adding a ARCH specific version if necessary. Signed-off-by: Baoquan He Acked-by: Geert Uytterhoeven Acked-by: Michael Ellerman (powerpc) Acked-by: Helge Deller # parisc Cc: linux-alpha@vger.kernel.org Cc: linux-hexagon@vger.kernel.org Cc: linux-m68k@lists.linux-m68k.org Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org Cc: sparclinux@vger.kernel.org Acked-by: Arnd Bergmann Acked-by: Thomas Bogendoerfer Acked-by: John Paul Adrian Glaubitz (SuperH) --- Documentation/driver-api/device-io.rst | 9 +++++---- 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 - 9 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Documentation/driver-api/device-io.rst b/Documentation/driver-api/device-io.rst index 2c7abd234f4e..d55384b106bd 100644 --- a/Documentation/driver-api/device-io.rst +++ b/Documentation/driver-api/device-io.rst @@ -408,11 +408,12 @@ functions for details on the CPU side of things. ioremap_uc() ------------ -ioremap_uc() behaves like ioremap() except that on the x86 architecture without -'PAT' mode, it marks memory as uncached even when the MTRR has designated -it as cacheable, see Documentation/arch/x86/pat.rst. +ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension, +and on ia64 with its slightly unconventional ioremap() behavior, everywhere +elss ioremap_uc() defaults to return NULL. -Portable drivers should avoid the use of ioremap_uc(). + +Portable drivers should avoid the use of ioremap_uc(), use ioremap() instead. ioremap_cache() --------------- diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index 7aeaf7c30a6f..076f0e4e7f1e 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -308,7 +308,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 e2b308e32a37..b7bc246dbcb1 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -174,9 +174,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 4efb3efa593a..b778f015c917 100644 --- a/arch/m68k/include/asm/kmap.h +++ b/arch/m68k/include/asm/kmap.h @@ -25,7 +25,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 41d8bd5adef8..1ecf255efb40 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 366537042465..48630c78714a 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h @@ -132,8 +132,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 0732b743e099..21bd3e8bffce 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -900,7 +900,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 f2f38e9d489a..790bea22c9b5 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -302,8 +302,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)