From mboxrd@z Thu Jan 1 00:00:00 1970 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 18896C64EC7 for ; Wed, 1 Mar 2023 03:43:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D0456B007D; Tue, 28 Feb 2023 22:43:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 480C86B007E; Tue, 28 Feb 2023 22:43:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 322546B0080; Tue, 28 Feb 2023 22:43:25 -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 236476B007D for ; Tue, 28 Feb 2023 22:43:25 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E49CCA7A74 for ; Wed, 1 Mar 2023 03:43:24 +0000 (UTC) X-FDA: 80518934328.12.3B035FF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 2A03280004 for ; Wed, 1 Mar 2023 03:43:23 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MkdhfAbx; spf=pass (imf30.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=1677642203; 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=jHZa8mu+sMxKIWEAwvYcXi8mFXnonAyjIbMLTnXCGN4=; b=C53dZ5Ckb0NlQfjOEXiIu9kmcwSrGVOehPPWWcsXE72UdThzXNLrMHtoVPO/GhpTXIjcuM cp4O8pxjN6oRqKhkiqNHoNuWI7Aeg6fmdN/9zmLA4mTozwzUx/gahxncWz+l3vfdsG7PTu JPU2XSfWQKVnrKDvCs+GjvPpV8GPQ5w= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MkdhfAbx; spf=pass (imf30.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677642203; a=rsa-sha256; cv=none; b=GchHvzOc0l6Z2mbc+nj1wqg/Es2pxrvo1d6sZ3TkuLuinC21rM83ZNvFeYvBr3qZ8W48dJ es3D4UeET6geiCbZXhUet41/ZTm8irH49Ig48oq7zpRVnjoEpv4P95iVEsYVP5mGwEUrq3 GfXHTmRNc2OnvUzxqXowmaeIjEOuCYM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677642202; 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=jHZa8mu+sMxKIWEAwvYcXi8mFXnonAyjIbMLTnXCGN4=; b=MkdhfAbxR77T+k261WV9wcKclA8bUSw00Dl7hu4Ma6cHfVr3tRTQGtGZksDX5hDNjUVOwj t48pear7/ZG5mrvwEj4KghhcMVg3mo+JP1LAv6eEskpaOgP1Nq89gswWWyJRzIQKSorjkM YpJ4gU4KYsVU/ZWByQApO1ykPlYBB9M= 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-121-2Bn0SQvWNcO1qQlKWwiWUQ-1; Tue, 28 Feb 2023 22:43:18 -0500 X-MC-Unique: 2Bn0SQvWNcO1qQlKWwiWUQ-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 0D0112823802; Wed, 1 Mar 2023 03:43:18 +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 868B6C15BAD; Wed, 1 Mar 2023 03:43:09 +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 , Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org Subject: [PATCH v5 03/17] openrisc: mm: remove unneeded early ioremap code Date: Wed, 1 Mar 2023 11:42:33 +0800 Message-Id: <20230301034247.136007-4-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 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 2A03280004 X-Rspam-User: X-Stat-Signature: oqhdw774jgtn3pmhu5jyajgj4kzm73yk X-HE-Tag: 1677642202-551917 X-HE-Meta: U2FsdGVkX18PYdOQON8PTAgEEcDXJ7cyxERiaXWoWNwuQOlo5bX3BqVq55C6uhDw5SZw0KXZaPILEFgFCz46MacQe/ssV+NVKphfJn/DpWpWxwK9ZbAx4nQD+JFFtIPt+JcwJWTh5Mlxcls4CznhAeag23v0tj18Ey38ck54vEzKsoUGnviOOucw/QpnD1KmnRk1lOYoPcQN6wD4ECxErBJCMr+XeL2mXPilzYVlCtQPJiIiL6EB0rXFvFYfnL4bIsQuHepTvrsqi8j5p49QxxbbLa1xXwz2zknjIbBr5hrtsnswPT1tpzG2fzj9cwv9aiYS9dTv3Gqw7Gd3vW9TWPQt324TMMm44V8JOVd6UGHwujeBElZPUMNYOPo3pEay/HAK+z19rNx1STICZIqwTqUqHeemg+mK9K9Z1EFKK3TWX2JAk/Ok8fhi74vBc/0iwhsHzQOQviBEMKctuJ2GArrpDZAlVh7jRlmzPRcmSTl4vij1c+CxbGKouvpFeJOPNsLBFvzT8TtzSySsz+qqwGapYBlBmCa/VOH55RFzOUqtN96LtVYNrVptu1iTaA8uL/hNtBdbtHbqAutq62bje6gdo4aIXlAKmNCeRjwT930mlp3c85+zNjKW0DG40MRHn1lPCx21GJMUhEN2aj+El28XiR9o+SrpL9zFGaWE8ZPrW5Xpx6uaK8qFS2rnra9tNURxw2/7A+W/cc8jkiEtsuv1ggj05XXJZjDvxrJDwUbOlhPYABUyZe+xbzZ/PoCz7PL68Hu3PZrx5Jz7tisxBW7ZScGNluDK6+L7UGdVg+10KdJ2PI9dlGOYIWpiLdAAjUiB/uCavN+0u9BSUxbcI/8OOP8LyQx4tjqOwGA6G/0WGUnhjRHT6/0ke+wg2gdoRkm0K69szWtBKbGcJJ81ly5+LXl4TVMYzU0NqlutJRCW45GGK3XcwIOD/0zk5UpdZPYvukZcHBqR0L3Omnw VmdxhNID 6tVhQ8ZAkPFBT8GfDEGPjfMz4dauJEwTu8v3XyChMdFPjfohx5CZKNAqbrf7tyAUrCpnmF9wvSGZ/AhT2akxIVfBqJQO01IUVXTKUqf2PwD+hTT+yiA6xoEicGb99/tQYzrxbWldeGEnLE45xFWbvmtoiRZfyAoQFl+hYzZtkLG59bxxXzFOro5z/rNsVpW7SyVtuLKfCmrAdEwcrMblRrlW9bxy6Ezk5K+e1kqtmUUHaBnM3EqEgN+JeLek5Rywa/RRFOEKFQaF5Zk5Njd5rcQZgHD1n9eTuYKotzLKkBUinuAJdFPDdeo/X8LRflfKbid+ELtuoVnSocH8= 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: Under arch/openrisc, there isn't any place where ioremap() is called. It means that there isn't early ioremap handling needed in openrisc, So the early ioremap handling code in ioremap() of arch/openrisc/mm/ioremap.c is unnecessary and can be removed. Link: https://lore.kernel.org/linux-mm/YwxfxKrTUtAuejKQ@oscomms1/ Signed-off-by: Baoquan He Acked-by: Stafford Horne Cc: Jonas Bonn Cc: Stefan Kristiansson Cc: Stafford Horne Cc: openrisc@lists.librecores.org --- arch/openrisc/mm/ioremap.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c index 8ec0dafecf25..90b59bc53c8c 100644 --- a/arch/openrisc/mm/ioremap.c +++ b/arch/openrisc/mm/ioremap.c @@ -22,8 +22,6 @@ extern int mem_init_done; -static unsigned int fixmaps_used __initdata; - /* * Remap an arbitrary physical address space into the kernel virtual * address space. Needed when the kernel wants to access high addresses @@ -52,24 +50,14 @@ void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size) p = addr & PAGE_MASK; size = PAGE_ALIGN(last_addr + 1) - p; - if (likely(mem_init_done)) { - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - v = (unsigned long)area->addr; - } else { - if ((fixmaps_used + (size >> PAGE_SHIFT)) > FIX_N_IOREMAPS) - return NULL; - v = fix_to_virt(FIX_IOREMAP_BEGIN + fixmaps_used); - fixmaps_used += (size >> PAGE_SHIFT); - } + area = get_vm_area(size, VM_IOREMAP); + if (!area) + return NULL; + v = (unsigned long)area->addr; if (ioremap_page_range(v, v + size, p, __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) { - if (likely(mem_init_done)) - vfree(area->addr); - else - fixmaps_used -= (size >> PAGE_SHIFT); + vfree(area->addr); return NULL; } -- 2.34.1