Unverified Commit 8135ade3 authored by Conor Dooley's avatar Conor Dooley Committed by Palmer Dabbelt
Browse files

RISC-V: shunt isa_ext_arr to cpufeature.c 



To facilitate using one struct to define extensions, rather than having
several, shunt isa_ext_arr to cpufeature.c, where it will be used for
probing extension presence also.
As that scope of the array as widened, prefix it with riscv & drop the
type from the variable name.

Since the new array is const, print_isa() needs a wee bit of cleanup to
avoid complaints about losing the const qualifier.

Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarEvan Green <evan@rivosinc.com>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230713-spirits-upside-a2c61c65fd5a@wendy


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 13103368

arch/riscv/include/asm/hwcap.h

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ struct riscv_isa_ext_data { 
	unsigned int isa_ext_id;

};



extern const struct riscv_isa_ext_data riscv_isa_ext[];

extern const size_t riscv_isa_ext_count;



unsigned long riscv_isa_extension_base(const unsigned long *isa_bitmap);



#define riscv_isa_extension_mask(ext) BIT_MASK(RISCV_ISA_EXT_##ext)

arch/riscv/kernel/cpu.c

+2 −73
Original line number Diff line number Diff line
@@ -164,81 +164,10 @@ arch_initcall(riscv_cpuinfo_init); 


#ifdef CONFIG_PROC_FS



#define __RISCV_ISA_EXT_DATA(UPROP, EXTID) \

	{							\

		.uprop = #UPROP,				\

		.isa_ext_id = EXTID,				\

	}



/*

 * The canonical order of ISA extension names in the ISA string is defined in

 * chapter 27 of the unprivileged specification.

 *

 * Ordinarily, for in-kernel data structures, this order is unimportant but

 * isa_ext_arr defines the order of the ISA string in /proc/cpuinfo.

 *

 * The specification uses vague wording, such as should, when it comes to

 * ordering, so for our purposes the following rules apply:

 *

 * 1. All multi-letter extensions must be separated from other extensions by an

 *    underscore.

 *

 * 2. Additional standard extensions (starting with 'Z') must be sorted after

 *    single-letter extensions and before any higher-privileged extensions.



 * 3. The first letter following the 'Z' conventionally indicates the most

 *    closely related alphabetical extension category, IMAFDQLCBKJTPVH.

 *    If multiple 'Z' extensions are named, they must be ordered first by

 *    category, then alphabetically within a category.

 *

 * 3. Standard supervisor-level extensions (starting with 'S') must be listed

 *    after standard unprivileged extensions.  If multiple supervisor-level

 *    extensions are listed, they must be ordered alphabetically.

 *

 * 4. Standard machine-level extensions (starting with 'Zxm') must be listed

 *    after any lower-privileged, standard extensions.  If multiple

 *    machine-level extensions are listed, they must be ordered

 *    alphabetically.

 *

 * 5. Non-standard extensions (starting with 'X') must be listed after all

 *    standard extensions. If multiple non-standard extensions are listed, they

 *    must be ordered alphabetically.

 *

 * An example string following the order is:

 *    rv64imadc_zifoo_zigoo_zafoo_sbar_scar_zxmbaz_xqux_xrux

 *

 * New entries to this struct should follow the ordering rules described above.

 */

static struct riscv_isa_ext_data isa_ext_arr[] = {

	__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),

	__RISCV_ISA_EXT_DATA(zicsr, RISCV_ISA_EXT_ZICSR),

	__RISCV_ISA_EXT_DATA(zifencei, RISCV_ISA_EXT_ZIFENCEI),

	__RISCV_ISA_EXT_DATA(zihintpause, RISCV_ISA_EXT_ZIHINTPAUSE),

	__RISCV_ISA_EXT_DATA(zihpm, RISCV_ISA_EXT_ZIHPM),

	__RISCV_ISA_EXT_DATA(zba, RISCV_ISA_EXT_ZBA),

	__RISCV_ISA_EXT_DATA(zbb, RISCV_ISA_EXT_ZBB),

	__RISCV_ISA_EXT_DATA(zbs, RISCV_ISA_EXT_ZBS),

	__RISCV_ISA_EXT_DATA(smaia, RISCV_ISA_EXT_SMAIA),

	__RISCV_ISA_EXT_DATA(ssaia, RISCV_ISA_EXT_SSAIA),

	__RISCV_ISA_EXT_DATA(sscofpmf, RISCV_ISA_EXT_SSCOFPMF),

	__RISCV_ISA_EXT_DATA(sstc, RISCV_ISA_EXT_SSTC),

	__RISCV_ISA_EXT_DATA(svinval, RISCV_ISA_EXT_SVINVAL),

	__RISCV_ISA_EXT_DATA(svnapot, RISCV_ISA_EXT_SVNAPOT),

	__RISCV_ISA_EXT_DATA(svpbmt, RISCV_ISA_EXT_SVPBMT),

	__RISCV_ISA_EXT_DATA("", RISCV_ISA_EXT_MAX),

};



