From patchwork Fri Jun 9 07:55:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13273352 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 EC45AC7EE25 for ; Fri, 9 Jun 2023 07:56:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B1B38E0006; Fri, 9 Jun 2023 03:56:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 862D98E0001; Fri, 9 Jun 2023 03:56:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 750198E0006; Fri, 9 Jun 2023 03:56:04 -0400 (EDT) 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 683418E0001 for ; Fri, 9 Jun 2023 03:56:04 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2F5171A0172 for ; Fri, 9 Jun 2023 07:56:04 +0000 (UTC) X-FDA: 80882451048.09.3DC2EC2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 674D32001A for ; Fri, 9 Jun 2023 07:56:01 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MUygy+Ap; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.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=1686297361; 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=3DenNY7MBGvhJyodc+H0T1cCxvBg9zEtJ+UDYfYUhPQ=; b=NTOCVopNhznSNHJZE1tMdxHOT52DPLSCp532ubT6kbhIn10SBUsKyuwsn12oSAdOcraeWn fYRIhTw+ZEkoCcakSvrcnRRyAIiCgrys/2fXCyS8UblVt8YP1Zgk4c+wnpeAQGmPAvIAqE CmALgviiZcasj4yBOJ96FwiDEAjRdCE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MUygy+Ap; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.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=1686297361; a=rsa-sha256; cv=none; b=FJUvKp0K7Y44YekTZF6RpPRekgPwK4DnNlWoFiTt1BUEZZrYZIkpatmGGNTmce3JdsvlJ0 iFJEjiudFpXlI2GgtWGEEkniuUCttopz+dyg4u/GSCf4k8EKUmATpFmTr9lVId57QwqQaF Jx2TiprhwGb2bi2eIhfoe7ZXl6XvQhk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686297360; 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=3DenNY7MBGvhJyodc+H0T1cCxvBg9zEtJ+UDYfYUhPQ=; b=MUygy+Aphtyq84KuQDwDW/YEzGgCZmm/h236D6w9d23iTO59oB1DX/U9AvmBoN2B/VzRdW xONSS3aEQgPTJKBqd8tGgjtT8CdBECaHlMXJgfDf3ezpj12b6IRgKHn6cxtjDAuAFe25tb bvrM22kAGEi3CUj89fAVC0aIeWHt02o= 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-627-iJkQnqI-MI24KPf3bK0ngg-1; Fri, 09 Jun 2023 03:55:54 -0400 X-MC-Unique: iJkQnqI-MI24KPf3bK0ngg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 59EC0384952A; Fri, 9 Jun 2023 07:55:53 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-92.pek2.redhat.com [10.72.12.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34AD920268C6; Fri, 9 Jun 2023 07:55:45 +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@lst.de, 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, Baoquan He , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP Date: Fri, 9 Jun 2023 15:55:11 +0800 Message-Id: <20230609075528.9390-3-bhe@redhat.com> In-Reply-To: <20230609075528.9390-1-bhe@redhat.com> References: <20230609075528.9390-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 674D32001A X-Stat-Signature: 5yua9xh16iyjwkmqpjsb3ij3es9zkeyf X-HE-Tag: 1686297361-483480 X-HE-Meta: U2FsdGVkX19nyiqdu0lm4qmXkaTbidioYkE1EnR4qhiR4lTlEKkRY355zZJuCHsHj29XTIkii/TcbkBmqWfEPfgPYldgNhmP1kFobzlMH6VgG4v8rrlUw3AobDQ0qTpLUJ7gmu/3/cqdoo8Vh4KP9zvXVCPbYHfmkxoMRNz1oqhQ9WaTlxWo37zljuwyrK+fNpcYv3PFksg33JrMOIcv1d4so/gOf7IBgp/bXKUPfwt5INfneRPhHBL2iscGPAG0T6QOHlp7VAyqLBcYpxbjtj+hrcFl/5LDCp0NE6URw4eTVfl9w5I6SlqzshTVw93toIVvl7tHgHpZReJCUwGw0kC8jmnJc0Uc0n9XGJZGWXoSpj38cfCy6d1WL6pNyFwkWepriQUJs2t63aOEejwPl0sroOOOcgaK8TUlKNoR//36U8etRthe3uu/JkX8bYUmggg0jDZNJpjiCndVlm0xgqck5XDnfX4g74MmV2F63FEvmhqYlAP96aMJ7NK5oa6BdAVx7jNrRwHJvWV34//JQnKi8JrN6viCo7vOjWypwHEhyqbJUp8GOuhINJk16ceM0hUMfLuum6+mrsFw6DnUIW5rgUdi6Ru0R3pJk6bcSVhbuIe8pHkwgzr54xai1Xe8s9i+ywfD2ZTxgNeGKW3Lwk5yi27jhFuDyHTFBuC7mlukdPFqgomhVZ1W/KZpxFiDZ46PLxosuKdhJNnTVCaRgkHS7mwGUNKp3D8DAXwEwoQUR8UUu3g4ldvtu16DqIvuTHpdglOF5Ht1iZDPYcYef1UluT1+Ei1t178+4Fxpg0Kr15Qq0awnbYiC2tG6mcvGeQPeYL5buyDf2Vpzwou8hEL8GBdZeRgqT/w54rx236Xuo9n5o9gJw6onpVDyEQAIN/symhJySVcF5kSBHMhjRkHw9ZnCOUv+8TKkJn23yP/M86hRsVlNCYMkU90qCwuTy3zs4XC3u9RTxd8heCd nljxRp5G ANYwGf4oS/N9puSZroY2YDx31Upfh0AF4orpMjF5QUft2uHgNwI745oHCzM0AlHpcs7lgYO/njWrrvjjhgdJpGhRzSBb6++QKDa5FC5NbelKyoGEms9M44qjua5P3g/E9TbiK2Iegkyeq9vhXqElo98fH4AA+6U4hy6tEKMq42E3kxZsfmlakhq26k+bRRJUvhIDF1kM6mPMGETbusoGh8jbgJiRldrCEwCb9TNTIJmlAMnitDEhhFtYy5bLFS/YFCBPWY4G6kjfbnOBgVKJWCePUweM+Xav5T+alY7V3/iqOO37jlJrqSCW/zlAyTYEP8PmuCBnL8S8Mpn6Qn7+/GW5Wdg== 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 Reported-by: kernel test robot Signed-off-by: Baoquan He --- 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)); -}