From patchwork Thu Feb 16 12:34: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: 13143037 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 55C8DC636CC for ; Thu, 16 Feb 2023 12:36:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEE056B0078; Thu, 16 Feb 2023 07:36:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E785E6B0087; Thu, 16 Feb 2023 07:36:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF1796B0088; Thu, 16 Feb 2023 07:36:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BCB396B0078 for ; Thu, 16 Feb 2023 07:36:00 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 70248402D3 for ; Thu, 16 Feb 2023 12:36:00 +0000 (UTC) X-FDA: 80473102080.29.80314D8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id AEF524001D for ; Thu, 16 Feb 2023 12:35:58 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fkxopdkS; spf=pass (imf04.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=1676550958; 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=gzBZFYNAI5CWgQZG4vHMuuNoYiHyiInao6WD8eF4a1Y=; b=htEe01XPR+s11lnk1lwiS4cOFtiydmAYHfd/wlcEW28lNdU+It2HyDoQ3lvLtdKEWHTeQb YnEFJfOZzOLV4idELdQ9n6vfCiSBpK5q3ooQdSNqtbHZSulhgR9XRUzSE8V17JI+N6Z982 ohWuCe3XVN7TRTpxOlHgk/Dz9c85Xfw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fkxopdkS; spf=pass (imf04.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=1676550958; a=rsa-sha256; cv=none; b=koZIFi6l9gEsHfhCsmVIWuoZL4YQjxwwuxNQQ7APv7qFgZbqmZUjkbGU/gKRWUUSSMILj9 JjwBeW64shHRn4/SZ5vpXD3B4PsGQw0ROYYpIffSzVXqPPDKZraOTW5VZgBCwwA6/2NuJL j3SaDb+PpMRWW0K62KIgPZ+PmbSADG0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676550958; 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=gzBZFYNAI5CWgQZG4vHMuuNoYiHyiInao6WD8eF4a1Y=; b=fkxopdkS9WFTciFbjl48ofcEyp9s71Fq5+kBK5HWQttsst+GcZ4H/FKFL1TvWKPi1Ldnfc fnaCdWavSrKbkKtS3NaABbXH7y67sULoNERgFLbDOFltBUn7HidpAiGLQ/OnzYwkxN2zyi uGDxyHskGJJRiwcgOFnBuC1PKIU37/E= 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-607-ywbtoSvKM9qMPNf60mgfuQ-1; Thu, 16 Feb 2023 07:35:55 -0500 X-MC-Unique: ywbtoSvKM9qMPNf60mgfuQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2690A3C16E86; Thu, 16 Feb 2023 12:35:54 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-99.pek2.redhat.com [10.72.12.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E3B3492C3C; Thu, 16 Feb 2023 12:35:47 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, 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, arnd@arndb.de, Baoquan He , Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org Subject: [PATCH v4 11/16] xtensa: mm: Convert to GENERIC_IOREMAP Date: Thu, 16 Feb 2023 20:34:14 +0800 Message-Id: <20230216123419.461016-12-bhe@redhat.com> In-Reply-To: <20230216123419.461016-1-bhe@redhat.com> References: <20230216123419.461016-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 1b64j9nkr4ez3iq9ozkafetq8fdpo4c4 X-Rspamd-Queue-Id: AEF524001D X-HE-Tag: 1676550958-366316 X-HE-Meta: U2FsdGVkX18Dwu+b7DIRFpZSyewKvrgH14ZcIEiAwJXtIuqVJzHD/I2JyeSdmw/D/K5vv+/FE2sDgDuWJguPrzGyW2x9RtYvnBfOB5qJ7mmRhnJ5PBpNNTGIQnFzm6LkTHjjLTuRokF/KdCaIEeBEkHLTxTy7Yxj8euSg+8S9AmyNQF7lwTw16XmJM/exbY97JpHVpAB2XFmu+DOWRFxzV4KohfH66X29g825IqOY3eYxZIswf2MG4luWzfSmqKGeADcmJ+FfBRZjlMXdVxOIunSKMm0Y9Y6gazyXXqTt5TAD12xViJCwLE7imjIgHetmfYrJbfOmgjYY8bqfc0PGYX6pDzLdecV3OtbwgsuCYmYO2d/h1QTgmlUXCe+Y/PBJw3DypJWHjNYy+SVzWo9j8h5mxzDh6uDHRbmF6nLwZr4pCETYlqTLynPL7mFeT2NWYN5FjBe/RglWmqe3vrsAey4ctZtDNBoojmtcp5e6smTFoliDh81ItfWCdQneIXYIZgbB4em2+K0jvPX8nFuBsTcIeqgqR2NsJHt+AVZ/nLu79RhLd7aiuHvppUBxAKcPMpxJNnBPAiNqHM4kAbpkrch9YzftSH6e9Tj+jJ87qY5vTvzJQpdx4zuqr8BpIKWVN7HRTPT47SLmz7sazNcg+de7/pShDsTeVB2sKCDG4UyfnDtfcxywcidrOQMoTbJfnMT2oqZRYlSpuyaJJoT8ktZA7tRlEqAXEKQF5sb7h6+bPKajp7ffKtwZxByBqyfubYRkY/XDtYf7zFb8yoUSko1m9VKBtQQXc0Gwm2HJU3TOFqK0n5NMGWTg9zkrO8YUqmsVe6hzisAioak36jM4dOAoMee5CbbZfmtFLHNb/O9akKnlp0S3zPeFNvbl/H9VaNPahzQlRMWt6KYIUgmZQ0KlfyKvbYc1a7YOOSG21DcQ1EYygfgod/xgbLeP9V/gclg9gU7enuN0CqWgwf /7hGduax em8q/jYgD4F+UnrOoZMH0EqLN7Vf2+DYiBKpqZgE47X5ov3t/cPbiDzEO3U7o2Ggi3HB3GswpViUuiYLHVZlJaeeshPNcH5vTN9qDFmWQEj6vn/Mr8fwxl7+GWkFBrc+GKbEPJALjG7dpRY+D6wvnunzhYqGxnqKn9H8XLp5x571s0dtKLsEiX4KPuzzeSv61/gyvYC/tEbS0SARR1z66kzYr0XYqXBp5rY0+XDHrMyo3er+ilmupvz9Ggt07HohWpxebOJVImPvm52OlX10n1N52lffGoX9dVRgo+Gbw00enJb7nNJyE5t7hLT4piiaF3TL2RCTMjHbdmSjgEky3TiMmNsQBlu5f4CycVf9rHPRzf6m1F2W6tVSJiW540P1j8PUd 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 Cc: linux-xtensa@linux-xtensa.org --- 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 bcb0c5d2abc2..465d5981082a 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);