From patchwork Wed Mar 1 03:42:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155579 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 74510C7EE23 for ; Wed, 1 Mar 2023 03:44:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FF016B0073; Tue, 28 Feb 2023 22:44:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B0996B0083; Tue, 28 Feb 2023 22:44:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E92BF6B0087; Tue, 28 Feb 2023 22:44:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DA6CB6B0073 for ; Tue, 28 Feb 2023 22:44:30 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B4CFF4101E for ; Wed, 1 Mar 2023 03:44:30 +0000 (UTC) X-FDA: 80518937100.06.99915CB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id ECB35180004 for ; Wed, 1 Mar 2023 03:44:26 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jAEA39Yb; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1677642267; 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=99eazzzTFBToyKXpL3t6V+dSWN05gSUQFL5P6G3WrHg=; b=lfRf225+dQg1Y/FgMfMFGcG2iRtVNODXNV9sVwkD0Ub4ZMtOcw6lpVJS8HrmKm1D4+leyy Vji8U+PtBGkIW1PkZr9p3xA0omS7ur2T/QIAjIpmOiW9qCwSMdWHziGD975Cwdzig1Xmji RvtnXqQn6TkH6961N0Ry797XMZFQ0vk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jAEA39Yb; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677642267; a=rsa-sha256; cv=none; b=n76QxM5/XDXSsai0eFO70KTo/hiB1DKR5bJEfYGk2pH7mfO5k4uYoK4dUhpT/0uFYkR6lE U6Vph7sXwICI8yr0wSU9BvJlMjBh9m0vkhlXn/5b15l0MoezAjkQG+yZx80k+tz2/BYTat zUbu2tcVOXBzBCCixfVEo1HwhETRSu0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677642266; 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=99eazzzTFBToyKXpL3t6V+dSWN05gSUQFL5P6G3WrHg=; b=jAEA39YbEXUG+7JXR8157Cr2ftknX6XcvMXopBoeaxvRsx8fnqI0OXEaTtYfEZJ8PY3JQW zVvrykPrJT3wgErBrWY2cnl3Gz6vQZJUdI3oG1HYsEKB9UVv408Cx2QBmRkP30E6I+ilst C3OHUeJQAaaHppvt65idDUCQpmXv0Ks= 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-19-6sAzv9xMOeutBMapOHumyA-1; Tue, 28 Feb 2023 22:44:21 -0500 X-MC-Unique: 6sAzv9xMOeutBMapOHumyA-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 CE48E811E6E; Wed, 1 Mar 2023 03:44: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 51C3FC15BAD; Wed, 1 Mar 2023 03:44: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, 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, Baoquan He , "James E.J. Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH v5 13/17] parisc: mm: Convert to GENERIC_IOREMAP Date: Wed, 1 Mar 2023 11:42:43 +0800 Message-Id: <20230301034247.136007-14-bhe@redhat.com> In-Reply-To: <20230301034247.136007-1-bhe@redhat.com> References: <20230301034247.136007-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Queue-Id: ECB35180004 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: rjdmosaa4gdmwo53wr1sio54g3etzgad X-HE-Tag: 1677642266-960479 X-HE-Meta: U2FsdGVkX1+kMBBn9GbNsN6/7TMBzVdlmLc4YAx6cxDyTrsMLhoo+tZ4I1iqSMcN8EGKiy5WCUwt1Pz+A2NyfHqek01S0F8MK1rGTAWoHD79+WXt9wkfS2Wr932S0GXaSMpJHv8pFDlGkvMmUwx0p/j9+8fZEeOhHULS0v/FNZtEZzeIam+/tu4c5NjwwddqTOc3sr1gZDWKgITMTyNa/NUSSzzNGAKhIOfkxTgb/nr4V5arGJ16GzEUCi1qOj7NtwK5geRdHWag/scQ46KxHeYtPPWrk5g7ZZ2NLySmH3kJr79dSNiYv214WXDSKgz44Nslem9PG36/72pYpKop3EF8XHdgYdICNbyI87Nh6xeu47tKfnhNT40DLbPfOZLRn9Rr/etjkuBidQWdsqrphfYfXsM5UqBdeesIiKYY6gqg3YDvoJacGeugMo0QtEC8G5fJVX738nQj6erfbaqk9RMEpK0gRoxeIy8Eo+iO1+Ye+NurRCq8SUUc41JfbmItGSJkGEB7CBAclswzBbZ0LTBUHolZIhwSIIlgG1a7jmDwjg0GvxbqcwXHJ0Q6tN/qqH6k2Zx8iaLORwRxuXstTW/ir/ruIanCfgPeQ42TcqRgUlcwwY4k1cBEvL3IKGT/sTwk2wTRxNbqEE1kZBmUPLG/gd5GPW/HNd+aUmsPceg3JnSLbRDqG0r1K37IA3WYXL65Pg8rAr/CkDHDZeSExT/lY7CG4IA47EmiRubW5sOcNqkT+KlpIFQnMDsEbgFDa73lvVy1jW7HbP1Fc7bJ/CjAowvv4sNE9yKz6+b11E5B4rZTmzm0p/wCGaWwKmnHzaM165tk+i+6WgJTh1NmD8feAAmL3KozZjpSmuCofBCpE2zGAtW6QdIWAZa3Ycn2ec708qmz/V8Uo66V87Ovv3D7TIa3aLYhBGM6pDUjNkDygPM3SqNJNNr2QICfdQL3Npcb7R1GEwXxiHKSd/j XgcQG9yZ +b2U+2Q6vSPTYqVWEBwIeSSlY+i9SmXbX1GfXNdZxVdTQMvoTsd3vibfCetd+8CEulnHf9wth/1on4dldKvWy2NxawuXEhyWtGfPyoK6Q/nDD7RoaKGXu3rcfNWaqAar+a0MEZrl70QuIGzwDOqex5OOW3sgjeATuWClr2AYU+NL+dfZZiOIRVl0KHn4NGuLpItOzRqoxqFmdWXzgPVao1NJKSv2NLQoqgRj/EZ43dmQLhGB29D2N6lkkc7e28CabAWfOyXH82BXCwQa1EXDjDaAkKlnq6QLpGr1uO0cr9JRAq2yYN2RE5RW9ot4oSPSU7m0sf0RkrEz12szlVunqUKb7BITgRKpxxloLsq/lHTpsnC8= 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: By taking GENERIC_IOREMAP method, the generic generic_ioremap_prot(), generic_iounmap(), and their generic wrapper ioremap_prot(), ioremap() and iounmap() are all visible and available to arch. Arch needs to provide wrapper functions to override the generic versions if there's arch specific handling in its ioremap_prot(), ioremap() or iounmap(). This change will simplify implementation by removing duplicated codes with generic_ioremap_prot() and generic_iounmap(), and has the equivalent functioality as before. Here, add wrapper function ioremap_prot() for parisc's special operation when iounmap(). Signed-off-by: Baoquan He Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: linux-parisc@vger.kernel.org --- arch/parisc/Kconfig | 1 + arch/parisc/include/asm/io.h | 15 ++++++--- arch/parisc/mm/ioremap.c | 62 +++--------------------------------- 3 files changed, 15 insertions(+), 63 deletions(-) diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index a98940e64243..0ed18e673aba 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -36,6 +36,7 @@ config PARISC select GENERIC_ATOMIC64 if !64BIT select GENERIC_IRQ_PROBE select GENERIC_PCI_IOMAP + select GENERIC_IOREMAP select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_SMP_IDLE_THREAD select GENERIC_ARCH_TOPOLOGY if SMP diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index c05e781be2f5..366537042465 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h @@ -125,12 +125,17 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr) /* * The standard PCI ioremap interfaces */ -void __iomem *ioremap(unsigned long offset, unsigned long size); -#define ioremap_wc ioremap -#define ioremap_uc ioremap -#define pci_iounmap pci_iounmap +#define ioremap_prot ioremap_prot + +#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \ + _PAGE_ACCESSED | _PAGE_NO_CACHE) -extern void iounmap(const volatile void __iomem *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 void memset_io(volatile void __iomem *addr, unsigned char val, int count); void memcpy_fromio(void *dst, const volatile void __iomem *src, int count); diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 345ff0b66499..fd996472dfe7 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c @@ -13,25 +13,9 @@ #include #include -/* - * Generic mapping function (not visible outside): - */ - -/* - * Remap an arbitrary physical address space into the kernel virtual - * address space. - * - * NOTE! We need to allow non-page-aligned mappings too: we will obviously - * have to convert them into an offset in a page-aligned mapping, but the - * caller shouldn't need to know that small detail. - */ -void __iomem *ioremap(unsigned long phys_addr, unsigned long size) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { - void __iomem *addr; - struct vm_struct *area; - unsigned long offset, last_addr; - pgprot_t pgprot; - #ifdef CONFIG_EISA unsigned long end = phys_addr + size - 1; /* Support EISA addresses */ @@ -40,11 +24,6 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) phys_addr |= F_EXTEND(0xfc000000); #endif - /* Don't allow wraparound or zero size */ - last_addr = phys_addr + size - 1; - if (!size || last_addr < phys_addr) - return NULL; - /* * Don't allow anybody to remap normal RAM that we're using.. */ @@ -62,39 +41,6 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) } } - pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | - _PAGE_ACCESSED | _PAGE_NO_CACHE); - - /* - * Mappings have to be page-aligned - */ - offset = phys_addr & ~PAGE_MASK; - phys_addr &= PAGE_MASK; - size = PAGE_ALIGN(last_addr + 1) - phys_addr; - - /* - * Ok, go for it.. - */ - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - - addr = (void __iomem *) area->addr; - if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, - phys_addr, pgprot)) { - vunmap(addr); - return NULL; - } - - return (void __iomem *) (offset + (char __iomem *)addr); -} -EXPORT_SYMBOL(ioremap); - -void iounmap(const volatile void __iomem *io_addr) -{ - unsigned long addr = (unsigned long)io_addr & PAGE_MASK; - - if (is_vmalloc_addr((void *)addr)) - vunmap((void *)addr); + return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); } -EXPORT_SYMBOL(iounmap); +EXPORT_SYMBOL(ioremap_prot);