riscv: Fix detecting FPU support in standard extension
PATCH v2 1/1 riscv: Fix detecting FPU support in standard extension
We should check the string until it hits underscore, in case it searches for the letters in the custom extension. For example, "rv64imac_xandes" will be treated as D extension support since there is a "d" in "andes", resulting illegal instruction caused by initializing FCSR.
--- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
arch/riscv/cpu/cpu.c +11 -3
@@ -36,6 +36,7 @@ static inline bool supports_extension(char ext)#ifdef CONFIG_CPU struct udevice *dev;char desc[32 ]; +int i;uclass_find_first_device (UCLASS_CPU , &dev);if (!dev) {
@@ -43,9 +44,16 @@ static inline bool supports_extension(char ext)return false; }if (!cpu_get_desc (dev, desc,sizeof (desc))) { -/* skip the first 4 characters (rv32|rv64) */ -if (strchr (desc +4 , ext)) -return true; +/* +* skip the first 4 characters (rv32|rv64) and +* check until underscore +*/ +for (i =4 ; i <sizeof (desc); i++) { +if (desc[i] =='_' || desc[i] =='\0' ) +break ; +if (desc[i] == ext) +return true; + } }return false;
Signature · 1 line
2.34.1
A message that is not in the archive (sent off-list or not yet received): HK0PR03MB2994D5179CFED4510DB0DCCDC1019@HK0PR03MB2994.apcprd03.prod.outlook.com
Rick Chen
Reviewed-byQuoted 6 lines
From: U-Boot <[email protected]> On Behalf Of Yu Chien Peter Lin
Sent: Saturday, November 05, 2022 2:02 PM
To: [email protected]
Cc: [email protected]; Peter Yu-Chien Lin(林宇謙) <[email protected]>
Subject: [PATCH v2] riscv: Fix detecting FPU support in standard extension
Quoted 6 lines
We should check the string until it hits underscore, in case it searches for the letters in the custom extension. For example, "
rv64imac_xandes" will be treated as D extension support since there is a "d" in "andes", resulting illegal instruction caused by initializing FCSR.Signed-off-by Yu Chien Peter Lin <[email protected]>--- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Quoted 33 lines · Yu Chien Peter Lin
We should check the string until it hits underscore, in case it searches for the letters in the custom extension. For example, "
rv64imac_xandes" will be treated as D extension support since there is a "d" in "andes", resulting illegal instruction caused by initializing FCSR.Signed-off-by Yu Chien Peter Lin <[email protected]>--- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)arch/riscv/cpu/cpu.c +2
-3@@ -36,6 +36,7 @@ static inline bool supports_extension(char ext)#ifdef CONFIG_CPU struct udevice *dev;char desc[32 ]; +int i;uclass_find_first_device (UCLASS_CPU , &dev);if (!dev) {@@ -43,9 +44,16 @@ static inline bool supports_extension(char ext)return false; }if (!cpu_get_desc (dev, desc,sizeof (desc))) { -/* skip the first 4 characters (rv32|rv64) */ -if (strchr (desc +4 , ext)) -return true; +/*
arch/riscv/cpu/cpu.c static inline bool supports_extension(char ext) · line 57
Quoted 10 lines
arch/riscv/cpu/cpu.c +9
-0+* skip the first 4 characters (rv32|rv64) and +* check until underscore +*/ +for (i =4 ; i <sizeof (desc); i++) { +if (desc[i] =='_' || desc[i] =='\0' ) +break ; +if (desc[i] == ext) +return true; + }
Quoted 6 lines
arch/riscv/cpu/cpu.c +0
-0}return false;--
2.34.1
Quoted 24 lines · Yu Chien Peter Lin
We should check the string until it hits underscore, in case it searches for the letters in the custom extension. For example, "
rv64imac_xandes" will be treated as D extension support since there is a "d" in "andes", resulting illegal instruction caused by initializing FCSR.Signed-off-by Yu Chien Peter Lin <[email protected]>--- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)arch/riscv/cpu/cpu.c +1
-0@@ -36,6 +36,7 @@ static inline bool supports_extension(char ext)#ifdef CONFIG_CPU struct udevice *dev;char desc[32 ]; +int i;uclass_find_first_device (UCLASS_CPU , &dev);if (!dev) {
arch/riscv/cpu/cpu.c static inline bool supports_extension(char ext) · line 50
Quoted 10 lines
arch/riscv/cpu/cpu.c +4
-3@@ -43,9 +44,16 @@ static inline bool supports_extension(char ext)return false; }if (!cpu_get_desc (dev, desc,sizeof (desc))) { -/* skip the first 4 characters (rv32|rv64) */ -if (strchr (desc +4 , ext)) -return true; +/* +* skip the first 4 characters (rv32|rv64) and +* check until underscore +*/
This probably works for the intended usage, but it is not guaranteed to work. Underscores are allowed even between single-letter extensions. See section 29.5 ("Underscores") of the unprivileged spec. Still, this is an improvement, so:
Quoted 9 lines
arch/riscv/cpu/cpu.c +6
-0+for (i =4 ; i <sizeof (desc); i++) { +if (desc[i] =='_' || desc[i] =='\0' ) +break ; +if (desc[i] == ext) +return true; + } }return false;
Quoted 41 lines · Samuel Holland
Quoted 24 lines · Yu Chien Peter Lin
We should check the string until it hits underscore, in case it searches for the letters in the custom extension. For example, "
rv64imac_xandes" will be treated as D extension support since there is a "d" in "andes", resulting illegal instruction caused by initializing FCSR.Signed-off-by Yu Chien Peter Lin <[email protected]>--- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)arch/riscv/cpu/cpu.c +1
-0@@ -36,6 +36,7 @@ static inline bool supports_extension(char ext)#ifdef CONFIG_CPU struct udevice *dev;char desc[32 ]; +int i;uclass_find_first_device (UCLASS_CPU , &dev);if (!dev) {arch/riscv/cpu/cpu.c static inline bool supports_extension(char ext) · line 50
Quoted 10 lines
arch/riscv/cpu/cpu.c +4
-3@@ -43,9 +44,16 @@ static inline bool supports_extension(char ext)return false; }if (!cpu_get_desc (dev, desc,sizeof (desc))) { -/* skip the first 4 characters (rv32|rv64) */ -if (strchr (desc +4 , ext)) -return true; +/* +* skip the first 4 characters (rv32|rv64) and +* check until underscore +*/ This probably works for the intended usage, but it is not guaranteed to work. Underscores are allowed even between single-letter extensions. See section 29.5 ("Underscores") of the unprivileged spec. Still, this is an improvement, so:
Quoted 1 line
Reviewed-by Samuel Holland <[email protected]>
Aah, I missed that case.
I supposed the strings always match the pattern stated in riscv cpus binding [1], the detection logic here needs to be updated once the case is also allowed.
Thanks for your review!
Best regards,
Peter Lin
Quoted 11 lines
Quoted 10 lines
arch/riscv/cpu/cpu.c +6
-0+for (i =4 ; i <sizeof (desc); i++) { +if (desc[i] =='_' || desc[i] =='\0' ) +break ; +if (desc[i] == ext) +return true; + } }return false;