From patchwork Fri Jun 9 07:55:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13273364 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 ECBCEC7EE2F for ; Fri, 9 Jun 2023 07:57:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D45078E0001; Fri, 9 Jun 2023 03:57:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF46D8E0008; Fri, 9 Jun 2023 03:57:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6FDD8E0001; Fri, 9 Jun 2023 03:57:26 -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 A44D68E0008 for ; Fri, 9 Jun 2023 03:57:26 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7CD2E1C72C5 for ; Fri, 9 Jun 2023 07:57:26 +0000 (UTC) X-FDA: 80882454492.24.79BB954 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id A8FE61C0006 for ; Fri, 9 Jun 2023 07:57:23 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eEB+oWLg; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1686297443; a=rsa-sha256; cv=none; b=SwdU/Y24PROS6D8cA73WKQhSbO9Ds4x9pqoolQDocRinSMVeZM84PbcYeI6QsjOy9WdtOr /bNMZzLGf2GLBhA+Q4rUAlgYcXugvvYZ9GDcKyTZmsJ43nBNUCu2G1lmQJn2tOAaxcUYcP aZcOCvKo33hzSar6Qjn2iOUwEIYytXc= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eEB+oWLg; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1686297443; 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=8xAEmv+klZL2q1puNU7BpopKMmAERiOcnE6W7aPMkiU=; b=ofaVWC3GNcQeIXrmY9Mi/1DKg6C+eRFmWOc0mFk/L1hjIy8SZcJ5u3IH/oI/2xrNspHuuG xVT0IYAXamS/YCwRY4Zh8wrYOspjS6tXCSDn7g4AvpY0FHPiCr8ZlytoFRqvLwwj2oYEm2 Z2hMG7ITyJnZF/uO/EALTgp0pe4mGh0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297443; 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=8xAEmv+klZL2q1puNU7BpopKMmAERiOcnE6W7aPMkiU=; b=eEB+oWLgIeSIS79dR/T7Cn257So95HmunI7F4LTe+KWgXd5/8d4kQBx2cAZOfN+myMrws1 i360/sF6IXHBT/E+n7LfMJZDFQHByrBpMKABqYw2YkEmO+PmJkLqiabYRevODsCiTdOKYA nZpQwYYnZ+xpAlQ3NFvry/YK9BSFnDo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-578-c42ZBneGMXScmgFC4Vjc7g-1; Fri, 09 Jun 2023 03:57:11 -0400 X-MC-Unique: c42ZBneGMXScmgFC4Vjc7g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94D0B1C060D0; Fri, 9 Jun 2023 07:57:10 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-92.pek2.redhat.com [10.72.12.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48A5820268C6; Fri, 9 Jun 2023 07:57:03 +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@lst.de, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, Baoquan He , Chris Zankel , Max Filippov Subject: [PATCH v6 13/19] xtensa: mm: Convert to GENERIC_IOREMAP Date: Fri, 9 Jun 2023 15:55:22 +0800 Message-Id: <20230609075528.9390-14-bhe@redhat.com> In-Reply-To: <20230609075528.9390-1-bhe@redhat.com> References: <20230609075528.9390-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A8FE61C0006 X-Stat-Signature: hyfcerew759zobz9pcjqeeagibrqaef1 X-HE-Tag: 1686297443-908210 X-HE-Meta: U2FsdGVkX18b0T/TFzpJLzFy1HNWQYzMdaD3fRnofHunBezC/SQJ5PTI9eQVvEq4mq8/KxLWU9l8PLn6WArm6rcdpQTpw/KFVxxmDu74oG2LhmPNJLbcxfNDhSei/pepEZS2qLBTi4SGQhk1cTO46ei0bgmXJj3mNhpl51QpIpUAXGuYjbGXlr2C1wTB+5GFl7PP/fypHyP18KdKYxeAWDWGz2PdGKiXr/A9tJJq1wErUzRkwc299V8Yms0vkVFVK5syveN4sksdU9VJ/ERkDmwOUkNG9za9txe9CdiHn9g4CWQFGcRyamD7q6yuH9aARpOU4vCK+WsqwyunV3mWAJxThqc6m6fT5L/unjgJkS46rYMxiAf1L4HKymfA5SRWDuhp3uJJU49/q2tsvviyXxgiUfjX43q7mFKBCLhUDw8pyJcIRRxo/9NfcUW6f1LG6Thn20tUjKK26F9kkseHKlru4bH3c7ltmhybaQvE3vp1wlx560GahNgY1losgxRjge6CMUZoPX17KQSb/V8F/ATAeFRjMHeFzp6d6i/rBNNWS91V5as4WSAiBIt0qDsSjUl7QJNZN2o/Xik6J55lAuySxin6O/Up03hFXf9gbfJ+ozVXRLrUgfdonXgac9F3CjYFA9v+VynlZ2hGk7AYDFhqt+N0jwBB4xxVev3+MlGqTfeTWvKoc87d229BCj8bsT/zvQ/0/ZVTb662LhyYV8qf+0pKcJS25xhsBXX0Sz/5V81DesSz4K/6xTosPSCD3sqELV1StkRiJIcfheJF9dII//Q4PYrNEfcy61jwIP7a8TecMHsZ9wfJAG0QtfYf/f5GAeAJsNLIwLsYEG19V0snQG9gRz1g4AdW4y71bgjJxfzznMvVLk+57lqOjqAeWVLFWRVJBlLcOiaTTZlYLTVxeLgLWxcg+eF43+OMrSW9u34K/Edl4fyt4cwqRR+PwJGtthPNAyAS8E9cchv sVRH2h5I hLVftmojovDO1AjbDy97zXt2hhJSJ4q27/j1ljOSaPWX3Ug4LgAJZVAnnLJUzg1Vf27tGobXXM3NpftOEk34zi+M25NPHylYoxJBsbftNJsphaBSJvlBQb38Id+5gPabzYgXTVeGMpT9nx2AzshRxBdT1QjayYFbItCAUia7I3DPxQKvTp6EjVs26R8EFAjb9zNFy5GgJ++75dXZWYjy1PsHMfj4ld1e4rAVssZc3ZPaGpYwGGAFtfGOObjF5w/XjN7ELPwUwHN50V8mwDJPiOIIF5jYoUCtq8zER/wqWIVkUZYqTG94jJClaSJLpUQeHCwPgj+r1PrjDCw5bymhGU1EZZ4/fwA1RBw35bvVwfL9P6Io= 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 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 3c6e5471f025..474cbbff3e6c 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -29,6 +29,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);