From mboxrd@z Thu Jan 1 00:00:00 1970 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 EDD26C7EE29 for ; Fri, 9 Jun 2023 07:57:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 925338E0007; Fri, 9 Jun 2023 03:57:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 888208E0001; Fri, 9 Jun 2023 03:57:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7295F8E0007; Fri, 9 Jun 2023 03:57:10 -0400 (EDT) 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 5FF088E0001 for ; Fri, 9 Jun 2023 03:57:10 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 388531C7272 for ; Fri, 9 Jun 2023 07:57:10 +0000 (UTC) X-FDA: 80882453820.29.7B59F39 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 7346F140015 for ; Fri, 9 Jun 2023 07:57:08 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XIcCyN7V; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.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=1686297428; a=rsa-sha256; cv=none; b=BmXJ9EXF0tgx5EWO9mR6it4f40HJYYabOo41s2MZfuQ7Wcl8wKLaPg2PzvKjRgyRrGXYdX gKm6I9+mffm/7xUjdRkJi2Z/Uszz7aMj52eCeWOVQsU2bzCnP+fKAwFcI5SDTRzLOfXLAm eRB3c1ksp7OXc2SOkYZte7rxHTULMnA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XIcCyN7V; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.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=1686297428; 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=J2JqJ5DVfD1RBef7ys9lCToVJCiVC3QaC6lHIm4BgJc=; b=AvjAGCi+S6GwrKIjGSg74bEw7smiCZIunVESIqy0k34Hza6SshF2NukMQlCJULI4OfuaFe BdpJCDfv8GlilWDIzEX8xO6xgeODv24mCjT5PDbACm7ftNuKEuJvgJnmer0nh4y2MEtkNm qmbCvvULoicaI2LUhHpw1yVLHCNazc0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297427; 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=J2JqJ5DVfD1RBef7ys9lCToVJCiVC3QaC6lHIm4BgJc=; b=XIcCyN7Vt27a6MDWV17TgqsKDiaUP8o8WEJvsLKu0kAfHjIWlYu/RQvDDUte/az+1ryAUr eF1fcg7zu6XkwiiQuft5v05GNv2YPVJGpv6ZOyubYbQptjlCqJpwJkBc8J+Oy7DFUjFpku EEGQ+idQOt7vzmO/Z11ecLbYfdbARXk= 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-425-63ItICqVMnCnNe_-eICvug-1; Fri, 09 Jun 2023 03:57:04 -0400 X-MC-Unique: 63ItICqVMnCnNe_-eICvug-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 A30D8185A78F; Fri, 9 Jun 2023 07:57:03 +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 1D51720268C6; Fri, 9 Jun 2023 07:56:56 +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 , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH v6 12/19] sh: mm: Convert to GENERIC_IOREMAP Date: Fri, 9 Jun 2023 15:55:21 +0800 Message-Id: <20230609075528.9390-13-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 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7346F140015 X-Stat-Signature: 97n1aidaueef746qt8i3qbpzur5wfa5j X-HE-Tag: 1686297428-352272 X-HE-Meta: U2FsdGVkX18qvsfV0eXNQP+B9glzSdX55ZnXBcQ9++OSTA5QjKSpPkH3FxH6vTpakQdwpg9AGNPUK5mzBE/BwPcu0INEVZR4uc3yM5whGdY1an3PvwhcM0gfph1qw9E3iQNkejrGTHsRaV0FF7fdIXL49Yu9uaL6haDLtRm2TBVxIZ4RHFyzrUOLP6rO4y2h/uQca6CZ157vNsa3Z+ZzVMyINCDIukyh7Du9PutBY1Prhf1MoHlF+lmZyn7CwQVvcMmRygb87HI/OVS94uGYM0DVx5FBFmeanpCGmqLBffq4RsoCC1uvSETAVcc26QMLcFp8ipYDVYbY8fV8RV28KLnkeeA04YeZog5r1eVb1eUnVNgXAIOqN3zAOe2Je/OkltqaZkBHoa2QyVEdl2aeWbaqMj1mzhKhwMty0Jo4v3DPkDMRGxps/+R3DL7Sg8+eXl5GUl+6EXZrQEmif4TqC00qvjXtghrof5hKGswh7QWMAx0mdiTiAB57Epe40o4GMH+/GDVZyU3TIydX1BCl1zKcv3pJ9LdN4vw4pCJ7Q2LKjIkZ3EhA2WGOvKZTAp1CYua40b77oWRJw743ezkfazdPaPrGK+i6xfWcmBQ6Fx2PO4VXzM1HJfMIXEEj+127X+UmbUMsW7jVN9/AOE6gzFm3rMIjWWuAsNK63tQwT1adAMaeQjkAFETqhNlbnD3l5LGxDoNq4qDS3BtBHPobRDpKGNoXniUVOx7+2sX2OOSuzkZb1Y/KHS3freJ/LN94Um1veLgJwL6bbNvegp3jQu/MmI1SKt8aBuQ1mEuqRUo6GcGzNv3HnIDRevzrNsnuWyEC5ihrpTt/JztBUPvWOK9rkBXtRgdPiJDgk09J8C5/4Nh9FH6EJAfEPkBNCstnOARIIjDV5IHPbzt8j4emgsSU94MbIjsuaK9NaMiASXYyqnVyt4avAPz8tp+++UkRCmq5yH+f6HT5sOTZs6e POczCzdb 3vI/fJKqsuUV9G/i2L2fcmK6rTmY6s1s/cLMY+X/KMM/E9b5BfOXbsh/eL4Z3nhosdnNi39O4P3TdQQN02AP1Gh8lMXaTV8aWJJ38L5zq9f7PxTC/kHfOE3njyVSmD0/LpdT3tkMw9J7kIY9qoxMQEe0PirSZzYwgJxKPUMe6FIJ+t2eMFRIZ3i/586IWx6tiu0QAgCUNteWI6WCl2uaIQA/s1XboN5CuL5XCxLmsLummUbU6/SciX8dAY5yG3ICxV/jBd2ZAC69vm+2a9OeBiFLbSPOywWNKUUS5aguvs47ynK77wXFoUXLBrr1KuT6A7kNS4tUugAM5em7cRttldw3fCA== 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() and iounmap() for SuperH's special operation when ioremap() and iounmap(). Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Signed-off-by: Baoquan He --- v5->v6: Based on the previous prep patch, this only focuses on converting to GENERIC_IOREMAP for SuperH - Christoph arch/sh/Kconfig | 1 + arch/sh/include/asm/io.h | 40 +++++-------------------- arch/sh/mm/ioremap.c | 65 +++++++--------------------------------- 3 files changed, 20 insertions(+), 86 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 9652d367fc37..f326985e46e0 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -28,6 +28,7 @@ config SUPERH select GENERIC_SMP_IDLE_THREAD select GUP_GET_PXX_LOW_HIGH if X2TLB select HAS_IOPORT if HAS_IOPORT_MAP + select GENERIC_IOREMAP if MMU select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_KGDB select HAVE_ARCH_SECCOMP_FILTER diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 270e7952950c..b3a26b405c8d 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -266,40 +266,16 @@ unsigned long long poke_real_address_q(unsigned long long addr, #endif #ifdef CONFIG_MMU -void iounmap(void __iomem *addr); -void __iomem *__ioremap_caller(phys_addr_t offset, unsigned long size, - pgprot_t prot, void *caller); - -static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size) -{ - return __ioremap_caller(offset, size, PAGE_KERNEL_NOCACHE, - __builtin_return_address(0)); -} - -static inline void __iomem * -ioremap_cache(phys_addr_t offset, unsigned long size) -{ - return __ioremap_caller(offset, size, PAGE_KERNEL, - __builtin_return_address(0)); -} -#define ioremap_cache ioremap_cache - -#ifdef CONFIG_HAVE_IOREMAP_PROT -static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size, - unsigned long flags) -{ - return __ioremap_caller(offset, size, __pgprot(flags), - __builtin_return_address(0)); -} -#endif /* CONFIG_HAVE_IOREMAP_PROT */ +/* + * I/O memory mapping functions. + */ +#define ioremap_prot ioremap_prot +#define iounmap iounmap -#else /* CONFIG_MMU */ -static inline void __iomem *ioremap(phys_addr_t offset, size_t size) -{ - return (void __iomem *)(unsigned long)offset; -} +#define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL_NOCACHE) -static inline void iounmap(volatile void __iomem *addr) { } +#define ioremap_cache(addr, size) \ + ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) #endif /* CONFIG_MMU */ #define ioremap_uc ioremap diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index 21342581144d..c33b3daa4ad1 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap.c @@ -72,22 +72,11 @@ __ioremap_29bit(phys_addr_t offset, unsigned long size, pgprot_t prot) #define __ioremap_29bit(offset, size, prot) NULL #endif /* CONFIG_29BIT */ -/* - * Remap an arbitrary physical address space into the kernel virtual - * address space. Needed when the kernel wants to access high addresses - * directly. - * - * NOTE! We need to allow non-page-aligned mappings too: we will obviously - * have to convert them into an offset in a page-aligned mapping, but the - * caller shouldn't need to know that small detail. - */ -void __iomem * __ref -__ioremap_caller(phys_addr_t phys_addr, unsigned long size, - pgprot_t pgprot, void *caller) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { - struct vm_struct *area; - unsigned long offset, last_addr, addr, orig_addr; void __iomem *mapped; + pgprot_t pgprot = __pgprot(prot); mapped = __ioremap_trapped(phys_addr, size); if (mapped) @@ -97,11 +86,6 @@ __ioremap_caller(phys_addr_t phys_addr, unsigned long size, if (mapped) return mapped; - /* Don't allow wraparound or zero size */ - last_addr = phys_addr + size - 1; - if (!size || last_addr < phys_addr) - return NULL; - /* * If we can't yet use the regular approach, go the fixmap route. */ @@ -112,34 +96,14 @@ __ioremap_caller(phys_addr_t phys_addr, unsigned long size, * First try to remap through the PMB. * PMB entries are all pre-faulted. */ - mapped = pmb_remap_caller(phys_addr, size, pgprot, caller); + mapped = pmb_remap_caller(phys_addr, size, pgprot, + __builtin_return_address(0)); if (mapped && !IS_ERR(mapped)) return mapped; - /* - * Mappings have to be page-aligned - */ - offset = phys_addr & ~PAGE_MASK; - phys_addr &= PAGE_MASK; - size = PAGE_ALIGN(last_addr+1) - phys_addr; - - /* - * Ok, go for it.. - */ - area = get_vm_area_caller(size, VM_IOREMAP, caller); - if (!area) - return NULL; - area->phys_addr = phys_addr; - orig_addr = addr = (unsigned long)area->addr; - - if (ioremap_page_range(addr, addr + size, phys_addr, pgprot)) { - vunmap((void *)orig_addr); - return NULL; - } - - return (void __iomem *)(offset + (char *)orig_addr); + return generic_ioremap_prot(phys_addr, size, pgprot); } -EXPORT_SYMBOL(__ioremap_caller); +EXPORT_SYMBOL(ioremap_prot); /* * Simple checks for non-translatable mappings. @@ -158,10 +122,9 @@ static inline int iomapping_nontranslatable(unsigned long offset) return 0; } -void iounmap(void __iomem *addr) +void iounmap(volatile void __iomem *addr) { unsigned long vaddr = (unsigned long __force)addr; - struct vm_struct *p; /* * Nothing to do if there is no translatable mapping. @@ -172,21 +135,15 @@ void iounmap(void __iomem *addr) /* * There's no VMA if it's from an early fixed mapping. */ - if (iounmap_fixed(addr) == 0) + if (iounmap_fixed((void __iomem *)addr) == 0) return; /* * If the PMB handled it, there's nothing else to do. */ - if (pmb_unmap(addr) == 0) + if (pmb_unmap((void __iomem *)addr) == 0) return; - p = remove_vm_area((void *)(vaddr & PAGE_MASK)); - if (!p) { - printk(KERN_ERR "%s: bad address %p\n", __func__, addr); - return; - } - - kfree(p); + generic_iounmap(addr); } EXPORT_SYMBOL(iounmap); -- 2.34.1