From patchwork Thu Jul 13 12:11:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 119842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1797213vqm; Thu, 13 Jul 2023 05:46:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlESMRdTp6ysKkYO55EFh3Mywtch9Uu9LU6YSwVugk/rsO+xKaUjAn51CbFM/1o4WGWcJkEr X-Received: by 2002:a05:6a00:198f:b0:675:b734:d302 with SMTP id d15-20020a056a00198f00b00675b734d302mr1149368pfl.1.1689252364966; Thu, 13 Jul 2023 05:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689252364; cv=none; d=google.com; s=arc-20160816; b=bU9bphKQ6/BWyI12oVDpeIdxZ105CwYHwmo6XKm8zfptHxzaKIDyQaOvGZgKUbVAyA IumqbMx/zvAPbAsLmDfMvEMbSUvzLA05rXy9cwlhM69Un9QJG6ot0sIT1+Tu3n7OMKTp HAIOuQ1cElRl6ccsHmudGTMrTieQSSjfttJ/5V+gJgfBAph/zjD/a8EJHELCkjcxkQei 07G1Oxnmg7ZKuGhLc1ehSyom1QcCpC4dItBfBazMcnWi53wR6WELNVckwpTGaQfW2+Cr /o1+lkTjZOn7F7jLtMWx6VqDyiUSm7zE9PL4zMpf/obZKoan/JzDesybCFodsXJx+02J NELQ== 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=HBMp8+IyL80A1hD3qniJeqVZuVMi9feiINUkZYowFtE=; fh=+t+G/OXZaGbelVlx/PAQKy/ssq96RZ9Njlv0n65gx60=; b=xgJ5q1Zs/JMYcuVqjy3GRScTSJsShva/4nKAiCdBSSHDm/11zt7B+r/P9Q7dx7rnS2 5OPCtcAKw/rigXMFXBOWK5dO5fTdjvB8n0J/PaKN3WJsljo3jL7sgBqO/HcTh5Tl9WDm BLuPGrhHMPfMf+/ShRGSQrCM2cWoIgMZ9r9m4/xzyXdpebesgwSzb5Cs58bWV3MZ2wX7 kABbtzDH0nA5Wb31dbjyP3VZcOAJbiHdxd+iISWmHzQY2B8cBvrutE9dF91o/WZnV/lQ O2vR2VtxF8Tbve19GvSIk1HfbUgPPFIiwUdFheVNMG8Wfobe20I7FKQ0iCkvYGjrJJVF GG0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=cDLuPN4k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cj23-20020a056a00299700b0067a5e89333esi5103404pfb.101.2023.07.13.05.45.52; Thu, 13 Jul 2023 05:46:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=cDLuPN4k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234613AbjGMMNS (ORCPT + 99 others); Thu, 13 Jul 2023 08:13:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234569AbjGMMNN (ORCPT ); Thu, 13 Jul 2023 08:13:13 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D54E2D75; Thu, 13 Jul 2023 05:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1689250372; x=1720786372; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iX4IZpSAWY+g6Eclm4yuSgD33Zp/aAK9fRllLAahOzo=; b=cDLuPN4kktx4842dEf4fGM9Q/yrqARTQlt8fbPtcAQqW59ji8HBsSt8N swAlaHQyJWj2AfM/yBI/rIbzK5oFETSXNL+i8FpxiK70wd4aAZN3gM1uH uWST2E4AYD2Ott2jQ4QUIxH/1vcicMHYo0JQSm0nOzQ/WO3ECN12gsZaL 6t0h0O6c6NQvG2Sr729Nq8YVBINY7ilDLdG0Lki/9hUQvypHm1973+H23 TP65IQUidTvI1ynMIrL6XhjszDXLC6cBqfGyfpzEnwV9Wi9koUtPxECWC SGRBxMKRkRtLrOndLUzHt22rhp65ZqSgJq01FaOD27YUYQCcinw7lMBvz w==; X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="222827187" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2023 05:12:51 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 13 Jul 2023 05:12:50 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.21 via Frontend Transport; Thu, 13 Jul 2023 05:12:47 -0700 From: Conor Dooley To: CC: , , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Albert Ou , "Jonathan Corbet" , Andrew Jones , "Heiko Stuebner" , Evan Green , Sunil V L , , , , Subject: [PATCH v5 07/11] RISC-V: add single letter extensions to riscv_isa_ext Date: Thu, 13 Jul 2023 13:11:05 +0100 Message-ID: <20230713-despite-bright-de00ac888cc7@wendy> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713-target-much-8ac624e90df8@wendy> References: <20230713-target-much-8ac624e90df8@wendy> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3714; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=iX4IZpSAWY+g6Eclm4yuSgD33Zp/aAK9fRllLAahOzo=; b=owGbwMvMwCFWscWwfUFT0iXG02pJDCnrX16zCF3y6Nz8A05vaooTdy1M41comyLx367wW2B2gAxX u3d/RykLgxgHg6yYIkvi7b4WqfV/XHY497yFmcPKBDKEgYtTACaym4eR4f42hua8S1w3ar19oyQEay 9ZeKY8ef5x5xqOyEWrD//4GcXwz/LHfZmMM3bV7Gtnd9363HhLWK1q9aPbvFVb9a/ueMIbxA4A X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771309487855307922 X-GMAIL-MSGID: 1771309487855307922 So that riscv_fill_hwcap() can use riscv_isa_ext to probe for single letter extensions, add them to it. As a result, what gets spat out in /proc/cpuinfo will become borked, as single letter extensions will be printed as part of the base extensions and while printing from riscv_isa_arr. Take the opportunity to unify the printing of the isa string, using the new member of riscv_isa_ext_data in the process. Reviewed-by: Andrew Jones Signed-off-by: Conor Dooley --- Changes in v2: - Drop the multi_letter member, in exchange for calling strnlen() in two places. --- arch/riscv/kernel/cpu.c | 37 ++++++++++------------------------ arch/riscv/kernel/cpufeature.c | 13 ++++++++++++ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c index aa17eeb0ec9a..4f1f12f34b63 100644 --- a/arch/riscv/kernel/cpu.c +++ b/arch/riscv/kernel/cpu.c @@ -164,41 +164,26 @@ arch_initcall(riscv_cpuinfo_init); #ifdef CONFIG_PROC_FS -static void print_isa_ext(struct seq_file *f) -{ - for (int i = 0; i < riscv_isa_ext_count; i++) { - const struct riscv_isa_ext_data *edata = &riscv_isa_ext[i]; - if (!__riscv_isa_extension_available(NULL, edata->id)) - continue; - - seq_printf(f, "_%s", edata->name); - } -} - -/* - * These are the only valid base (single letter) ISA extensions as per the spec. - * It also specifies the canonical order in which it appears in the spec. - * Some of the extension may just be a place holder for now (B, K, P, J). - * This should be updated once corresponding extensions are ratified. - */ -static const char base_riscv_exts[13] = "imafdqcbkjpvh"; - static void print_isa(struct seq_file *f) { - int i; - seq_puts(f, "isa\t\t: "); + if (IS_ENABLED(CONFIG_32BIT)) seq_write(f, "rv32", 4); else seq_write(f, "rv64", 4); - for (i = 0; i < sizeof(base_riscv_exts); i++) { - if (__riscv_isa_extension_available(NULL, base_riscv_exts[i] - 'a')) - /* Print only enabled the base ISA extensions */ - seq_write(f, &base_riscv_exts[i], 1); + for (int i = 0; i < riscv_isa_ext_count; i++) { + if (!__riscv_isa_extension_available(NULL, riscv_isa_ext[i].id)) + continue; + + /* Only multi-letter extensions are split by underscores */ + if (strnlen(riscv_isa_ext[i].name, 2) != 1) + seq_puts(f, "_"); + + seq_printf(f, "%s", riscv_isa_ext[i].name); } - print_isa_ext(f); + seq_puts(f, "\n"); } diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 859e3831fac1..d6009bd4c186 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -144,6 +144,19 @@ static bool riscv_isa_extension_check(int id) * New entries to this struct should follow the ordering rules described above. */ const struct riscv_isa_ext_data riscv_isa_ext[] = { + __RISCV_ISA_EXT_DATA(i, RISCV_ISA_EXT_i), + __RISCV_ISA_EXT_DATA(m, RISCV_ISA_EXT_m), + __RISCV_ISA_EXT_DATA(a, RISCV_ISA_EXT_a), + __RISCV_ISA_EXT_DATA(f, RISCV_ISA_EXT_f), + __RISCV_ISA_EXT_DATA(d, RISCV_ISA_EXT_d), + __RISCV_ISA_EXT_DATA(q, RISCV_ISA_EXT_q), + __RISCV_ISA_EXT_DATA(c, RISCV_ISA_EXT_c), + __RISCV_ISA_EXT_DATA(b, RISCV_ISA_EXT_b), + __RISCV_ISA_EXT_DATA(k, RISCV_ISA_EXT_k), + __RISCV_ISA_EXT_DATA(j, RISCV_ISA_EXT_j), + __RISCV_ISA_EXT_DATA(p, RISCV_ISA_EXT_p), + __RISCV_ISA_EXT_DATA(v, RISCV_ISA_EXT_v), + __RISCV_ISA_EXT_DATA(h, RISCV_ISA_EXT_h), __RISCV_ISA_EXT_DATA(zicbom, RISCV_ISA_EXT_ZICBOM), __RISCV_ISA_EXT_DATA(zicboz, RISCV_ISA_EXT_ZICBOZ), __RISCV_ISA_EXT_DATA(zicntr, RISCV_ISA_EXT_ZICNTR),