From patchwork Tue Jun 20 13:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13285839 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 42EBDEB64D7 for ; Tue, 20 Jun 2023 13:16:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D42868D000C; Tue, 20 Jun 2023 09:16:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF3168D0001; Tue, 20 Jun 2023 09:16:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B94718D000C; Tue, 20 Jun 2023 09:16:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AAA5F8D0001 for ; Tue, 20 Jun 2023 09:16:46 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 73B25A0F3F for ; Tue, 20 Jun 2023 13:16:46 +0000 (UTC) X-FDA: 80923176012.17.0691D6A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 98146160021 for ; Tue, 20 Jun 2023 13:16:44 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AX9hz6ey; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.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=1687267004; a=rsa-sha256; cv=none; b=BWto91fFNu736Y6cK7z6iPVmRiHZm4uKboS3MT/iUEEONGPwyu6HkoySgk6E2InsJ50yNH XA1hQF0s7nZcyilZbrtiG+wp2RqftP6jKKIRFj6YUzf0sbOrtx0Tbagp+7cAjh6LM24NmK Yz/N+5xqUUwsAnIxhitTayiZPgT2kpY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AX9hz6ey; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.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=1687267004; 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=zd7QrNF+ZrQamYBi142fq1nMRYytmpYaiLRQqqZBeTD594JI+fn77qNH1USNyKtYtK1kZJ ee0ptWsy18rZHCN/MFvuLx0tTuy8lCeKx/+8jVcLXut50PncJ/nrvHZo4xIqS6R6pnc9UE raLwfxv7wxV4LT/0gL5rSnkWpxuw8Bo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687267004; 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=AX9hz6eysv7sXs84ADjEL0Om6flUxaeWOdCsSrxM6J+YVXrzNudNG9ahFvQ5tstUvILwPx +Dq2Jy/tJVDf09Z1TpCqvbmeAMPHGrfqLXAO9W/X6cCovGgXjQtA9D/h4M7iPpKvQ1MGyd cAM/UjsaDc/3SIJdSCOz83bLyEJ4Zy4= 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-651-dyXzD6xnNfqy13qwCKG8WA-1; Tue, 20 Jun 2023 09:16:37 -0400 X-MC-Unique: dyXzD6xnNfqy13qwCKG8WA-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 C9B031C09062; Tue, 20 Jun 2023 13:16:13 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-166.pek2.redhat.com [10.72.12.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BC13C1ED96; Tue, 20 Jun 2023 13:16:04 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.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, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , Chris Zankel , Max Filippov Subject: [PATCH v7 13/19] xtensa: mm: Convert to GENERIC_IOREMAP Date: Tue, 20 Jun 2023 21:13:50 +0800 Message-Id: <20230620131356.25440-14-bhe@redhat.com> In-Reply-To: <20230620131356.25440-1-bhe@redhat.com> References: <20230620131356.25440-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 98146160021 X-Stat-Signature: 389or7fdjh83rhtud55o7rjtxsjbx1fy X-HE-Tag: 1687267004-491407 X-HE-Meta: U2FsdGVkX19T7VlEKQkIHFzV0vdUCm8Lsr6TLu0+cl8K2N6a9vGzgIjIpWqSfIL4+vfAu0EQYOY0AmnpYH5s34NE5VTZhL8LdgmpgnA/lN8EnXQQMXwLU+lVMBgVVGgDVuIb0VX1j2fgFxDt1p0saRgE6o8FGCdBSVpGKt5avB9l6d3Ze47rohZJa/4weVDGR7UpP6FaPbt33+rr3rJs4aWblXuaQNT/mo3yQJEkpHlf70s2IhyNDokW7MnPd9tPp3INasV+YXIa96Tx2BRo7Fqr7+4HXB4bR4LhG751CTxarYhcAvihAiPecenKLNrjfwyJMuH1xhdGslLbJu/Cn8/bPEIClQT3Sfmz32iswa+5sLw1PdOPbOAosKAKLjfJyZKlpdLsaU5HfgYKXYqWQud5xMp/nWpg36H9MkHaS6cRJdYcIHbNDinUUd9/RflTqU4LfDOy2cHJdGWztGAMIMdovHON3BGKcTL/45jMcCHXAiiWLa1cz/BdABxZ/RKvuaeCPnUmEVRFRd0LI/VuIflhc0MYn3XqiF7gLo9sujSmXy1pyu6+ZybA2GbsZOsRpSv1SCKF2VtP5avSOPT53Xd5KrCW3uksMYcdJVv5b0SjQgJBrHKHHlytz6MDZeKM4I79S1s9EMrIm9g6xdAjo4f28Vvl62gGHLNa5pzMyEzeR1LGkTAMxyTod601Yk7ZTfjJaqaj0patBHhTnPmCgpAymj83NUKdqJQDJI+zghWlwkc1TAECqSIXoh0HPnH3dDjA+9EW2wY/UVwjlCy1A+5mAM4D9A9GXW6+nrwPw9vN+ZVSI+6ZFN90G2H6wXivW0duzkYVabvpVhUtl7JhO/i5KqFBwSEoFbPOaIMlt7SXA136iXZ/TrZhbSyqjfv+1eRyoeD30jBHese6Kbd88RbtQVX5aJWvuY15bh0rPfkeTnFmVEpUq5Uf1R0hb9SYIAy1rG/A7DkN9JL7drk FRjlbehO +bOVwcvyDDWri9YsmWS55QVKshDMdbDXlk/iVIOSCf5SYIJCiG3AMjihNZDwUz7XHJ0IMnVidRTksms2lKVRvrRW8h1yqB6V4/yR/P/uw5b0sWdjuEF3jp1NcvxHrsqFP+uNZ0yJ/dcD661/cK+W5n7LhGuOwmUO++hgAlRIkBtz4Vszs1zlDqNId4lpGZj3ITE+hg8iMS6g1otZWjex9Rk44khrRPqfh2aAbC0tYgyo8XEKBg6suyC+U0eHhMqjc+FOYVRT+SUOSnleLjImS9mQhsXJPjlA9W6VtALIDsJ1WaOEzV75pJaN0dKkAgzP9NyDLz5fcVay+2+ezEN70R6rRIWiIYE0vQdM6igDncReihhs= 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);