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 593BCC61DB3 for ; Thu, 12 Jan 2023 21:37:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240128AbjALVhR (ORCPT ); Thu, 12 Jan 2023 16:37:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234570AbjALVgf (ORCPT ); Thu, 12 Jan 2023 16:36:35 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E10A959F9E; Thu, 12 Jan 2023 13:29:01 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4BC64621A4; Thu, 12 Jan 2023 21:29:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4595DC433EF; Thu, 12 Jan 2023 21:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673558940; bh=Vv3O916AOOxSA6qNPf8av52jiPoTdUqQzMpzIkzHZAQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nviG3oG77pMLEvUdQq0PHjlQbAcVhTkU8JvlbhEzqvoErXA0Y9F8B3ct4pR6558sM Bf23n9EsLkv0Kpms8nC1UeujfzlNSTjhX7ZS0S8/2C8J0RvVQw0v7K8aybl/OghUd1 0xF9WvjH0HjAjEXL7ZMJCFLnm2BpoZSdfi2FVyGEsTXyXsK7ISMo/jKP00LTO+wlCs 3AjLS7t1EtYni51xi1HwwtkU9njcowJi00vfYc2MXlmTlI9LK5mtfQ0Xbv3U7T4IBZ jAc9JV2nLbkRdW4L2XZBGh6MRuaeeyMcjuKfai/JEcYzW5wRaEAn3U+B5FcTKIX+uD kCWQ+g9ggFrpw== Date: Thu, 12 Jan 2023 21:28:55 +0000 From: Conor Dooley To: Jisheng Zhang Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Andrew Jones Subject: Re: [PATCH v3 04/13] riscv: hwcap: make ISA extension ids can be used in asm Message-ID: References: <20230111171027.2392-1-jszhang@kernel.org> <20230111171027.2392-5-jszhang@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PRFHhOLbTp+eOclV" Content-Disposition: inline In-Reply-To: <20230111171027.2392-5-jszhang@kernel.org> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org --PRFHhOLbTp+eOclV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey Jisheng, On Thu, Jan 12, 2023 at 01:10:18AM +0800, Jisheng Zhang wrote: > We will make use of ISA extension in asm files, so make the multi-letter >=20 > RISC-V ISA extension IDs macros rather than enums and move them and > those base ISA extension IDs to suitable place. =46rom v2: Which base ISA extension IDs? Changelog should match the patch contents, and it's a little unclear here since the base ISA extension IDs are visible here but in the context not the diff. How about something like: "So that ISA extensions can be used in assembly files, convert the multi-letter RISC-V ISA extension IDs enums to macros. In order to make them visible, move the #ifndef __ASSEMBLY__ guard to a later point in the header" Pedantry perhaps, but referring to moving the base IDs looks odd, since that is not what git thinks you did - even if that is the copy paste operation you carried out. Content itself is Reviewed-by: Conor Dooley Thanks, Conor. > Signed-off-by: Jisheng Zhang > Reviewed-by: Heiko Stuebner > Reviewed-by: Andrew Jones > --- > arch/riscv/include/asm/hwcap.h | 45 ++++++++++++++++------------------ > 1 file changed, 21 insertions(+), 24 deletions(-) >=20 > diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwca= p.h > index 86328e3acb02..09a7767723f6 100644 > --- a/arch/riscv/include/asm/hwcap.h > +++ b/arch/riscv/include/asm/hwcap.h > @@ -12,20 +12,6 @@ > #include > #include > =20 > -#ifndef __ASSEMBLY__ > -#include > -/* > - * This yields a mask that user programs can use to figure out what > - * instruction set this cpu supports. > - */ > -#define ELF_HWCAP (elf_hwcap) > - > -enum { > - CAP_HWCAP =3D 1, > -}; > - > -extern unsigned long elf_hwcap; > - > #define RISCV_ISA_EXT_a ('a' - 'a') > #define RISCV_ISA_EXT_c ('c' - 'a') > #define RISCV_ISA_EXT_d ('d' - 'a') > @@ -46,22 +32,33 @@ extern unsigned long elf_hwcap; > #define RISCV_ISA_EXT_BASE 26 > =20 > /* > - * This enum represent the logical ID for each multi-letter RISC-V ISA e= xtension. > + * These macros represent the logical ID for each multi-letter RISC-V IS= A extension. > * The logical ID should start from RISCV_ISA_EXT_BASE and must not exce= ed > * RISCV_ISA_EXT_MAX. 0-25 range is reserved for single letter > * extensions while all the multi-letter extensions should define the ne= xt > * available logical extension id. > */ > -enum riscv_isa_ext_id { > - RISCV_ISA_EXT_SSCOFPMF =3D RISCV_ISA_EXT_BASE, > - RISCV_ISA_EXT_SVPBMT, > - RISCV_ISA_EXT_ZICBOM, > - RISCV_ISA_EXT_ZIHINTPAUSE, > - RISCV_ISA_EXT_SSTC, > - RISCV_ISA_EXT_SVINVAL, > - RISCV_ISA_EXT_ID_MAX > +#define RISCV_ISA_EXT_SSCOFPMF 26 > +#define RISCV_ISA_EXT_SVPBMT 27 > +#define RISCV_ISA_EXT_ZICBOM 28 > +#define RISCV_ISA_EXT_ZIHINTPAUSE 29 > +#define RISCV_ISA_EXT_SSTC 30 > +#define RISCV_ISA_EXT_SVINVAL 31 > + > +#ifndef __ASSEMBLY__ > +#include > +/* > + * This yields a mask that user programs can use to figure out what > + * instruction set this cpu supports. > + */ > +#define ELF_HWCAP (elf_hwcap) > + > +enum { > + CAP_HWCAP =3D 1, > }; > -static_assert(RISCV_ISA_EXT_ID_MAX <=3D RISCV_ISA_EXT_MAX); > + > +extern unsigned long elf_hwcap; > + > =20 > /* > * This enum represents the logical ID for each RISC-V ISA extension sta= tic > --=20 > 2.38.1 >=20 >=20 > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv --PRFHhOLbTp+eOclV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCY8B7lwAKCRB4tDGHoIJi 0skuAQCQWrG6EP11cnnr1Ue0/NgGhlWYgsbQDv1Qzs0hnpehqgEA4YJgeurFdoUm Cb4+8Doogcxj9yvJYA8Zvteg6Bp4Rws= =CkjQ -----END PGP SIGNATURE----- --PRFHhOLbTp+eOclV--