From patchwork Wed Mar 1 03:42:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155571 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 EA77DC64EC7 for ; Wed, 1 Mar 2023 03:43:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 853996B0081; Tue, 28 Feb 2023 22:43:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 803386B0082; Tue, 28 Feb 2023 22:43:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A4926B0083; Tue, 28 Feb 2023 22:43:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5BD226B0081 for ; Tue, 28 Feb 2023 22:43:44 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2BC1A120FF0 for ; Wed, 1 Mar 2023 03:43:44 +0000 (UTC) X-FDA: 80518935168.27.B56FFBB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 64B9F1C0006 for ; Wed, 1 Mar 2023 03:43:42 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S808jwD1; spf=pass (imf21.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1677642222; a=rsa-sha256; cv=none; b=mAgghscg3oYxLTibGN8ZjAKMZxAJZrFozXR3CJVYDPl7Sg6A7t+Msw9xi9Vd21X7tOkkZ6 xE9/IjpSO8eWJok+zoypB/o+W0UYXloTr1wdKTqjvABhZw74JYEpSAQxbiFizCh0QbF9ML pg7hSncpDVkGpaj7Y/AD1W2kjqCGC78= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S808jwD1; spf=pass (imf21.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1677642222; 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=+bd+DCGSFM6KdGYU7Bq43cbBBnA6se/fZx2Wohwr544=; b=meS1he6U8+Pb2J9KdJRGUqp5PuK0TeAQ/wg579u7Z4otxwGqRBdcD16S/5PuqzA9wtOb38 G9ygVWQqVBAQDRcTPtpDrb5P+swehvL4NHECVG5NZ9UygDnxtHDmbmu2ZTiLye8W0J8mq3 HFEluBzvr7n+aNF/N7FCy/h8WCMeW+E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677642221; 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=+bd+DCGSFM6KdGYU7Bq43cbBBnA6se/fZx2Wohwr544=; b=S808jwD1UA347TTq5AEBG+7MgKBWsnVMLTlIlR8m04J8pSQSqTvsr0gDJbvjkpgwOsZnvD 6kqpioj7MLloMOIavYJLrTmphujZYEADrPrD1t4ywEtPLPE1Y4MdCQleOoCepvzSpobc4R EiGX6eFJLlWOBMcBkac5XgICNQtk7G0= 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-204-_J-V87EkPD62G46zbmOcsw-1; Tue, 28 Feb 2023 22:43:40 -0500 X-MC-Unique: _J-V87EkPD62G46zbmOcsw-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 937CB381458A; Wed, 1 Mar 2023 03:43:39 +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 061D9C15BAD; Wed, 1 Mar 2023 03:43:33 +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 , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH v5 07/17] arc: mm: Convert to GENERIC_IOREMAP Date: Wed, 1 Mar 2023 11:42:37 +0800 Message-Id: <20230301034247.136007-8-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-Queue-Id: 64B9F1C0006 X-Rspamd-Server: rspam01 X-Stat-Signature: 3zta5i6pnhnb43xob8ygdtwpzcsgbdw3 X-HE-Tag: 1677642222-37094 X-HE-Meta: U2FsdGVkX19AHBSJCBjukpOVdRIMWVwh2FGfRq8kDSLGxXniUgXiBqc1dxMMQiekK+p/jhNfPs3rm9TX5q/ewpsYBNiSC9POOWDUlzv6KnXf/7x44Ta+razUoErMnNGn3bb+63iWQy6fvRC5+s9/KbYn7eTCywZgTBZCtYET3sX1ez5LfdGbDflVQrsz0W4qt+2B0Kz9w6digHBeOb/12nuN0ZhfyEqpivlZ6zDp409objETCI08sXjO2vjgmTOVjF5SL5e8YbZln7DL0gOfM66RZmKxdVD1okurTW6faSggDEh9xD4y4/ys9JDCtiJb/Lez9jnyISZIMnnuw/7bHjVNL5l3+s9VZkH6krrf/56Ys2Jqg2oUKdWGYKQB4uPVDRH682nYABjMhjlmtqesuvNYk/arYOukzvjYHsqhs/6kRH2N9ipiYB4ACXX+4CdOGiljPPjOocawLhUP2ZRe8Q0lENH7Zkw1mJxDBTiX4xzfa8eFZVtq+9ptR+WrSHp/04+Kzx0AwYvGRsMv27Gnr22tP2tMXbwYcSE0TTCuyfVZGKWGh33WAAi62DclSKxzf3GbjUi9S4+HReh6tV+bap/+vWmjby2dKw3qbJYsEc1sx8hqWyhfGeWu6kBdC3Y3HrHPzW7/gxNRMmas955eFN5JSMWT1iP4Ofh71EhyZAxLSQmj+WgcVimkTw2OqodM6CZMphMgpmuyVCqEMpLeGBWzH0PIAQO9t2I4j4czrJrw/3j9KRgd7Mgz6ajuU4w0ucEBjdLtpv39sA+qd1X+PTj1ZCGF17D+0s8VXVjzQF4w0CQ3bnrzAd+KGLy+P36ScoRxda/gv+txFEsSLtu63n033IaVyRqd+/Anf3BW7Bu7oCiSaHZ8WsqJAKbQYffjwMFI2zQQubggSxXsLVY3XplxBqJcryO7hsMMjPcEomZs7c3gpm8g2t3TpA58sDzPzRFztdxyS5td3sYjPQZ qxOyXiut rHaz/1A/F7rJTIwLYbKNwMbIs5OtCBTZORrYFvWbG9/GhZtdg8fREIkRLozTtqSN+45JDocOhkhMTUR9F5GfcHkIkBXKYLaOnjB9OZYWyl+3JppUnqdtrtxOIrAa8rfYNWEOvyNvtIz4G+koTFOGR17EX7gF0vNf/eDU6bXb0+dHvfe5so0wBj/biC3hvUH0kijkWPGBaFEO4nBJK12A2s55/4kUqFlVe9Y4a2ZY8MZS+/Lq8XQ0GcR2w2C2bAs6y0aCzeeoX0RIWpMOcral/b7UiIl0hND1GIEH+yE5R0a8k8TO9NJB72xn5f6F8VYbyfehYXjnT6UwvAbtEtoiLIxT6sD6/9+A6jvZEfjhNH/kZLXo= 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 arc's special operation when ioremap_prot() and iounmap(). Signed-off-by: Baoquan He Cc: Vineet Gupta Cc: linux-snps-arc@lists.infradead.org --- arch/arc/Kconfig | 1 + arch/arc/include/asm/io.h | 7 +++--- arch/arc/mm/ioremap.c | 49 ++++----------------------------------- 3 files changed, 8 insertions(+), 49 deletions(-) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index d9a13ccf89a3..37da34ac7abf 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -26,6 +26,7 @@ config ARC select GENERIC_PENDING_IRQ if SMP select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD + select GENERIC_IOREMAP select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if ARC_MMU_V4 diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index 80347382a380..4fdb7350636c 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -21,8 +21,9 @@ #endif extern void __iomem *ioremap(phys_addr_t paddr, unsigned long size); -extern void __iomem *ioremap_prot(phys_addr_t paddr, unsigned long size, - unsigned long flags); +#define ioremap ioremap +#define ioremap_prot ioremap_prot +#define iounmap iounmap static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { return (void __iomem *)port; @@ -32,8 +33,6 @@ static inline void ioport_unmap(void __iomem *addr) { } -extern void iounmap(const volatile void __iomem *addr); - /* * io{read,write}{16,32}be() macros */ diff --git a/arch/arc/mm/ioremap.c b/arch/arc/mm/ioremap.c index 712c2311daef..b07004d53267 100644 --- a/arch/arc/mm/ioremap.c +++ b/arch/arc/mm/ioremap.c @@ -8,7 +8,6 @@ #include #include #include -#include #include static inline bool arc_uncached_addr_space(phys_addr_t paddr) @@ -25,13 +24,6 @@ static inline bool arc_uncached_addr_space(phys_addr_t paddr) void __iomem *ioremap(phys_addr_t paddr, unsigned long size) { - phys_addr_t end; - - /* Don't allow wraparound or zero size */ - end = paddr + size - 1; - if (!size || (end < paddr)) - return NULL; - /* * If the region is h/w uncached, MMU mapping can be elided as optim * The cast to u32 is fine as this region can only be inside 4GB @@ -51,55 +43,22 @@ EXPORT_SYMBOL(ioremap); * ARC hardware uncached region, this one still goes thru the MMU as caller * might need finer access control (R/W/X) */ -void __iomem *ioremap_prot(phys_addr_t paddr, unsigned long size, +void __iomem *ioremap_prot(phys_addr_t paddr, size_t size, unsigned long flags) { - unsigned int off; - unsigned long vaddr; - struct vm_struct *area; - phys_addr_t end; pgprot_t prot = __pgprot(flags); - /* Don't allow wraparound, zero size */ - end = paddr + size - 1; - if ((!size) || (end < paddr)) - return NULL; - - /* An early platform driver might end up here */ - if (!slab_is_available()) - return NULL; - /* force uncached */ - prot = pgprot_noncached(prot); - - /* Mappings have to be page-aligned */ - off = paddr & ~PAGE_MASK; - paddr &= PAGE_MASK_PHYS; - size = PAGE_ALIGN(end + 1) - paddr; - - /* - * Ok, go for it.. - */ - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - area->phys_addr = paddr; - vaddr = (unsigned long)area->addr; - if (ioremap_page_range(vaddr, vaddr + size, paddr, prot)) { - vunmap((void __force *)vaddr); - return NULL; - } - return (void __iomem *)(off + (char __iomem *)vaddr); + return generic_ioremap_prot(paddr, size, pgprot_noncached(prot)); } EXPORT_SYMBOL(ioremap_prot); - -void iounmap(const volatile void __iomem *addr) +void iounmap(volatile void __iomem *addr) { /* weird double cast to handle phys_addr_t > 32 bits */ if (arc_uncached_addr_space((phys_addr_t)(u32)addr)) return; - vfree((void *)(PAGE_MASK & (unsigned long __force)addr)); + generic_iounmap(addr); } EXPORT_SYMBOL(iounmap);