From patchwork Wed Mar 1 03:42:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13155567 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 ACAC4C64EC7 for ; Wed, 1 Mar 2023 03:43:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 175AE6B007B; Tue, 28 Feb 2023 22:43:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 125C56B007D; Tue, 28 Feb 2023 22:43:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F097F6B007E; Tue, 28 Feb 2023 22:43:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DDFDB6B007B for ; Tue, 28 Feb 2023 22:43:15 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A7B33A5024 for ; Wed, 1 Mar 2023 03:43:15 +0000 (UTC) X-FDA: 80518933950.26.9E29CB0 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 F06581C0008 for ; Wed, 1 Mar 2023 03:43:13 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=g1BzdCKI; 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=1677642194; 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=v0nZZRtgRBEjd1TuZoUTX3TC1k0a64a2n3jlsJishp4=; b=JJzB4NcS4Ac3nXOxPw2OZfS00XYy0NV9wsrnMXIby/LHfsxHCWJyH8rNNAbccL2b+n5vKQ HO9hrLzH+BEsjoNCNMl1QYxR7vQxynU+0RZdywY4tsWkxHOsQpOWI/jw+bVHs0HC7yR98x WAISSK4vJielgw+DiDoGNEy0k69c4vs= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=g1BzdCKI; 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=1677642194; a=rsa-sha256; cv=none; b=HalJqcEZF8pvhpaY78VrmPuQQE9ej0IPc2IaSqhGKvalHm25z/axMlmzzpm8zjl9Sw+QsC 4P6B8MV1wRpcwvWIb9H6j8pHUamqnuIUkCKmWASH5sWHvY0dxDc8ussHAAsPZMEVoq5+PA mqowZqpcrvbY+Cx6jSYoS7DyZHUIbV4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677642193; 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=v0nZZRtgRBEjd1TuZoUTX3TC1k0a64a2n3jlsJishp4=; b=g1BzdCKIgX3GGHsiepcc4Mq15oWf1w/s4D7aBVtiRW05kJDdFt5ucRRvp/wgjo4ZBOLdRj 1ejVzMMpFUktaYjq79AOPJmdC2+cQLprfQqABtdy+U/aMrj9KwPKVz1BKoXHWC4PJL6kvE 6nl1WvD7k+hTp1QNPKDg4uvbSi25Va4= 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-378-8HJrqEIPOV2v1sZuDYwixw-1; Tue, 28 Feb 2023 22:43:09 -0500 X-MC-Unique: 8HJrqEIPOV2v1sZuDYwixw-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 E665D87B2A0; Wed, 1 Mar 2023 03:43:08 +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 BDA3EC15BAE; Wed, 1 Mar 2023 03:43:03 +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 , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v5 02/17] hexagon: mm: Convert to GENERIC_IOREMAP Date: Wed, 1 Mar 2023 11:42:32 +0800 Message-Id: <20230301034247.136007-3-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-Stat-Signature: 4ajucscxu6tt1q1s7k5tmbcxs1okybuk X-Rspam-User: X-Rspamd-Queue-Id: F06581C0008 X-Rspamd-Server: rspam06 X-HE-Tag: 1677642193-532049 X-HE-Meta: U2FsdGVkX1/uiVI1Obc1yFBFsyGYw757zPWkuZ6+4i8HMBtw1G403FOun6lCl1NdwMItI09hd98ZVWrh11P5p+iEQXY4txqFsxwWEldAI9w0w897915P+NSVybkiCKj6ikvICJgkvCmfMGMl1rD+2FLI4ABqTvU3ma6O16+FgVrlxJk1zSEz3JtAl2COYOD8VP1IUY6mDy6iDWTas9SJAgZnAlzrQvpWTucLd7IzxIzzOkki1R3ahFIyJOQPasMrMfeDmSLT2LsZdPvmneRcaLYZ1+YN7aSMqEhX3rgDrRFeIlZSyEhjTzItq0yX4fl3rl6ua/QrQg5twktTmRuf0D1Hsv4YAiPdGt4PrJOcNBNRrZFNKja4eUXJ/SSBa6UHmhjB9wmcBb8yu3+tx1twy6FcQAfzYtIOuxGYFbt32JZyvfyemspFrg0D9GYjJLxhsEzR2W9w+ZD7yN+Eesnp8qAsLSTLg7gdi0P/B5MPVjPbjdh15RWf9tnopx8J1jqBQ0BIyiO76Ccb4gMGXU+4ZQQwpQKTDqHyXJFC+dxRCRBrdkYG3XrzRMQat8XfTnh/1B5MRK34ibu7Dm7e1jtCIuudjygKwL6xcA0AnrWw4i2qes7WXMbBhFJkCc+YMiK7g5L8nSxNnSbOfr0f1qComLN2+FOUGkviB4/mZACdAowxu2wb7vm4G94tVl5gwvr4Sdd2saZPgNAjxeQeR1lpo7dV2Xrtdym7JvthGEJu1VRyb2QU1pFLBGaoWMoP8/5vVNOQSLL2mPoHR+J9LFjg2gQOq+qMekr6RTQJkXA0XiATseOzf+sxqsnbsgV2fN1PAmBrMk3fKG0DTz7hjBiS31jwGcWpfaXEGopiue86IIRhQHlGZjtA6OI78xx6v6SXiB5YCDT9TjqROLTvQWodq7H+Cr5OiXXJ5ZdarCU2E3E8ofVrxDxX43hU3UMLwxrmreegOx1rp1AsDpNCmqF Iqfd4ogp /uHuemqCPtsq1+5wzIp44IOahIUuBW5AkYsFsF7pAXSZliQLuoeq9QbYbzX1AOexmmsNhCYAhMVrv68HhVhdPBZdFaT/g0eFqcHFG59zg4dDS8FxFQfn0viGqXnQtWgtS4RCHDjg5HkmBNH70eb1rPepKg9YTUWhY+gaEvQwOxLYj53k5+L1yYOJcrOJzs4/LZhNZUIOb4cbcl0XEu3ev8unRzwU2KYGntHMY5Oy7Gri4Els5BSlKeDPg35bZUQNTZZxuPdZLpmgy7qU4D4VrjiuvNOod3MRnLgd0Y74VGYTq9N0o+bZ7/0N3DWiLALlJucTH5SI0GswNGTFlMSmC7MEgP51WApdwPv0MnaXV2ufVV3Q= 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 codes 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 --- arch/hexagon/Kconfig | 1 + arch/hexagon/include/asm/io.h | 9 +++++-- arch/hexagon/mm/ioremap.c | 44 ----------------------------------- 3 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 arch/hexagon/mm/ioremap.c diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 54eadf265178..17afffde1a7f 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..dcd9cbbf5934 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -170,8 +170,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/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)); -}