From patchwork Thu Jul 6 15:45:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13303971 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 472FAEB64D9 for ; Thu, 6 Jul 2023 15:47:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D77F28D0002; Thu, 6 Jul 2023 11:47:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D27098D0001; Thu, 6 Jul 2023 11:47:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC7DE8D0002; Thu, 6 Jul 2023 11:47:48 -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 AAA338D0001 for ; Thu, 6 Jul 2023 11:47:48 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 38E4F12072D for ; Thu, 6 Jul 2023 15:47:48 +0000 (UTC) X-FDA: 80981617416.30.B7AC6BB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 5F5A61C0023 for ; Thu, 6 Jul 2023 15:47:44 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ASDpFI9q; spf=pass (imf18.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=1688658465; 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=oNtW2gZY5kTL8OZsi9xDDaXWO3ott7dJ82eWnmuGcO0=; b=oBzx5p5KRkixyS6WA9jx5+hKAMsizylBHw7qglte2VsHzk1C4bGEwuUi6u7RTbR9JYcO3X pq06dwqPZP8VP7cYXH7E0SmCCW+nkO2FTsP+7XN4Hl8SWvEzx8zrE34cJHhpnEfnSQgybl Wec93d5mL3o+84TuSk3hvrb0GN4QwyE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688658465; a=rsa-sha256; cv=none; b=sX44uSYhrv3WVBKmhqjWG2PE+bRwj1nSQrBynyPv0CZhfej0LQfNGCVBowQfXhxl4vqloq 2Ebr1pQ64vGK4Z/7Slp5951eB+0yPrnRQUXAZM3yuq75/muskzXuJIs6my7nRUWS5OKfKv XYhH5t2sTT/mdcL3Qj5ZRdJotHB0ub8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ASDpFI9q; spf=pass (imf18.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688658464; 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=oNtW2gZY5kTL8OZsi9xDDaXWO3ott7dJ82eWnmuGcO0=; b=ASDpFI9q6jSOX4hNboySjsZQkDJB7XOXEN22ivnbvmfITDaSmkWrRnA4tUknpT3uDY5dQQ KNh9c/oehCvR/fb+Mw77u8wjB+PLxL5F2OuUYO1Wgwywn/2frYrdyg6n2VrUypgLW10ijj g3T+ytngS78XrRV4smwe8ZmgqM2XRHM= 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-147-nR317nlKPae4uls70wOO-Q-1; Thu, 06 Jul 2023 11:47:39 -0400 X-MC-Unique: nR317nlKPae4uls70wOO-Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E01B185A792; Thu, 6 Jul 2023 15:47:38 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-39.pek2.redhat.com [10.72.12.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88F8FF5CF0; Thu, 6 Jul 2023 15:47:29 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, linux-mm@kvack.org, arnd@arndb.de, hch@lst.de, christophe.leroy@csgroup.eu, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, shorne@gmail.com, David.Laight@ACULAB.COM, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , Chris Zankel , Max Filippov Subject: [PATCH v8 13/19] xtensa: mm: Convert to GENERIC_IOREMAP Date: Thu, 6 Jul 2023 23:45:14 +0800 Message-Id: <20230706154520.11257-14-bhe@redhat.com> In-Reply-To: <20230706154520.11257-1-bhe@redhat.com> References: <20230706154520.11257-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: 5F5A61C0023 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: jxy7d4myxfm8tupjpphcdbf69c3ksxi1 X-HE-Tag: 1688658464-459593 X-HE-Meta: U2FsdGVkX1+3xvuCgcun/XCnQw6mysgPpODUPFG9OpTC33KCGIF8CkU0o/icnhO0VRqq5YqK8AFU5lcVyiyi16P/JK1OcpprDi5kmR77fTmz8xon1V0BjZI6Z81wlhA0xERj/iI+18RxDBkzFfWuVZM5ISSjGlSa7CXgIGy8nAC+j2wBRI3Wr1a7h4C0umu9WjGddU0K9jeVMHRDphMtWjqw6XYFBOxK+wuAIhaImOVzFAFb1C2p5VuhyefRuELTYyuZcKLwbuKjjbVgJbK7G/s2axRWc3GARGT9Sem61FzfSDmqjolri9QGD2PsjVHpp0JXvi0Uh7e4lgEQEvYdr/1CfLFQxZKkmAyI+DKDUfPBHRVxCrdxSLuB+4Ns2vy3QlWx1y0x0qdZD290VQxOMbAqjgyYzLDnJ0dVDokICgKARPZkw4QvelmtcgtNCAToG7TR8MCChM2fHJB0SaUiwHF0uaMQfvdhB4vOOEjrORAeUZ1vdvE8QLpc44mRopxY3sl2h90nULYF6Rl+Og4wt0+0iUQy05SQ9uBkxjr1A5OSnNF2Yz51iqiFwQFZbMziIgeLOUVeUrMQwWoI3snmmWJhwDGNe6Imy52MM2P4Tw5Ot957I4SVYejUv7J3qtxNV0BYaZbYJW3TJ7bW8xNeLcVXf2H82HQfQAO/0OOHIOStIFu7j7TWsriO+yCsLYpgLWN3TSiHuEVQWDNljTa6kN2y5Bfz0rsP58Gv9Z96uxaXVmqCy0qvYHmU7/60wGyQe0lAnrIEIFtBWMcKtBBz7vZpvtBHWTkSHyW+iYd6GbGseqAdVuS2sKFYQ5xA032kLapfFtqReNkut/iONrlsqNKhqaCNB2er5j9NCq8yBt3/bosFwUV+G+ok59MQjMKMq2+6OdP2+LyQJsxSdOJTkFa6b5dyDWbMbiZg6MqCnAInVpilOeCAx9/SZbwi/AMkOdPtuIfThkz9VXaRT4Z rsmYaPPP FZJU28zHQ/+Tsq+K3FlYCsaR2OEaCcdhoq8LROTBcpSAL1RMhoGkaq7qpbcY3rXc/VHUPWxLmygW1CLOIo0dcxPcBmDvCCbSnu1rzt3/afuO52uGOpxaKNnP23W1la9vi71kNDepeaDlmf56OafAtGggCRfbS8xHc+8xZ2ZcAFt4Ph9S4wskzYcCV1BvUaDrmmp+lXaGxiKNMxaudalBpyy2awEWRQGvAU3eK8EQakZCsmtkkdZVlVpmsLkK2LMF/+hoUQ/w98g7xqwjWCrsQ3C0Cxwkm/v0A7s3PBbKdE976bSxNLrcxTV+kX6YqR3KlHn+AR25VvkKj2xYzcXuImoMH3nwCTPEgteO+uQhKMb/pp+o= 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 code with generic_ioremap_prot() and generic_iounmap(), and has the equivalent functioality as before. Here, add wrapper functions ioremap_prot(), ioremap() and iounmap() for xtensa's special operation when ioremap() and iounmap(). Signed-off-by: Baoquan He Reviewed-by: Christoph Hellwig Reviewed-by: Mike Rapoport (IBM) Cc: Chris Zankel Cc: Max Filippov --- arch/xtensa/Kconfig | 1 + arch/xtensa/include/asm/io.h | 32 ++++++++------------ arch/xtensa/mm/ioremap.c | 58 +++++++++--------------------------- 3 files changed, 27 insertions(+), 64 deletions(-) diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 2a51a466779f..a5488cc40f58 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -28,6 +28,7 @@ config XTENSA select GENERIC_LIB_UCMPDI2 select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK + select GENERIC_IOREMAP if MMU select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h index a5b707e1c0f4..934e58399c8c 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -24,22 +25,24 @@ #define PCI_IOBASE ((void __iomem *)XCHAL_KIO_BYPASS_VADDR) #ifdef CONFIG_MMU - -void __iomem *xtensa_ioremap_nocache(unsigned long addr, unsigned long size); -void __iomem *xtensa_ioremap_cache(unsigned long addr, unsigned long size); -void xtensa_iounmap(volatile void __iomem *addr); - /* - * Return the virtual address for the specified bus memory. + * I/O memory mapping functions. */ +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot); +#define ioremap_prot ioremap_prot +#define iounmap iounmap + static inline void __iomem *ioremap(unsigned long offset, unsigned long size) { if (offset >= XCHAL_KIO_PADDR && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_BYPASS_VADDR); else - return xtensa_ioremap_nocache(offset, size); + return ioremap_prot(offset, size, + pgprot_val(pgprot_noncached(PAGE_KERNEL))); } +#define ioremap ioremap static inline void __iomem *ioremap_cache(unsigned long offset, unsigned long size) @@ -48,21 +51,10 @@ static inline void __iomem *ioremap_cache(unsigned long offset, && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_CACHED_VADDR); else - return xtensa_ioremap_cache(offset, size); -} -#define ioremap_cache ioremap_cache + return ioremap_prot(offset, size, pgprot_val(PAGE_KERNEL)); -static inline void iounmap(volatile void __iomem *addr) -{ - unsigned long va = (unsigned long) addr; - - if (!(va >= XCHAL_KIO_CACHED_VADDR && - va - XCHAL_KIO_CACHED_VADDR < XCHAL_KIO_SIZE) && - !(va >= XCHAL_KIO_BYPASS_VADDR && - va - XCHAL_KIO_BYPASS_VADDR < XCHAL_KIO_SIZE)) - xtensa_iounmap(addr); } - +#define ioremap_cache ioremap_cache #endif /* CONFIG_MMU */ #include diff --git a/arch/xtensa/mm/ioremap.c b/arch/xtensa/mm/ioremap.c index a400188c16b9..8ca660b7ab49 100644 --- a/arch/xtensa/mm/ioremap.c +++ b/arch/xtensa/mm/ioremap.c @@ -6,60 +6,30 @@ */ #include -#include #include #include #include -static void __iomem *xtensa_ioremap(unsigned long paddr, unsigned long size, - pgprot_t prot) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { - unsigned long offset = paddr & ~PAGE_MASK; - unsigned long pfn = __phys_to_pfn(paddr); - struct vm_struct *area; - unsigned long vaddr; - int err; - - paddr &= PAGE_MASK; - + unsigned long pfn = __phys_to_pfn((phys_addr)); WARN_ON(pfn_valid(pfn)); - size = PAGE_ALIGN(offset + size); - - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - - vaddr = (unsigned long)area->addr; - area->phys_addr = paddr; - - err = ioremap_page_range(vaddr, vaddr + size, paddr, prot); - - if (err) { - vunmap((void *)vaddr); - return NULL; - } - - flush_cache_vmap(vaddr, vaddr + size); - return (void __iomem *)(offset + vaddr); -} - -void __iomem *xtensa_ioremap_nocache(unsigned long addr, unsigned long size) -{ - return xtensa_ioremap(addr, size, pgprot_noncached(PAGE_KERNEL)); + return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); } -EXPORT_SYMBOL(xtensa_ioremap_nocache); +EXPORT_SYMBOL(ioremap_prot); -void __iomem *xtensa_ioremap_cache(unsigned long addr, unsigned long size) +void iounmap(volatile void __iomem *addr) { - return xtensa_ioremap(addr, size, PAGE_KERNEL); -} -EXPORT_SYMBOL(xtensa_ioremap_cache); + unsigned long va = (unsigned long) addr; -void xtensa_iounmap(volatile void __iomem *io_addr) -{ - void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr); + if ((va >= XCHAL_KIO_CACHED_VADDR && + va - XCHAL_KIO_CACHED_VADDR < XCHAL_KIO_SIZE) || + (va >= XCHAL_KIO_BYPASS_VADDR && + va - XCHAL_KIO_BYPASS_VADDR < XCHAL_KIO_SIZE)) + return; - vunmap(addr); + generic_iounmap(addr); } -EXPORT_SYMBOL(xtensa_iounmap); +EXPORT_SYMBOL(iounmap);