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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18951EB64D7 for ; Mon, 26 Jun 2023 15:33:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229777AbjFZPd0 (ORCPT ); Mon, 26 Jun 2023 11:33:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230112AbjFZPdY (ORCPT ); Mon, 26 Jun 2023 11:33:24 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F31601A4 for ; Mon, 26 Jun 2023 08:33:22 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-991fee3a6b1so10665666b.0 for ; Mon, 26 Jun 2023 08:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1687793601; x=1690385601; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=e9Tqh+bgbzS0BvzbAVqiPRlSG90nmkGIpBCBAQqX0QQ=; b=b96UvgNvzkbRYx0trBuQ5YMZtUpfdLwxWVUZLt/XsYHa+WF4aDTSAzAVcNZEHV1QVA IxLy2YU/6Gvj3bHqrMvp1WtNIye4TQJmH7oJP+GBF7NYM4bewJ/kTqofouD+ibzp37an GCacxYfy+O3WG4zt0C3ZLPHfC5X5fBsksrowiu3eoDyhy6eJiA2PRv4R1u6jKm8XXbR3 1c1f0iALjxO/fMn5OpBDWQATQFg/5BXaFSkNLwIQwHDttqvjNSwSM98UOdo7dkfwyYei mqgxE5B0HxTu1cM4LK3KXQd2Q+XvMp3KFOBdRbckxWiFWi1OxCdDO3uv5J27/aRC/OtC w4EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687793601; x=1690385601; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=e9Tqh+bgbzS0BvzbAVqiPRlSG90nmkGIpBCBAQqX0QQ=; b=IsfaPOtKs04pF37rh0VK6lvnbdgrszdG9cOi+7e3fgjQei3FJZazH/cIqEeXmW3BU6 AoyKYl6AnWknBnYfUCUuAG40uMux0dchWRuG+9gvUwNYnu3XuPW/p8z9UiMU3gifBE6H BBKNIBPKYJAvZAi5C8amycMSxUt/1bs5e/uyfClrBTTjSCYmDnkc59DtyEGGWoVQXEsT woISfX+6bn63smlKcfYHXarob3IYyWhi4SdBxigEDzlDTZE1yp78sqjRZOm81aDth9E8 N4s34trGqdffipjcYmaET7XVOfDKWt0HWwOpIIjqK2Vm6OjPvsWUzN83hEe6sQKgygQF Rsog== X-Gm-Message-State: AC+VfDx73Ew6LvqKB6dbkM38kF6WsnDSGJVsxWTHGPhlU/JrU3IMphLQ 0paRrxPdKuRhLd4IdVPBt4vgBA== X-Google-Smtp-Source: ACHHUZ6RGIY8Q5EYr8VS/MG5yhZySuR5xYGF1P7o3orytf0EAD7Xhd7VamRyzp2t7CMaPRzZHLL0RA== X-Received: by 2002:a17:907:2d88:b0:98d:4e03:1d55 with SMTP id gt8-20020a1709072d8800b0098d4e031d55mr11226240ejc.76.1687793601212; Mon, 26 Jun 2023 08:33:21 -0700 (PDT) Received: from localhost (2001-1ae9-1c2-4c00-20f-c6b4-1e57-7965.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:20f:c6b4:1e57:7965]) by smtp.gmail.com with ESMTPSA id hk8-20020a170906c9c800b00987316d1585sm3420624ejb.145.2023.06.26.08.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 08:33:20 -0700 (PDT) Date: Mon, 26 Jun 2023 17:33:19 +0200 From: Andrew Jones To: Conor Dooley Cc: palmer@dabbelt.com, conor@kernel.org, Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Albert Ou , Heiko Stuebner , Evan Green , Sunil V L , linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 4/9] RISC-V: repurpose riscv_isa_ext array in riscv_fill_hwcap() Message-ID: <20230626-2eca99968e20531752dea023@orel> References: <20230626-provable-angrily-81760e8c3cc6@wendy> <20230626-thieving-jockstrap-d35d20b535c5@wendy> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230626-thieving-jockstrap-d35d20b535c5@wendy> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Mon, Jun 26, 2023 at 12:19:42PM +0100, Conor Dooley wrote: > In riscv_fill_hwcap() riscv_isa_ext array can be looped over, rather > than duplicating the list of extensions with individual > SET_ISA_EXT_MAP() usage. While at it, drop the statement-of-the-obvious > comments from the struct, rename uprop to something more suitable for > its new use & constify the members. > > Signed-off-by: Conor Dooley > --- > arch/riscv/include/asm/hwcap.h | 6 ++---- > arch/riscv/kernel/cpu.c | 5 +++-- > arch/riscv/kernel/cpufeature.c | 26 +++++++------------------- > 3 files changed, 12 insertions(+), 25 deletions(-) > > diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h > index 7a57e6109aef..36f46dfd2b87 100644 > --- a/arch/riscv/include/asm/hwcap.h > +++ b/arch/riscv/include/asm/hwcap.h > @@ -70,10 +70,8 @@ > unsigned long riscv_get_elf_hwcap(void); > > struct riscv_isa_ext_data { > - /* Name of the extension displayed to userspace via /proc/cpuinfo */ > - char uprop[RISCV_ISA_EXT_NAME_LEN_MAX]; The RISCV_ISA_EXT_NAME_LEN_MAX define can now also be deleted. > - /* The logical ISA extension ID */ > - unsigned int isa_ext_id; > + const unsigned int id; > + const char *name; > }; > > extern const struct riscv_isa_ext_data riscv_isa_ext[]; > diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c > index 61fb92e7d524..beb8b16bbf87 100644 > --- a/arch/riscv/kernel/cpu.c > +++ b/arch/riscv/kernel/cpu.c > @@ -164,9 +164,10 @@ 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->isa_ext_id)) > + if (!__riscv_isa_extension_available(NULL, edata->id)) > continue; > - seq_printf(f, "_%s", edata->uprop); > + > + seq_printf(f, "_%s", edata->name); > } > } > > diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c > index f0ae310006de..b5e23506c4f0 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -99,11 +99,10 @@ static bool riscv_isa_extension_check(int id) > return true; > } > > -#define __RISCV_ISA_EXT_DATA(UPROP, EXTID) \ > - { \ > - .uprop = #UPROP, \ > - .isa_ext_id = EXTID, \ > - } > +#define __RISCV_ISA_EXT_DATA(_name, _id) { \ > + .name = #_name, \ > + .id = _id, \ > +} > > /* > * The canonical order of ISA extension names in the ISA string is defined in > @@ -367,20 +366,9 @@ void __init riscv_fill_hwcap(void) > set_bit(nr, isainfo->isa); > } > } else { > - /* sorted alphabetically */ > - SET_ISA_EXT_MAP("smaia", RISCV_ISA_EXT_SMAIA); > - SET_ISA_EXT_MAP("ssaia", RISCV_ISA_EXT_SSAIA); > - SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF); > - SET_ISA_EXT_MAP("sstc", RISCV_ISA_EXT_SSTC); > - SET_ISA_EXT_MAP("svinval", RISCV_ISA_EXT_SVINVAL); > - SET_ISA_EXT_MAP("svnapot", RISCV_ISA_EXT_SVNAPOT); > - SET_ISA_EXT_MAP("svpbmt", RISCV_ISA_EXT_SVPBMT); > - SET_ISA_EXT_MAP("zba", RISCV_ISA_EXT_ZBA); > - SET_ISA_EXT_MAP("zbb", RISCV_ISA_EXT_ZBB); > - SET_ISA_EXT_MAP("zbs", RISCV_ISA_EXT_ZBS); > - SET_ISA_EXT_MAP("zicbom", RISCV_ISA_EXT_ZICBOM); > - SET_ISA_EXT_MAP("zicboz", RISCV_ISA_EXT_ZICBOZ); > - SET_ISA_EXT_MAP("zihintpause", RISCV_ISA_EXT_ZIHINTPAUSE); > + for (int i = 0; i < riscv_isa_ext_count; i++) > + SET_ISA_EXT_MAP(riscv_isa_ext[i].name, > + riscv_isa_ext[i].id); Three cheers for removing one list that needed to be maintained! > } > #undef SET_ISA_EXT_MAP > } > -- > 2.40.1 > Other than also dropping the define, Reviewed-by: Andrew Jones Thanks, drew