static void print_isa_ext(struct seq_file *f)

{

	struct riscv_isa_ext_data *edata;

	int i = 0, arr_sz;



	arr_sz = ARRAY_SIZE(isa_ext_arr) - 1;



	for (i = 0; i <= arr_sz; i++) {

		edata = &isa_ext_arr[i];

	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))

			continue;

		seq_printf(f, "_%s", edata->uprop);

arch/riscv/kernel/cpufeature.c

+67 −0
Original line number Diff line number Diff line
@@ -99,6 +99,73 @@ static bool riscv_isa_extension_check(int id) 
	return true;

}



#define __RISCV_ISA_EXT_DATA(UPROP, EXTID) \

	{							\

		.uprop = #UPROP,				\

		.isa_ext_id = EXTID,				\

	}



/*

 * The canonical order of ISA extension names in the ISA string is defined in

 * chapter 27 of the unprivileged specification.

 *

 * Ordinarily, for in-kernel data structures, this order is unimportant but

 * isa_ext_arr defines the order of the ISA string in /proc/cpuinfo.

 *

 * The specification uses vague wording, such as should, when it comes to

 * ordering, so for our purposes the following rules apply:

 *

 * 1. All multi-letter extensions must be separated from other extensions by an

 *    underscore.

 *

 * 2. Additional standard extensions (starting with 'Z') must be sorted after

 *    single-letter extensions and before any higher-privileged extensions.

 *

 * 3. The first letter following the 'Z' conventionally indicates the most

 *    closely related alphabetical extension category, IMAFDQLCBKJTPVH.

 *    If multiple 'Z' extensions are named, they must be ordered first by

 *    category, then alphabetically within a category.

 *

 * 3. Standard supervisor-level extensions (starting with 'S') must be listed

 *    after standard unprivileged extensions.  If multiple supervisor-level

 *    extensions are listed, they must be ordered alphabetically.

 *

 * 4. Standard machine-level extensions (starting with 'Zxm') must be listed

 *    after any lower-privileged, standard extensions.  If multiple

 *    machine-level extensions are listed, they must be ordered

 *    alphabetically.

 *

 * 5. Non-standard extensions (starting with 'X') must be listed after all

 *    standard extensions. If multiple non-standard extensions are listed, they

 *    must be ordered alphabetically.

 *

 * An example string following the order is:

 *    rv64imadc_zifoo_zigoo_zafoo_sbar_scar_zxmbaz_xqux_xrux

 *

 * 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(zicbom, RISCV_ISA_EXT_ZICBOM),

	__RISCV_ISA_EXT_DATA(zicboz, RISCV_ISA_EXT_ZICBOZ),

	__RISCV_ISA_EXT_DATA(zicntr, RISCV_ISA_EXT_ZICNTR),

	__RISCV_ISA_EXT_DATA(zicsr, RISCV_ISA_EXT_ZICSR),

	__RISCV_ISA_EXT_DATA(zifencei, RISCV_ISA_EXT_ZIFENCEI),

	__RISCV_ISA_EXT_DATA(zihintpause, RISCV_ISA_EXT_ZIHINTPAUSE),

	__RISCV_ISA_EXT_DATA(zihpm, RISCV_ISA_EXT_ZIHPM),

	__RISCV_ISA_EXT_DATA(zba, RISCV_ISA_EXT_ZBA),

	__RISCV_ISA_EXT_DATA(zbb, RISCV_ISA_EXT_ZBB),

	__RISCV_ISA_EXT_DATA(zbs, RISCV_ISA_EXT_ZBS),

	__RISCV_ISA_EXT_DATA(smaia, RISCV_ISA_EXT_SMAIA),

	__RISCV_ISA_EXT_DATA(ssaia, RISCV_ISA_EXT_SSAIA),

	__RISCV_ISA_EXT_DATA(sscofpmf, RISCV_ISA_EXT_SSCOFPMF),

	__RISCV_ISA_EXT_DATA(sstc, RISCV_ISA_EXT_SSTC),

	__RISCV_ISA_EXT_DATA(svinval, RISCV_ISA_EXT_SVINVAL),

	__RISCV_ISA_EXT_DATA(svnapot, RISCV_ISA_EXT_SVNAPOT),

	__RISCV_ISA_EXT_DATA(svpbmt, RISCV_ISA_EXT_SVPBMT),

};



const size_t riscv_isa_ext_count = ARRAY_SIZE(riscv_isa_ext);



void __init riscv_fill_hwcap(void)

{

	struct device_node *node;