Unverified Commit e67e98ee authored by Charlie Jenkins's avatar Charlie Jenkins Committed by Palmer Dabbelt
Browse files

riscv: cpufeature: Fix extension subset checking 



This loop is supposed to check if ext->subset_ext_ids[j] is valid, rather
than if ext->subset_ext_ids[i] is valid, before setting the extension
id ext->subset_ext_ids[j] in isainfo->isa.

Signed-off-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Fixes: 0d8295ed ("riscv: add ISA extension parsing for scalar crypto")
Link: https://lore.kernel.org/r/20240502-cpufeature_fixes-v4-2-b3d1a088722d@rivosinc.com


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

arch/riscv/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static int __init riscv_fill_hwcap_from_ext_list(unsigned long *isa2hwcap) 


			if (ext->subset_ext_size) {

				for (int j = 0; j < ext->subset_ext_size; j++) {

					if (riscv_isa_extension_check(ext->subset_ext_ids[i]))

					if (riscv_isa_extension_check(ext->subset_ext_ids[j]))

						set_bit(ext->subset_ext_ids[j], isainfo->isa);

				}

			}