From patchwork Tue Jun 20 13:13:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13285825 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 CBDA3EB64D7 for ; Tue, 20 Jun 2023 13:14:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63E1A8D0002; Tue, 20 Jun 2023 09:14:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EE218D0001; Tue, 20 Jun 2023 09:14:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B6A78D0002; Tue, 20 Jun 2023 09:14:48 -0400 (EDT) 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 38C8E8D0001 for ; Tue, 20 Jun 2023 09:14:48 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E8EE2160EF8 for ; Tue, 20 Jun 2023 13:14:47 +0000 (UTC) X-FDA: 80923171014.20.599CF9C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 60942120029 for ; Tue, 20 Jun 2023 13:14:44 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qn2H1fNf; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1687266884; 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=4y8XwGcIF2jz2W1CKgMhspALuMHaJJCUGdTHN9uXAgA=; b=wVZ9fSCLVCEKBuMWe8xDptz8NKPfb9L2ZigEIz2mL16PJTG1Ivow6NfRIcOfL90Q9rhDrB lX5fCD0XDpaXPAq+dk8fGL3IKC5mZeHUWiK55QTcDZ3r/AKxWh9yV2W1Y1ZdRp+xeYn5lq f9HK9/fPS1QiMGtgTlGosxrcwpdaJCg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687266884; a=rsa-sha256; cv=none; b=p5/kN+DB6S9kA8nMyCHOKOTsmkCTBtoYuVmeM/10UqfXa5VsAM02QR0E1qJGp4Q9HQ0Iwr yLlRf2o+1hty9f+TcSORXzDm5ZzppZlyVt5R6+iqf+EYToalQfIOq7gmrnCaJvIylcTljP fB8mcy/bfKF878Rv/P2h+7wZfdNtZW8= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qn2H1fNf; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687266883; 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=4y8XwGcIF2jz2W1CKgMhspALuMHaJJCUGdTHN9uXAgA=; b=Qn2H1fNfE/soLfOfqNOC8YWMHhG0L+Tr/wLTxPGAsLdWGGoIwDUZKSj8Z3KwX6cd900Cow qMjiyegzjL1Be47Pt/NphV2hlVZSxkNFHavYFziKsE1qEAuVEuBrl3+WmwWb7leXpjD5Iw 7zUtzvkDnLdxDCwhHoY5c6/rWfeXo9k= 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-219-RSNRVfhJNTGDfKn-1uoIcw-1; Tue, 20 Jun 2023 09:14:40 -0400 X-MC-Unique: RSNRVfhJNTGDfKn-1uoIcw-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 8603488D0FD; Tue, 20 Jun 2023 13:14:26 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-166.pek2.redhat.com [10.72.12.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21554C1ED96; Tue, 20 Jun 2023 13:14:17 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.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, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Baoquan He , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v7 02/19] hexagon: mm: Convert to GENERIC_IOREMAP Date: Tue, 20 Jun 2023 21:13:39 +0800 Message-Id: <20230620131356.25440-3-bhe@redhat.com> In-Reply-To: <20230620131356.25440-1-bhe@redhat.com> References: <20230620131356.25440-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: wmor7ew16g4p717uj3ew6894br6d7r8o X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 60942120029 X-Rspam-User: X-HE-Tag: 1687266884-494882 X-HE-Meta: U2FsdGVkX18VZjoowu+OgG7Xjc2C2aFyyzbKm/UweErm/S6MKW3NvicBHSEz0lTstdW/8gsYenIG7M+PvyrHLHwCy5QcZo1jbUodrwXaHpni/iZspfcuRyfQpLKgmBkvEwR4XbSad7PUpfoqLOOuD72r6yUV4HvOZkLhkzeTsty9N4UaZMgK6Q8g+3dMC+4bULQ2OJTlf1bPocImfNSTwRWfQFguFwSrtB2n4EbVRbY6UQaxzYYMwjp1Duld1PA0+NVuPlL2TapJHKe1kM2HcFVpOAKPG0uSO7lWWNJb91pdGvJpEgPDj0duvQ5z3wTwMnH3jfqy3pVji218z7uGNJd8CgmAQb8fNaZAWnEIFLgFmSsq4TxMgDIm4pK6vCp+WgYYsNT8e6KaJO5jqujRVOxA6NK/T+kKLJMb4cNj8enf/LmIx47U5+0M4Emjx7AQq+X6lXY8qz0+Nx99Bm9RpqvjMoR/9jRYl3OwxXGuvh3ySXKZoP9fZKfmausKDc7x80mzaB7p7p+oo2bXVoLMi6siQcu2W+ueI1uBSZNScE+YgcQnM+0eLl8vfJymWrwCRKPAspNxhEWh96teeP6YxbQ8fcXN+i8nmMSnf6DdvoNv56wYkDKC343pBA9pYLqylSiNAzOPRe4lJEw2PgrrRsxx+GwS/ZuVXu/eTb1vXnGWonNoih7MwrUI2UAhbH7iRlGEjMi13fmG7Grf2yj287LOqXtPpLsc3HavYqMVTq/8kdpq4b6T5hPz9StBycpYtn0D+y8n1bUMDDJulMfspASDTN+w6iqaCtD0ue28uYbUExQYBRdN9n1T/0Z9UHSiqkA+CPibczy4w5/Apt7FmHnthylFC7hDMO7bxZ3K752gqBIsED9nqd5AeZVOxSmIV1s8BDeN61xCU3xOtZU+lauvJZ+reOvUByMgpYTqCMcODM4zr4u2j3L83/gFXNvKUPiixZvRvEhwDiDEWl1 5URje46Q gYNjCxkX9SUJB6JDjL3L6JY1LYgcS7R7X3sDbX6BfZ8sbs4m2SA/8C4I+yyvwSQB4RJQmpHCbnr9V2Hz2vEPHI16BM3bittT2zqfBa8Y1kMiPb2IzQYTTS/Q9Tsq6Ok81zaVqA1ERGYMTrdhW+SdechTILQDukZHrCjF5m8sVv2SNcn1h3Wuv/UnKd5FI6vdxUzIK4J/K/n3ywWQBgtVHn37E+tmYrvexcRdwJTN/w8mIFjSbL3VaNM8ep84asZRW1xQW87fIeu3baiOewV5dLNGAd82ufGk31l3kIP/0q4YjIyBjDp0I39qcN/+BJw0ObGTIWcOrSLl5CiSdPX4qtdKd2A== 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 Reviewed-by: Mike Rapoport (IBM) Reviewed-by: Christoph Hellwig Cc: Brian Cain Cc: linux-hexagon@vger.kernel.org --- v6->v7: - Fix building error reported by lkp test robot. Here I only fixed the redefinition of iounmap(), ignored the PCI_IOBASE warnings since Nathan kindly reminded me the warning is a generic issue, and Niklas is working on that within below patchset. https://lore.kernel.org/all/20230612160237.GA199007@dev-arch.thelio-3990X/T/#u arch/hexagon/Kconfig | 1 + arch/hexagon/include/asm/io.h | 11 +++++---- arch/hexagon/mm/ioremap.c | 44 ----------------------------------- 3 files changed, 8 insertions(+), 48 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..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/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)); -}