From patchwork Sun Nov 12 06:14:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 164203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp561882vqg; Sat, 11 Nov 2023 22:18:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmD/0RJjXIyZdGXmrekPdnwu0mjoXUTV8VDIJtrLABxl3uP4klp3UZOZJzofLbWULREON6 X-Received: by 2002:a05:6870:4154:b0:1e9:8ab9:11cd with SMTP id r20-20020a056870415400b001e98ab911cdmr5392808oad.45.1699769896285; Sat, 11 Nov 2023 22:18:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699769896; cv=none; d=google.com; s=arc-20160816; b=uD1y/mRDgQwU6gjd/ZiTyo4qspoyH4rPb7gbErFWOeq44MVgXsSnldmCiga+b7ho6v U3Eqo9MvRBA/NmzqY3OS3N2eKbhDyApiWnBIy9wyT0XZcKFLx+Jjp3L+95w/7Tcd7AE9 LIcvy3Eeak9sg+AjiSGTCaLsYn8g2IX2D+ENHeXWNa+2QifyJXBjMRXLcCo7ZqUOwo0C Y7T/ZpGwX7PrGVJsaVrerS7cJ795H3wH0k9EQv2sXkP2ztg2ScvzigZIcN37uBIcmwSw CwCZf6Ku8k0dZqu4WbmkgW+TWMIFF7PnTNekSPlxYSlsCVK+mJ4D8gz2DgqYsXkQQ2aF XyfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+lAYR8J7V1Jb1PHc3bkfQAJSHLpY0PHu38cfUl+dOB0=; fh=ZE/z2dNArDjRCaYXLY1qiMuWjPgjymC0plQjRd9hozE=; b=gYfzP8RumeFYjBWmN8O/K4fqh8kUC2UqTgTqZfT4IT9yBudK4sfi9uQB3hHH9C3RfK NWG7pfWDAecyBIOpN/gEZ5u9FAj9S7TdVs/iccpN5ywRVmoJ26u8GgYp0pM9roLab8up GSmpucDMEtdVbSXWd2YENNmmDCGTe95Qp67WHSQC/rANsJSbi+15wtyBeJIXOw8uEvAW Kn+7Lf+NRdUgwoWYPzQQzCuK7EQUhI7Eq1R3IV00FB8e1qIlJzO3mULEdcCAN/+mn6MZ OGcVkkP2wlsgtNFO00dd4NCo6/uuYwJu3qneGn4OpA2FoNwCMV3sSs+KbT0wazotIdnR HQGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GW5NoU+I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id bf5-20020a170902b90500b001cc2c4fdbecsi2914428plb.649.2023.11.11.22.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 22:18:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GW5NoU+I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id BF798804C643; Sat, 11 Nov 2023 22:18:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231145AbjKLGRi (ORCPT + 29 others); Sun, 12 Nov 2023 01:17:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229929AbjKLGRX (ORCPT ); Sun, 12 Nov 2023 01:17:23 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42EF730EA for ; Sat, 11 Nov 2023 22:16:59 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1329EC433C7; Sun, 12 Nov 2023 06:16:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699769819; bh=qenSRo414Gnjw+wPdqdNQw1NfHZPaPnw9rVg2h6yowQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GW5NoU+InHnAHzio8lhZKosW6whn3JdHi4Q/dDOScdYFN7QjZKPUKXXs98dTQuw5h 45fW+a6Y1YPCVIa5T3cobF6lQUZPjawcP2Rzn99jvtgGE2vyakm09BCpPlZb+f/Wpq V7/4h6YGJTPwA6oP6a40o0SLfLK1XOhj0GOTCKell0jihsJuECN2NX8iPeKiTVDdC3 Cuu39HlcRospB1qSF0c6582N41+vi7tkSLS1EraM9vhN/CiwbKNoyOwJUVU4DgYCVt boYhSj6vK3kQM6iBLcEMiNPReyKIpaZOH1WO1KMsffukC32HjUXV4rWj7RpgPeJVkF 64h+bIhWZynBQ== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, conor.dooley@microchip.com, heiko@sntech.de, apatel@ventanamicro.com, atishp@atishpatra.org, bjorn@kernel.org, paul.walmsley@sifive.com, anup@brainfault.org, jiawei@iscas.ac.cn, liweiwei@iscas.ac.cn, wefu@redhat.com, U2FsdGVkX1@gmail.com, wangjunqiang@iscas.ac.cn, kito.cheng@sifive.com, andy.chiu@sifive.com, vincent.chen@sifive.com, greentime.hu@sifive.com, wuwei2016@iscas.ac.cn, jrtc27@jrtc27.com, luto@kernel.org, fweimer@redhat.com, catalin.marinas@arm.com, hjl.tools@gmail.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [RFC PATCH V2 15/38] riscv: s64ilp32: Add asid support Date: Sun, 12 Nov 2023 01:14:51 -0500 Message-Id: <20231112061514.2306187-16-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20231112061514.2306187-1-guoren@kernel.org> References: <20231112061514.2306187-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 11 Nov 2023 22:18:13 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782337918908080067 X-GMAIL-MSGID: 1782337918908080067 From: Guo Ren The s32ilp32 uses 9 bits as asid_bits because of the xlen=32 limitation of CSR. The xlen of s64ilp32 is 64 bits in width, and the SATP CSR format is the same for Sv32, Sv39, Sv48, and Sv57. So this patch makes asid mechanism support s64ilp32 with maximum num_asids. Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/tlbflush.h | 2 +- arch/riscv/mm/context.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index a09196f8de68..6793c3f835a0 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -12,7 +12,7 @@ #include #ifdef CONFIG_MMU -extern unsigned long asid_mask; +extern xlen_t asid_mask; static inline void local_flush_tlb_all(void) { diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 12e22e7330e7..9eab9aa87dc6 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -20,9 +20,9 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); -static unsigned long asid_bits; +static xlen_t asid_bits; static unsigned long num_asids; -unsigned long asid_mask; +xlen_t asid_mask; static atomic_long_t current_version; @@ -227,14 +227,18 @@ static inline void set_mm(struct mm_struct *prev, static int __init asids_init(void) { - unsigned long old; + xlen_t old; /* Figure-out number of ASID bits in HW */ old = csr_read(CSR_SATP); asid_bits = old | (SATP_ASID_MASK << SATP_ASID_SHIFT); csr_write(CSR_SATP, asid_bits); asid_bits = (csr_read(CSR_SATP) >> SATP_ASID_SHIFT) & SATP_ASID_MASK; - asid_bits = fls_long(asid_bits); +#if __riscv_xlen == 64 + asid_bits = fls64(asid_bits); +#else + asid_bits = fls(asid_bits); +#endif csr_write(CSR_SATP, old); /* @@ -267,9 +271,9 @@ static int __init asids_init(void) static_branch_enable(&use_asid_allocator); pr_info("ASID allocator using %lu bits (%lu entries)\n", - asid_bits, num_asids); + (ulong)asid_bits, num_asids); } else { - pr_info("ASID allocator disabled (%lu bits)\n", asid_bits); + pr_info("ASID allocator disabled (%lu bits)\n", (ulong)asid_bits); } return 0;