From patchwork Wed Mar 1 10:22:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155804 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 9D469C64EC7 for ; Wed, 1 Mar 2023 10:22:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 10FFD6B0072; Wed, 1 Mar 2023 05:22:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 09A1D6B0073; Wed, 1 Mar 2023 05:22:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E55116B0074; Wed, 1 Mar 2023 05:22:27 -0500 (EST) 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 D02A16B0072 for ; Wed, 1 Mar 2023 05:22:27 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 944EC81593 for ; Wed, 1 Mar 2023 10:22:27 +0000 (UTC) X-FDA: 80519939934.26.825E8EC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id D29954001F for ; Wed, 1 Mar 2023 10:22:25 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Le59wEgG; spf=pass (imf04.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=1677666145; 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=q+2djVSvldfSahdORfv588Sx4RfUpN9M2v3A+79Xsag=; b=RAbolmgrTeuttjoDMIbgjk0JJlx4fwaM7RXjRw722+A+gKPDtI+7F9hvM+8L8vcGCo97RZ ZwFvpLkshUAeB/d/zHbOByQXB1MIAbamKyUw4KETNDvRk1LYZ8WefFjYkwGOP+VCOXrGWf cgJ6SYMzKaroIUteES0UlprZ8Yw0Xis= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Le59wEgG; spf=pass (imf04.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=1677666145; a=rsa-sha256; cv=none; b=t/eOk8fxdppjyVqQtL1SfMX3mYwQRmJcYz6QaZvkSMdLlhidttb1ydagLvv/MBgRHTIhbP mYZtTQ6MpG1bYBjrR0lMeUAfq4VDedmh2zh6DRmvkbmVV9+JwHHgk/PClxMQch5Al67tyH C/8NLlKszx4kszvFGoImup26MVBjv7o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677666144; 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=q+2djVSvldfSahdORfv588Sx4RfUpN9M2v3A+79Xsag=; b=Le59wEgGv36NEJ//y6ZvMeW7l4+xYwekBhG6oaC1G5p22MdPgPbQp6nY7TNiub+D4OD+1X RFM8jmZJclB82L2C/nhA/DGR4jIaFV4C4cvF8PlPQRikEEEf6gCmfWaPMMS1/y62+yQYJu aBhtTh3OT1uD8ZPpia1x2WLhaDUqjqk= 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-583-doUGhHLUP6WD_lcTWKfTgA-1; Wed, 01 Mar 2023 05:22:21 -0500 X-MC-Unique: doUGhHLUP6WD_lcTWKfTgA-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 A706585A5B1; Wed, 1 Mar 2023 10:22:20 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-180.pek2.redhat.com [10.72.13.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 088FB492C14; Wed, 1 Mar 2023 10:22:15 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, geert@linux-m68k.org, hch@infradead.org, mcgrof@kernel.org, Baoquan He , Thomas Bogendoerfer , Huacai Chen , Jiaxun Yang , linux-mips@vger.kernel.org Subject: [PATCH v2 1/2] mips: add including Date: Wed, 1 Mar 2023 18:22:07 +0800 Message-Id: <20230301102208.148490-2-bhe@redhat.com> In-Reply-To: <20230301102208.148490-1-bhe@redhat.com> References: <20230301102208.148490-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-Queue-Id: D29954001F X-Stat-Signature: fikqbizgijt938amhwn9iwdnixz5httn X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677666145-912440 X-HE-Meta: U2FsdGVkX1+zQh48RYRYfaDoNDn1d/KsmVn0kyxbJeW+MtsNN4zJ3C/6vw0RFFwDsNy0h2qycDL6uNDP57KPtr2Ke8Zlz78cpWv6Z4Jm+NcwjPwvJrSlS7caRCozLSMJpjG/VyBWCdT9i0+dG/ElCCbesRWIEf9fwBvP/T2n/5m/9RqZD27r6kBE1tcG2gCiBI9kt6r7bBHZ1/XrbJqZ9ZWRQNGilQcnVhgx637JQkdMcncI92ambntGUDU8jQE7RWP4OwNp898a0+gLk5RzE6msfsoRk8XYlB5CDuSa9w9IiDzgQPuRmJ/PPfGpbK4mLSY4RPSFIoYzkROVlC7Sq5bYw7gIcfU+6ZjBbbDnFk7prKzyIGJB53VeyMzMCAyVwBponZRVWY/Kc7tfavaxWPxpZF+7KR/Lk/SVxvPnQbDv2KVfOmEfeqXJpPjv7gXrgpZ5zXDVyKhkxvcnYWUJAPgQiaBjLumFxYIdRP1I/mKbsnbRUIIZVNlDB9jiAx9+8S4EwiURyZ1+AzX+/oXvorWSSYhb4muwpvUcvqoQeQJG1gKVtS0H24Xl2LpCCP+02grc5vaAFUnEyM0bdlhuUo41DX5sB6wZlE5Va5pQDpbliuKu8fDVORPodgz/R8Ic/IRFDO3v7J1fuiLBHNUT6dEkCT+mI1aKewKm6ZktrerKzNHpIsjhGTUhRvvlC7j6XSyjl607sgUL7ktspdK1mDyzm2n7rcshkxT/CeWlfxa+OHdfB6ugcsJGx0COOQhLOS05c0I+wmx24FkrkBDCFUBhP7Uo6ObDQTJrOs4NHSyf+jrbjFL/btnUdIrgPrPH5sWA0P1CXIUtPl+F5JUpVd5bZ9hVtPJuM79N3mSLlpq5WyQJTx0fdZiBjVIGPY4MVTj7XHcXTd7FjPj+3eRTzYzXtDnVWaRRtQBZugTd5E/K4reSmvgeH08UVDU7qC3s2lcdoztXN4buc8YMYNC yj47u1RH Saxr2YaywV0Uh7NnfKZV+GY3Vqwhl1BzBiN47N/Say7YqhKKlKyQCF18wPCoygIYJdsZvI/z4AfsYRZw530e/menAteKYCmLne/0uhWPfwtFzrmlFMbDNEcJ1Eln8yS2B7n9EWPonjmDoJ9W/DGDbKFv6JtG5zl28ElCfDzrz5dc9uh3VP5FiolcreI8c0WocYCIoR1tHw1QG+mZjkPmMClGta/YnmJZDrPnLFJxa5RVY3aQEyEPmjByuBkv5aooK+OY9OQ/e1GbI+k6NyhswNRfBjkevc7ZBOr+cAJM7ad7KRepXfe013rIVJg== 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: With the adding, some default ioremap_xx methods defined in asm-generic/io.h can be used. E.g the default ioremap_uc() returning NULL. Here, remove the including in asm/mmiowb.h, otherwise nested including will cause compiling error. Signed-off-by: Baoquan He Cc: Thomas Bogendoerfer Cc: Huacai Chen Cc: Jiaxun Yang Cc: linux-mips@vger.kernel.org Reviewed-by: Arnd Bergmann --- arch/mips/include/asm/io.h | 46 ++++++++++++++++++++++++++++++++++ arch/mips/include/asm/mmiowb.h | 2 -- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index cec8347f0b85..3737b48f37dd 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -126,6 +126,7 @@ static inline phys_addr_t virt_to_phys(const volatile void *x) * almost all conceivable cases a device driver should not be using * this function */ +#define phys_to_virt phys_to_virt static inline void * phys_to_virt(unsigned long address) { return __va(address); @@ -480,14 +481,17 @@ BUILDSTRING(l, u32) BUILDSTRING(q, u64) #endif +#define memset_io memset_io static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) { memset((void __force *) addr, val, count); } +#define memcpy_fromio memcpy_fromio static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count) { memcpy(dst, (void __force *) src, count); } +#define memcpy_toio memcpy_toio static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count) { memcpy((void __force *) dst, src, count); @@ -548,6 +552,46 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size); #define csr_out32(v, a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v)) #define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST)) + +#define inb_p inb_p +#define inw_p inw_p +#define inl_p inl_p +#define insb insb +#define insw insw +#define insl insl + +#define outb_p outb_p +#define outw_p outw_p +#define outl_p outl_p +#define outsb outsb +#define outsw outsw +#define outsl outsl + +#define readb readb +#define readw readw +#define readl readl +#define writeb writeb +#define writew writew +#define writel writel + +#define readsb readsb +#define readsw readsw +#define readsl readsl +#define readsq readsq +#define writesb writesb +#define writesw writesw +#define writesl writesl +#define writesq writesq + +#define __raw_readb __raw_readb +#define __raw_readw __raw_readw +#define __raw_readl __raw_readl +#define __raw_readq __raw_readq +#define __raw_writeb __raw_writeb +#define __raw_writew __raw_writew +#define __raw_writel __raw_writel +#define __raw_writeq __raw_writeq + /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access @@ -556,4 +600,6 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size); void __ioread64_copy(void *to, const void __iomem *from, size_t count); +#include + #endif /* _ASM_IO_H */ diff --git a/arch/mips/include/asm/mmiowb.h b/arch/mips/include/asm/mmiowb.h index a40824e3ef8e..007fe55bc7d1 100644 --- a/arch/mips/include/asm/mmiowb.h +++ b/arch/mips/include/asm/mmiowb.h @@ -2,8 +2,6 @@ #ifndef _ASM_MMIOWB_H #define _ASM_MMIOWB_H -#include - #define mmiowb() iobarrier_w() #include From patchwork Wed Mar 1 10:22:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155805 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 84EC1C64EC7 for ; Wed, 1 Mar 2023 10:22:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DBABE6B0073; Wed, 1 Mar 2023 05:22:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D42F66B0074; Wed, 1 Mar 2023 05:22:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6ED46B0075; Wed, 1 Mar 2023 05:22:30 -0500 (EST) 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 98D3B6B0073 for ; Wed, 1 Mar 2023 05:22:30 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 65C881215B1 for ; Wed, 1 Mar 2023 10:22:30 +0000 (UTC) X-FDA: 80519940060.08.1987E9D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 8A52840013 for ; Wed, 1 Mar 2023 10:22:28 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=P0uPbH03; spf=pass (imf12.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677666148; a=rsa-sha256; cv=none; b=RlqWDUstkxuLWtYxYKPh8SBj8lEgpJi9mbwyft+7P48tEwUd+e0OAJR55USGusGeo7QKdf uBp2Brhd8v3C4pCE6ksZa0lXp4ynwO8R8tze0/2N+SmPIsgXS2fOTTct7/NEAn2NyM3bCq rw8d0G1tUiEJQgG4WWCb5Da1WQEpM68= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=P0uPbH03; spf=pass (imf12.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=1677666148; 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=XOyiQKIdMnvfgHK0+JM6b4NpBz3+X6fBNBNCgpa23Zk=; b=nlrSlrpwuHaokU9/nuCAfAiA9e3ofyt76MkPZ4kJH+STHNUZtJ46to5+fXS9xf9bcmgmOM Dofat8VpAgrLTS5T9PWXnrlrhtYmj1Oep+W2YSI/A1g6hRrDphOL0vZNwmZuk8CjI9zliv sGN0ApRlpWHYB4DsHp+mvPaalIDmNSY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677666147; 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=XOyiQKIdMnvfgHK0+JM6b4NpBz3+X6fBNBNCgpa23Zk=; b=P0uPbH03xmg5PExl8DSeKS3KOxRGdu6kYX4YemvVXvOgsZ6etEgNGwSaSTsdwcbfFqKWb0 nr9a4t3b8R58oKXnOlt4cozAT2P0CMcJ2ZS/2ksiMKptRrUOgrPwavGIomeNxOeUGBZHTr 7LYe448yQ1bMpxcs9a2K0FCCJqVdmtA= 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-388-jPx6-0M8MLWGe2Rl2uX8Wg-1; Wed, 01 Mar 2023 05:22:24 -0500 X-MC-Unique: jPx6-0M8MLWGe2Rl2uX8Wg-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 59A9F864761; Wed, 1 Mar 2023 10:22:24 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-180.pek2.redhat.com [10.72.13.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44439492C18; Wed, 1 Mar 2023 10:22:20 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, geert@linux-m68k.org, hch@infradead.org, mcgrof@kernel.org, Baoquan He Subject: [PATCH v2 2/2] arch/*/io.h: remove ioremap_uc in some architectures Date: Wed, 1 Mar 2023 18:22:08 +0800 Message-Id: <20230301102208.148490-3-bhe@redhat.com> In-Reply-To: <20230301102208.148490-1-bhe@redhat.com> References: <20230301102208.148490-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspam-User: X-Rspamd-Queue-Id: 8A52840013 X-Rspamd-Server: rspam01 X-Stat-Signature: c3iwc9thi61pau39kigjqeamxxpp4f3r X-HE-Tag: 1677666148-917372 X-HE-Meta: U2FsdGVkX19CPTDmDxBYmhF/nPudGvTF9SSmXKy+gqJ2H+fcDNyMal5h4HpyyWq/G4bbk7dGdUUeLsRG92R4nUMhLMwoPdEqBT01GhO6mfA5SkubAjU255Iv/G4vL9A1eBIPgdFNQFp1deRX/4kTz6k8yIig2AbZ+uO2pgFkb8d4QOXB9YTYuA/6stVsMcjQFtvH2cJJE/5DS9t28mlt002lgK+MxqIgMD3L7uX70t5EV7sKHGNtQBQNXm7w0umCZ65+nPWaMXTCRWUkL3qX1HzjgSsYHGjv6TjLoNfwGBzMyYqP/iiw48xfNupZFAO8uRKQaSJzTj/Tac6TWAlq/OYYb+ztv2+Emuyqgn2dJI+0pwqEvZnYZ3dWIuZmxjzawKvjcplT7BQ+Y4n0ooifNQkFPylBuvVfTHQCy6KfD2CEgtU3IGHwH8l4AgrzFeibC7LHoDH3PyMJR1BXaiIGx/gaiH4CuJLy8OT1v+y908Xi+VfF2DszJtTUrVgHuhEHzE6StVF7JGBDkVE/mvXHkhraYOo6eToje/aR/BNpGnDXGnod0q+TH6AnkVqG32cgmQ7jxfdm8tusc9SazDyxE+Upb9FdDqMM3Xt+qGrgLvi9R86UxpvEiGRTrsFbMnu20AJjrCqC51goIO4s5wIfIfXISitfmpJq45b52y8w10hUWRpesR7aEk98gPmKOS8FcFL8fNExbXbUHV0liiZBRd/OY4p38W5nzXcjtT2jWpfhTR9OXh04Y660YnIEupfHdqDoAY9eyarMH/yveQLtf2R/twSKFhWXWrubrK8yqYAzKL2rijoUCg8tEfN2unxHRb9znRUFXhadSizSfs1rw4R/rRth8Baib+NvAmaxcjg09ZBoEm/tRlQ3n44XVJk6J9AFJhchI04joZwttkfa7uUl5vJO/hJQ+iZw+CbMhfs6lNVa2yuV+eL5oCXjdL/4JwbFOZjb9o1cNOuMCZI T+ywpVKy CBYSY+9iKlm5A/5/qPswGvFUes+tj9t4U45unhFhJIdRTW5QT6ViVO99ood1/utXSzFccZmxOuP/7NgQLtegYlHqnOTnSJm6gZEzbgOCu35VzOAyasVTWkcgnjIvoNAi+AY4qcTgCV3EfOpTEik1JkuNQ4HDAz9GZflk1dY4T6AhTmj5dX/v9xuuv3KHU6ogfZOKM0OYAjQYCUhE786+1VywLe+FoGwwCW+0e45/uUrTdbKJPsL3fIufrQWDFVmn1P/v5i09UeuLLwCF7M+HIeDHgf8O4u9dXFhSkCGAnlrihBGXVaAHYLHgju5Rzj9yqdLkjagfdiKloYJPahxwnFEipgG+o8+40XR16jW6Htgg33SQ= 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. 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. Note: This changes the existing behaviour and could break code calling ioremap_uc(). If any ARCH meets this breakage and really needs a specific ioremap_uc() for its own usage, one ioremap_uc() can be added in the ARCH. Link: https://lore.kernel.org/all/20191112105507.GA7122@lst.de/#t Signed-off-by: Baoquan He Acked-by: Geert Uytterhoeven --- Documentation/driver-api/device-io.rst | 11 +++++++++-- 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, 9 insertions(+), 14 deletions(-) diff --git a/Documentation/driver-api/device-io.rst b/Documentation/driver-api/device-io.rst index 4d2baac0311c..ec37faa37a37 100644 --- a/Documentation/driver-api/device-io.rst +++ b/Documentation/driver-api/device-io.rst @@ -408,9 +408,16 @@ functions for details on the CPU side of things. ioremap_uc() ------------ -ioremap_uc() behaves like ioremap() except that on the x86 architecture without +ioremap_uc() behaves like ioremap() except that on x86 architecture without 'PAT' mode, it marks memory as uncached even when the MTRR has designated -it as cacheable, see Documentation/x86/pat.rst. +it as cacheable, see Documentation/x86/pat.rst, and on ia64 which checks if +attributes don't match. + + +ioremap_uc() behaves like ioremap() except that on x86 and ia64 architectures. +X86 non-PAT system marks memory as uncached even when the MTRR has designated +it as cacheable in ioremap_uc()(see Documentation/x86/pat.rst). While ia64 +system firstly checks if attributes match ioremap_uc(), otherwise fails. Portable drivers should avoid the use of ioremap_uc(). 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 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 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 3737b48f37dd..9d93e27f7c82 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -167,7 +167,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 978d687edf32..7873fc83c82c 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -863,7 +863,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)