From patchwork Wed Mar 1 03:42:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155578 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 35490C7EE23 for ; Wed, 1 Mar 2023 03:44:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C49B26B007B; Tue, 28 Feb 2023 22:44:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF9626B0080; Tue, 28 Feb 2023 22:44:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC2916B0083; Tue, 28 Feb 2023 22:44:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9CABB6B007B for ; Tue, 28 Feb 2023 22:44:22 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 775FCA0F67 for ; Wed, 1 Mar 2023 03:44:22 +0000 (UTC) X-FDA: 80518936764.05.D0DFEF9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id B7D97A0003 for ; Wed, 1 Mar 2023 03:44:20 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="ERa/GmnD"; spf=pass (imf25.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=1677642260; 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=9whDoNwe8yovUO5v26C7zBzC5y2FxPUW+aeJ84UAlAo=; b=2pwTezYUxfpZFDIhCZb2bP2Yx6pyTr6Cu1xgwMLtPJiS+xmM5jF/Sfls9nlfwhrSDEAhge nOYVsavA4J5bbeVRD0BBu+3K6MNxwdy2l+xaaoasbr8N2PDdQzehO07zIeCNKjHZl1BsxB 6h98AoNOToTZaFX09gW1sCzXyGDHjTI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="ERa/GmnD"; spf=pass (imf25.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=1677642260; a=rsa-sha256; cv=none; b=TKaYyCpOupfsofPes3JGwbqg+kNt+gM48aak1P6YqNkCAMSXkOYpsov32fnZHj1aiKSbW5 k50ZC7O/0F6pR7QEUhX8adz4MKx75ON+4v5GT/Vg4M/tKlqAijD9YShRdUsym/B6d0lkHN SK1aIBDP4Wst61qBIZFeyOXMLWRwnmw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677642260; 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=9whDoNwe8yovUO5v26C7zBzC5y2FxPUW+aeJ84UAlAo=; b=ERa/GmnD12OcKkdDlUerUir5oQnlrSXTuXKZMoyDT73hAU5wRfka0O7/zpQNjp3jvvUi89 CJWuJ4bQ0JoRR9wWNba2aPSRQB/cKQiFvtBRAVfzpBJ+MQ7u5ow1dZ5u7vNP/D0GfQic6B wJ4JYnCp3hHOEqq1+2D2puWutjhsESs= 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-133-2dc4BHpnPxaMFbTsR4-azA-1; Tue, 28 Feb 2023 22:44:15 -0500 X-MC-Unique: 2dc4BHpnPxaMFbTsR4-azA-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 B38403814589; Wed, 1 Mar 2023 03:44:14 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-180.pek2.redhat.com [10.72.13.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B5DEC15BAD; Wed, 1 Mar 2023 03:44:09 +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, Baoquan He Subject: [PATCH v5 12/17] xtensa: mm: Convert to GENERIC_IOREMAP Date: Wed, 1 Mar 2023 11:42:42 +0800 Message-Id: <20230301034247.136007-13-bhe@redhat.com> In-Reply-To: <20230301034247.136007-1-bhe@redhat.com> References: <20230301034247.136007-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: rspam03 X-Stat-Signature: rcwo11kdeu73de17z81u6o4sct585mb9 X-Rspamd-Queue-Id: B7D97A0003 X-HE-Tag: 1677642260-98640 X-HE-Meta: U2FsdGVkX18tr0bU9H3flMWNK49vhXtXN1pKimJNwF/oJs5Hu/kXzCyub43Yv6NEZQ3XWzAxa6KYM2XGOmT2QgWBN0aK2vdGR8VOJKSSk1H3673kQSV+aPW7sTV5WdV+O94gsFadsERkCeL4w8yzMwWsFdIBhwv5QaLV79uFqQ/MBttoTS5hyc7k9yqvG9P9D+OBdU13crTKEgxA6zzNdTRuvxcFEC43MtzxsjKGCjzRMMYkzCJM2B5l5dWnEsamBEb/GI6pUOGn/ii6MjhrUfs/DQkgU6H+SQG25Y8RqGicTnh+wgrYZ2SvR2w8zVo/bOAO1gwo95iqvWGhhbl/kfezduPUWMhp4DzpmbsXwfYce0idO3WergKICORgVaHD0gs9zk5CfpKoLEMSA0UcJKfEbXQCJD9sWusLM90PYsYFIaCCGme54xYSaKNt/fecK1+hsfO1qfWsvGqkHuqJ1sv5nV/Bhvumua+Slw12zpoYIC9OHVNk4MMCQ4V46MCORw4EYjDgYpF3scm1xhHxQAqDHCxoKsm/4CwAjPFe2BV6grT1+fW2uqH2jrE7k4yKJl5uRkyvVz3bo2Cm15DDGbdAgiws3MRzZV1qpPfLJINpGSBlKgIjsM2+ILZVo20gjT5Y5mZjNy3Jz34WAvGkFc9qk1IMnPpu6Mv2WGLp9d0zu67o44CCgv/ldB87piwrT2FxRLOqjgaswEUgAuxQYXRFuxhNlJp33q1+DbRToUrs6OZV5yUlaDA8SkQ/WeWJR8T+YM7+vav99fY3jKc9YS0E9h5brCsYalwjTJQT/brfIVM3IdqxzBrd3D8Ed3KDBI5G299STmiSKdgkKXZZmN3WF0VDtoAL3n5CmaE9UHcBZ5+TmFdJp042fqlKBlZWA2+MTwj+gKIwjOZ5xnWfdCQcOsZOc4ZOjwwDlZgX+dHNbZl4EaTaLmlmNoEGz2IJpZwA9+h7cpH7US2vvoa j+BV381o BZFDVj9bgqnNEoU3V6gKw+triy2Z7NMau64jQeuUIm6wm/tJlT2eO07LOuzriO6Mzot2EfjRL5PL38IRtJUNbveuyyUyBTo8ELubsF/d3cvQFF8SqvirXtlpCC1H6snP7pE3A/bsilmEZdruXOAlFeNpIJOM9HPyr4QioMJ/2GjI3knzHgFK2JKo6nzOfqb4QMGglZCYFcRcC2NDEar+rOkJsq3+jQY79bB26NbLeHtsUFNA= 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 --- 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);