From patchwork Mon May 15 09:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13240994 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 B75DDC7EE22 for ; Mon, 15 May 2023 09:10:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A0E7900003; Mon, 15 May 2023 05:10:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5518A900002; Mon, 15 May 2023 05:10:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41992900003; Mon, 15 May 2023 05:10:50 -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 357C5900002 for ; Mon, 15 May 2023 05:10:50 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F2159AF4CD for ; Mon, 15 May 2023 09:10:49 +0000 (UTC) X-FDA: 80791919418.18.49BFB7F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 3E3CE100016 for ; Mon, 15 May 2023 09:10:48 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qq8MYjLU; spf=pass (imf05.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=1684141848; 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=SkuBcRmfwXAx+LokLW8LUvbvQG1M59NAVaKGe2qHG6A=; b=2eFVofNcKLVaTsBC1QWpuGg+C6nvCACiKOPhFp1J7iTAknfE12uaD2O68FlqF3j09t9L+u qj6og3JJfHuEgxsfpHc7wBigf552yReRtsqLD7sbaX1NW+18VAKBuUpBCioZX1KS4Aksyl NBgLM0eV96dcC9zvvU9NZ+16iIzRy2A= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qq8MYjLU; spf=pass (imf05.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=1684141848; a=rsa-sha256; cv=none; b=ZdD5mphqpwGArlLQhBNe87PdFTiswb3fvnWFv7A0EzJg84XH23GmyrhwtwqVDf2UTX8A0p vwAUqH8biXkvHiCK2ff+fNtkDTtnBoCJwG2z4sOSFEMk9sPKKp5B1PqcSvJFgXHFLk1v/i XYRYJYcCjxmj9pWDe9X9zK7YPz7EuWA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684141847; 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=SkuBcRmfwXAx+LokLW8LUvbvQG1M59NAVaKGe2qHG6A=; b=Qq8MYjLUzCjVnqQNNUB7owj2eToV044F+FN/gLCF1tGm0DyW0sauOIGV+ArEWBS1IIVIYa xCrattNKE+ig27ujV3lbx5PtSHp39pOBLgwoLkmsQwn/oIXRHV3Z083z+wQcSkEiHOeSkh Pb8VPpkjpyoEdAMPK43HW7LtnNkM81U= 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-401-iME_X8SqMeeI4gcmlx700w-1; Mon, 15 May 2023 05:10:43 -0400 X-MC-Unique: iME_X8SqMeeI4gcmlx700w-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 75F7C85C069; Mon, 15 May 2023 09:10:42 +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 4973E40C2063; Mon, 15 May 2023 09:10:34 +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 , "James E.J. Bottomley" , linux-parisc@vger.kernel.org Subject: [PATCH v5 RESEND 13/17] parisc: mm: Convert to GENERIC_IOREMAP Date: Mon, 15 May 2023 17:08:44 +0800 Message-Id: <20230515090848.833045-14-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: h65rxnc9zxix3mazech15576qwoohz9g X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3E3CE100016 X-Rspam-User: X-HE-Tag: 1684141848-707320 X-HE-Meta: U2FsdGVkX18h0Q/oXJZimMoPsi35WlxFskfcMITOeyYlIMz8gVI3MgwbBFK9R5qMAHRYivJEH5bO9V8nFFe5H3Ixvn8ZeD8+JOd/xvbmq4uWtCsql1bLtdf2ojZGw43ER6ldDiQBg710waU84Af4nk4j5Dx/TMLln0R44p5ZOiqpiyKMohDInx2sPQbmFC47r4Q6NhQl7lsw1KOdGL89N+LKwBZBH32qJseoicM4u9bO6ihv0jbu6RKbAUahE3SVgLzHdCH5XN1h9hMt4IjqyDvcW2oXbqBc7HV4203wQgPc3dsgItGKELfFF2BR7PlI3ecRn2ywyy6bJfbx+u587IPRmhCfbnTJ0l5Yf5sh68gfbSFx/z16+N2NJt1S828AfXdyvUd8snvBsv2ZzSu/IKbefT3XO7j07XRnxLrOmqoT0rNdIbJxwkxZAMx+Z02uwtxk/Y0PCxo22hAiFUTxp56Pcxhl0GemSnZtjXfZoz+F/edzJBBi0MGlKj31uMTK3nv2qF+QLWzVJCFpAtS3hMH4K/hRXSmEJAeSsGOIs0/L13xjo2HVN2doL2AHU8G33nH2CvCpEgLwfMY7tVuY+jyIB1ysjTYaoZ3pE42qDtG8Zw/NKJ7UpPhBg/SvtMo8bQzbdm6MC7TsneyZHIVIDnvNpe5nAUjUUQ7hCe5Ypk1W2SAydDVsk+fwD5W+flAcNOdZ42HvfsRW2guxOH1uuuL7qNmxx1wzi+YDaNW2Xwf7BqI+cAyw1fMVD4SghuKlegYGfflA3OigmyvWROu683HS5p+aaIhBAS67Tur3sLo2BQRYgTu1g/CQ+umkBq03+FtxZHD6TwRFg6YQZyXs6c2Jkq15aSZ9W0sDV/GaSlzfTagqhalOrIs/QwBCV7BXMig01/HrjaWPs7H5M/baL/aG9Y4lMPzS/sgrmvHA9PjMCLYQrx1Pu+QQ24GqjutQw7qWNhpj+NyrepRGlhh 99olN5kl rW6Pzwfmfk6cRkqgId6KnuxqvXj8f1vc74PXuF0GafMepYYn6AuCRTBFTbZ/s9WqyY8JrHDTh7hipLeWVkzWURbVqYZyG6Uc5Ibn6WQjTXp1g0331UKZpb3Yh3i0GYqg4VWe3aov5v9vl36Bb2KMIe1HsaSJY88tIJjy76JP2kxSQIM/mUFYtUom9gjs7QiRBSRd4+kASxai34Dcxie10jKmZmWp1s4liYLO7JugECL0HV8aFT9RUPNP2D53N0umkbfPT/LYTlKIBZuOEhH9uvIVbwh8wGVncdXh/iUN0j/xjCn62TUDaGTB16Adifno7PrUU4gL+dkFVIWuwW+JScwDwpQ== 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(). Meanwhile, add macro ARCH_HAS_IOREMAP_WC since the added ioremap_wc() will conflict with the one in include/asm-generic/iomap.h, then an compiling error is seen: ./include/asm-generic/iomap.h:97: warning: "ioremap_wc" redefined 97 | #define ioremap_wc ioremap And benefit from the commit 437b6b35362b ("parisc: Use the generic IO helpers"), those macros don't need be added any more. Signed-off-by: Baoquan He Acked-by: Helge Deller Cc: "James E.J. Bottomley" Cc: linux-parisc@vger.kernel.org Reviewed-by: Christoph Hellwig --- 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 466a25525364..be6ab4530390 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);