From patchwork Thu Jul 6 15:45:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13303956 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 19545EB64D9 for ; Thu, 6 Jul 2023 15:46:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB8566B0075; Thu, 6 Jul 2023 11:46:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A681A6B0078; Thu, 6 Jul 2023 11:46:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 930378D0001; Thu, 6 Jul 2023 11:46:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8216D6B0075 for ; Thu, 6 Jul 2023 11:46:04 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 84313804C5 for ; Thu, 6 Jul 2023 15:46:03 +0000 (UTC) X-FDA: 80981613006.21.C80A842 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 712A54000E for ; Thu, 6 Jul 2023 15:45:59 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DIa+yfdR; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.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=1688658359; 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=mrpD6SwU7RX+eLIqGEOviqMeuTumyLFYQ/9zvaQiSxE=; b=M1N1eH6RQW17PRTaeSs7MH2J42OfDmJtP2z60TiVTy3Or/KBZ1sLDTy5Jg/BDvGNEd/J16 /kSZ0vk+MQ3zIXpSvIe86bEufPIdicK4uv+Id66mgTLiKaM/LrvURv5uXJC4tbKq3x/sMB CaUebHjJBIm9WrIvazkzxcmc4L0WCI0= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DIa+yfdR; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.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=1688658359; a=rsa-sha256; cv=none; b=yHjZMsQ5mJU/K8kUcXRtMyY23HOkHlb5f+QN9CiIyXP0HG0Ce3BSiSpaqu+bq9vpdG0z0v 3+iCAdVSnbAcy1C3kO7T5Jr+0Se55iWeaSXNWA0dDhiZmWRAwDl5Qo7LAjPqhUY0UcXZbg 0/XFCveQr1+1Dc+ObfYxB2P1OfgCNbY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688658358; 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=mrpD6SwU7RX+eLIqGEOviqMeuTumyLFYQ/9zvaQiSxE=; b=DIa+yfdR9rmO5hx2gvA13QfpDo+mN0fYIMug7KUDSviu2cxCLfqC5qbSxlY7otxnv9fo+G nlUHvld826owkjS7GksnRunyRxjfV2b8+AuHGPrsSNcfhM/OfJ4OgddFmQOtawBthxy1+p IjiBsD3/qJ1zo2PzZqZcXz5WuDVSKNI= 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-601-mre9K1UsPoOt1IOmZqTezw-1; Thu, 06 Jul 2023 11:45:51 -0400 X-MC-Unique: mre9K1UsPoOt1IOmZqTezw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5318B3C0D845; Thu, 6 Jul 2023 15:45:50 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-39.pek2.redhat.com [10.72.12.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 067C9F5CF0; Thu, 6 Jul 2023 15:45:41 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.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, shorne@gmail.com, David.Laight@ACULAB.COM, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v8 02/19] hexagon: mm: Convert to GENERIC_IOREMAP Date: Thu, 6 Jul 2023 23:45:03 +0800 Message-Id: <20230706154520.11257-3-bhe@redhat.com> In-Reply-To: <20230706154520.11257-1-bhe@redhat.com> References: <20230706154520.11257-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: 712A54000E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: pnnfzezr39ojf5czpnijfcik4hdo5fnh X-HE-Tag: 1688658359-289462 X-HE-Meta: U2FsdGVkX18HZwz8Qe0VnykIl96IH7TvjSnImpKu3sKrSFEp0Nr0lo50RBEIjZZn9zXVrBOUNvk8r4ISitMdWXPpU1c6W9kcQp6E9UP7/E50lVd/4XZKkFtPEbaUuT1vOTzTmgsUYD5ObwCP2B9HSZWiiFU/Z7HpEQxzeFwnZOJx48Mum/y0a2lDZ25Z2IPS0uFye9VkEgq9szGSU0rws/aISlkstiIOl2mV/0Jqp/HfokaEDFH7Ka9VkS4N0xA3iFoxEh4jfeDdZUPTBaQ0KPJqYBAVWLaSY+McOcxiYZPuKl3/L8DpK+cQ8egEu7i+LGz9Q0fUQEUhoVQ28PK05/gNuxLe8o2OyLyg0yOK9KI/kVs6r8SHCI94R6Soo5tVWkyfWEfc2Fv5fSmoOJPVGyujc6tru6wMUSBmEDZU2XXA8jjVudIrDjVXElVwdc5+Qn8/BBau2qNXR6vnS4vEmNEVnw/joGYS9fAWY6r+W0efubW9IgvHErdnbjNjPb0G2utRgTcqTsgNbQ53Ogu5odW+bwKyeZNxRgVio+MRgw4kDC/iqLL69mbtL3Av2i1pGVAxxuRmehX5w7RBbir+EcNunTB7LCXcbXLqcMYKhRGdSfs1IVyHrEXvV6IATbaHFSo4TbD5yxHZFjc7dja5bbCmKD/rADwpXo4Ke6VMCXFjLXRqhsaSv8GugVhl8JF2rkLbW1oUXz5ib+NBXI+eLzESvUrFiSchpUyk2U7pkcI9JDXgPZf5GEw+fLyh3Z9cm3PPLDSync5Wx3sN6aG0aNWx02xt2mXplj6pEZzpOmL+Fu+n6hb4lKi+j7kOd949QETg/xod87gxaoAm5gVZwadeWD2iQ8+5ObYXhvfjOZhMs33BIwGyRrkZ+UclosphZ/1pzblqR/xzgzAvzOvGBnQ5xIbK9oDpBpvY/o85Z/5FIEKihPRIaldKeITzDTvaP+AWzCVzptwAFYdsnDC 7tZg9ibN TIaghd0m1fG26GRkxaGH+62E20/hJIxC34+ZdBKWR66XjquTU2g791lD+THDDaCph9BycmAkByENSiCKkR0lc1Bp1Ds07VN41wawJ19UAlbTnm9jSixB+piT1jqPm7c6jRqipzXMvZr4JMk7nBZQQ+RDlckMK69myiavt13HowJn6gzn+tPTyoT7B23e7uZYxPT4OEq62jBwfvWyTQHJmkS4Vv1RZST4GjeynsSALu5IgUwhDbrtb+RMF9020XaRwveL0WK5hl7QxdtvXZaNwb8wPguEhzbQNG53zB31hZES8TjmGlAx7/uz5sVlwVbRUFWfZfeEe9ZMxaaA2xEPvYlq0gA== 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 ioremap_prot() and iounmap() are visible and available to arch. This change will simplify implementation by removing duplicated code with generic ioremap_prot() and iounmap(), and has the equivalent functioality. For hexagon, the current ioremap() and iounmap() are the same as generic version. After taking GENERIC_IOREMAP way, the old ioremap() and iounmap() can be completely removed. Signed-off-by: Baoquan He Cc: Brian Cain Cc: linux-hexagon@vger.kernel.org Reviewed-by: Christoph Hellwig --- v7->v8: Fix the error reported by lkp test robot on patch. Thanks to Nathan for providing the code fix after reproducing. arch/hexagon/Kconfig | 1 + arch/hexagon/include/asm/io.h | 11 +++++--- arch/hexagon/kernel/hexagon_ksyms.c | 2 -- arch/hexagon/mm/Makefile | 2 +- arch/hexagon/mm/ioremap.c | 44 ----------------------------- 5 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 arch/hexagon/mm/ioremap.c diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 6726f4941015..a880ee067d2e 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -25,6 +25,7 @@ config HEXAGON select NEED_SG_DMA_LENGTH select NO_IOPORT_MAP select GENERIC_IOMAP + select GENERIC_IOREMAP select GENERIC_SMP_IDLE_THREAD select STACKTRACE_SUPPORT select GENERIC_CLOCKEVENTS_BROADCAST diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h index 46a099de85b7..e2b308e32a37 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -27,8 +27,6 @@ extern int remap_area_pages(unsigned long start, unsigned long phys_addr, unsigned long end, unsigned long flags); -extern void iounmap(const volatile void __iomem *addr); - /* Defined in lib/io.c, needed for smc91x driver. */ extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen); extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); @@ -170,8 +168,13 @@ static inline void writel(u32 data, volatile void __iomem *addr) #define writew_relaxed __raw_writew #define writel_relaxed __raw_writel -void __iomem *ioremap(unsigned long phys_addr, unsigned long size); -#define ioremap_uc(X, Y) ioremap((X), (Y)) +/* + * I/O memory mapping functions. + */ +#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \ + (__HEXAGON_C_DEV << 6)) + +#define ioremap_uc(addr, size) ioremap((addr), (size)) #define __raw_writel writel diff --git a/arch/hexagon/kernel/hexagon_ksyms.c b/arch/hexagon/kernel/hexagon_ksyms.c index ec56ce2d92a2..36a80e31d187 100644 --- a/arch/hexagon/kernel/hexagon_ksyms.c +++ b/arch/hexagon/kernel/hexagon_ksyms.c @@ -14,12 +14,10 @@ EXPORT_SYMBOL(__clear_user_hexagon); EXPORT_SYMBOL(raw_copy_from_user); EXPORT_SYMBOL(raw_copy_to_user); -EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(__vmgetie); EXPORT_SYMBOL(__vmsetie); EXPORT_SYMBOL(__vmyield); EXPORT_SYMBOL(empty_zero_page); -EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memset); diff --git a/arch/hexagon/mm/Makefile b/arch/hexagon/mm/Makefile index 49911a906fd0..ba4b04d962d6 100644 --- a/arch/hexagon/mm/Makefile +++ b/arch/hexagon/mm/Makefile @@ -3,5 +3,5 @@ # Makefile for Hexagon memory management subsystem # -obj-y := init.o ioremap.o uaccess.o vm_fault.o cache.o +obj-y := init.o uaccess.o vm_fault.o cache.o obj-y += copy_to_user.o copy_from_user.o vm_tlb.o diff --git a/arch/hexagon/mm/ioremap.c b/arch/hexagon/mm/ioremap.c deleted file mode 100644 index 255c5b1ee1a7..000000000000 --- a/arch/hexagon/mm/ioremap.c +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * I/O remap functions for Hexagon - * - * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. - */ - -#include -#include -#include - -void __iomem *ioremap(unsigned long phys_addr, unsigned long size) -{ - unsigned long last_addr, addr; - unsigned long offset = phys_addr & ~PAGE_MASK; - struct vm_struct *area; - - pgprot_t prot = __pgprot(_PAGE_PRESENT|_PAGE_READ|_PAGE_WRITE - |(__HEXAGON_C_DEV << 6)); - - last_addr = phys_addr + size - 1; - - /* Wrapping not allowed */ - if (!size || (last_addr < phys_addr)) - return NULL; - - /* Rounds up to next page size, including whole-page offset */ - size = PAGE_ALIGN(offset + size); - - area = get_vm_area(size, VM_IOREMAP); - addr = (unsigned long)area->addr; - - if (ioremap_page_range(addr, addr+size, phys_addr, prot)) { - vunmap((void *)addr); - return NULL; - } - - return (void __iomem *) (offset + addr); -} - -void iounmap(const volatile void __iomem *addr) -{ - vunmap((void *) ((unsigned long) addr & PAGE_MASK)); -}