From patchwork Thu Feb 16 12:34:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13143027 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 C3F2AC636CC for ; Thu, 16 Feb 2023 12:34:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 666426B007B; Thu, 16 Feb 2023 07:34:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5ED096B007D; Thu, 16 Feb 2023 07:34:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 467336B007E; Thu, 16 Feb 2023 07:34:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3462E6B007B for ; Thu, 16 Feb 2023 07:34:45 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0D3471605C9 for ; Thu, 16 Feb 2023 12:34:45 +0000 (UTC) X-FDA: 80473098930.01.48B9385 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 26919180004 for ; Thu, 16 Feb 2023 12:34:42 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Q4+wwR00; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1676550883; 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=541PZnYzz1SDoHyPNfa2C5hhxDzbrpa/1Zil/3ZFHkVljZSyg5IrMpi1ZjtMNUP8XtfFEq fBXdJ2uertz0eAv0Y6xTHXrd+zpZwcBkWT4vpMr6Xl7V4kRS2u/+N76oDbktCFQ/EwOWSO 5RockdQXOSe4n5l5/zQteBw4U4FX8Wo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Q4+wwR00; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676550883; a=rsa-sha256; cv=none; b=pdZxBzCYkGGSEMGxsN39eqXM+9Semr4Wpk1PuyXzPfi1JpqiyiI0hUDmPfmblY3yroepnt jU9cSOCO4Zug1pq3Vs59dxoU/CJ9wzyv7G+xTumdsF3wA6T05+BHkVLYt5Zm1Trs5CNVIY FY4OMfuRRXzovloKqbkEO7cqCUds1nw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676550882; 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=Q4+wwR00TdAVDVuUGm2KeVcPAdrEESx7BwiC3C7xnYoqNBizhOB2D5MuKIt0CH6ROMNCKw N+6anyMJN5c7WA+tVhVGFCGJ0agXsG6WYyCve3CuLKrEZrctsLtNNM/B0HeWzLimxwTZGz 8UZzA5TlqzdMTmni3z90xWl0x0UgY7Q= 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-630-IqQp3gjfNf6Iot1Z8qjFEQ-1; Thu, 16 Feb 2023 07:34:39 -0500 X-MC-Unique: IqQp3gjfNf6Iot1Z8qjFEQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 936D0830F82; Thu, 16 Feb 2023 12:34:38 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-99.pek2.redhat.com [10.72.12.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A24A492C3C; Thu, 16 Feb 2023 12:34:31 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, 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, arnd@arndb.de, Baoquan He , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v4 01/16] hexagon: mm: Convert to GENERIC_IOREMAP Date: Thu, 16 Feb 2023 20:34:04 +0800 Message-Id: <20230216123419.461016-2-bhe@redhat.com> In-Reply-To: <20230216123419.461016-1-bhe@redhat.com> References: <20230216123419.461016-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspamd-Queue-Id: 26919180004 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: ecastrhtetge4zna47dcrbkqq1fdz55z X-HE-Tag: 1676550882-868268 X-HE-Meta: U2FsdGVkX18w/Qu7rhAiHrcMgvKxfd1F3vnYgszGFB3AcWDsellNse1ihcbrWxjprUFn091fvJFdKSBlHlpRtqIgFOjLLBsc6gr9Rs5Pzr3kWyTB4/QsZHm68bkCvoTakPaV3kKq7Iu2EMz8/oEVST8rC+GsGvZAj0lE5v2f50kIoZ/KE2Htn8tftlPe47aPnZq2sp6ETCq/yu8stsoyHm7qmoowE8yhdb3HBg0CZbIs4GxpgMwOUHG7nAoMXfl35NFptlnwPk5nJf0Is1qxCyi3blWt6wIYQn0YfoJFt03AYFROYQ6TXxmoEAxaWt2KkkO+qtH7SPy3FAxghrROnF+CrDECILPRryTQuWEWf7ZdEEsm7iJNKSS96CmkUmmhscNlIgeCVUDxQwfyckotgBi5RRvFSkDhHidpAJiGEQBYMYURx9Ke8sq0GHQ1ZocdaWf0j7wYEJ+JLxXxejkZCQ4D2xNFChs1OnlURUmmhA4sN+yfXHBSPgWbCt8WjpT4jgRuuyLWh1uXYiCBD3omMvvUf5ieXjizqH3gTt/M3s/XREpaOVgamuQRhpcEHhD0gm7XVdH6sE85uEdgZHiL3JkJMJ0p3d7zePqN0aV0o8nHySq+ZZ+NwS09hDG4DAiKHMBcCMXyU5qazBC0P83A1evvCOex43KsnhcQtRZffGH125D/tbVS8qUw7DSX+NPTxMDmuY4e7x/OVNsOch8nBcum39uaJqWo1/dP8xVQuERTnibS2Gqmsr7JPdcneZaASKg0m4C3RP3zCWrfOdDVhYxPtZMRzhFnUzT9YTUnKn9snk4rFRwxsNg9zqIgq0Fh+zic5CjmiVo3xhi8EG9mye0KYKhJl7gDzJNGp2Iy5srjYkYFmlcCm68W+GWz/7Apo1kEUmDricJXRPJM3cIC3NJMgUL994wpm5sZaX2Ghf36kcTvw48VlRmomxujCeuVj532RN90fVY0W7dWnUl CkGp5VHM yhInDDkErc5qwPDIg/BxOMs9zde06fOnkChFrwJwot2Q1imHTXM3IuErnt/C7Sc4SiqaS+1zpSChf2aNwsvWmcVHkE+tHSPFdSJGgUo/NmJBasbtFBWur7+uVa80FdKA9u826GE21lcaWGUwcz1iJxTT1TYEHqW1YluBeheR6nTYdZ6/wBgt4RKqB1hqTXcHYrJ7G6Csdxe3d3+TO9TSvr043VxTYqai3un/uhKtkvz87HNXEJbSWCpYrClwHivA7GPzhj0udQi3sjioLf/o4YMklAyy/oJVy8QU3cSmNh0Y+5HMqiHRm5+3MEqeRLkZzcO7lxAmxndryElene88n1DFlYn3u6dp6QX5SJuV8iCPwXlI= 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)); -}