From patchwork Mon May 15 09:08: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: 13240993 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 65008C77B75 for ; Mon, 15 May 2023 09:10:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1BAC900006; Mon, 15 May 2023 05:10:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCBA2900002; 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 B9343900006; Mon, 15 May 2023 05:10:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AB17D900002 for ; Mon, 15 May 2023 05:10:50 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 86976A03B5 for ; Mon, 15 May 2023 09:10:50 +0000 (UTC) X-FDA: 80791919460.15.5643B86 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id B9748C0009 for ; Mon, 15 May 2023 09:10:46 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Z1dR8nIX; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.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=1684141846; 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=Cj/HswZMHXnWMaqNG+JgGGNkjmKUuKmi6GYqnEi0zbM=; b=jLrQFspw468XF3rMT+uNO6pcYjKSm9kEddw3jlc4V497Ng2h41f5+q+fhs7qwtU3HPLBdl UYyKW+nrSEBAWTSACnFqS+VuCsM3IQ9f3sOUvhzTa5a0wgkAS/TH+qsGp5avAIXOhyPdCA NDXllSomYfMwd0M2XLsF2icWwIlrIFU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Z1dR8nIX; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.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=1684141846; a=rsa-sha256; cv=none; b=a5bxYWRGn0iP8Sq3eDyO/5v0XAudG9EoAJMoM2U1GxxyHuOWQyGMxQT0osk1fJGg+cy6rU qrNTXyu43uDrwmVFbTVTIeZS1S6xI/eod7deUe2oo7pT13SdmgolSmCisDKlsHXuWu1YNO p1i9gx8hzx5suqAnlBZ/hK+O4kQX4MY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684141846; 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=Cj/HswZMHXnWMaqNG+JgGGNkjmKUuKmi6GYqnEi0zbM=; b=Z1dR8nIXxjC3qj+iP2ozsaXkpRxYZryFW5XSW+MURzL6Noue2vOluywlBOc+IodUb0o6Ph nKIH2WwIVqtbzkjA1nijVmzdTYhvTkOIZeeom+y4KGCQmXpUeXNK1/J30IpK43kRmI4oQ2 8kZGRGmjz5oRrfbzz7Ky8zniA600vzk= 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-610-jyObHTUBPbqexipS89w3tg-1; Mon, 15 May 2023 05:10:35 -0400 X-MC-Unique: jyObHTUBPbqexipS89w3tg-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 7970D800047; Mon, 15 May 2023 09:10:34 +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 E197B40C2063; Mon, 15 May 2023 09:10:27 +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 , Chris Zankel , Max Filippov Subject: [PATCH v5 RESEND 12/17] xtensa: mm: Convert to GENERIC_IOREMAP Date: Mon, 15 May 2023 17:08:43 +0800 Message-Id: <20230515090848.833045-13-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: 48qoo6or9ebra6g4zkecbsiyyd93t67k X-Rspam-User: X-Rspamd-Queue-Id: B9748C0009 X-Rspamd-Server: rspam07 X-HE-Tag: 1684141846-462742 X-HE-Meta: U2FsdGVkX19XvaSIy21K65W3PN9veQmosTmIVPZ9HAPCd1WWO/QENNM6tgqn72pr7+9d4yM0bFN3zR90wGZZjgbM3ksLuTKdQ1mcSAdLFABPRMZo4Nxr094j81o4UhDDI4XdcNvyXtnmS9t6i4Ue5ryqOIaxANBxbUIi4Gy2d9KGYOTNEGOwnJzz4yB7eDxhMauw4YFC/Pe5tn5JjbROpCZqReFanSsxPPDCrt2vDqmFUmCRS/FujjxE+j6pL95i79TKqt/3bPxJXlnXXXZ0ZimVoptaVD6UvHUTRrbbDph4G1+atUoLQhqNmqsJnO7g8xQXZrYR1o5V0I3FFry2vRFaPwykCGgGo7cp5/N5dyP7bMkEHf464eW4ZEVZ031m1shor4Wk5Dr1/78JKpnX+jZBqkKuYqRV2nUBso+tuLmOfMn8ujfzbk86BqPvRFItRSEFZUnxfcWg7HuclFXXFO4RoHYknNSrgzd2tNcHclfbIhmiRDhEHynmCQDunNBgGUbqK94v8J7MT9w80XLz/LVQ2+h1Jm+TKSl+3esYBARvCRrEifKMhiUVurEhKMirhwtJou2QdW5BMTpn15OQnm/whYDAWGjChegU0WlvaxtAxVHjychPlwJmpdxhM84gAKpbKezysYHGSmQnFBOQmUZyVvvw2A4kmutIDVh5UfejUnHaS4K3qXUd0AJMonxmmncICfKUU95YJ5XbesCm0dZYovqiGIUlEPXy7GeR2stj9MVneAX836tenfxjT7BR/tq/gCvrjU48agBhrHox2UsOWVDv9S/T6zOyM9DkDMknN07tbq8WuXD2na7KQpJ/kjaEDZwDR0Ju3eRPNsn5oWawfxg/EeSWKcT7VX1K7iszUFB99Xy9eI3TuTrcvz71dC9sMidRS9UKZY4ATPk3MMibIqCNgTYb01kJQKpfTAXJnDg7I3s/zuScRL6Xf25ZKHCOZ+rpA8Vce9qyeTn cldLBd9a 5NmSWlSfzhoGQwGA5bCygdv27U+AZAy0bpMoghNmmrx599q3Liw0584CKg7bK/vBfvKTL3Me1x6/LHuvzN1FYPRx1L8cr1PycivTE/KO2fu/18P5GNB2SmFgvrgIX+0TcNTTJ8I9DPPZNxrIZ70OZPPd9sMwJveQYOekqzHbpnSfTFeWzgwt0JHkqbJr/XP8xDymXXmZP33/ZuXTZhdmvjpRcJ6jCZLpFpvOGSTWvNdgVVJmqcgShIRvRFFWqPjJeQ0ov3m616+D3m3yNBqTjfAzWq8aI2Uj6r+vQWYwUBCM6Et6oAd9P0vm0xg== 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 Cc: Chris Zankel Cc: Max Filippov Reviewed-by: Mike Rapoport (IBM) Reviewed-by: Christoph Hellwig --- 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);