| Message ID | 20221104112127.30467-1-peterlin@andestech.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | riscv: Fix detecting FPU support in standard extension | expand |
On 11/4/22 06:21, Yu Chien Peter Lin wrote: > 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 <peterlin@andestech.com> > --- > arch/riscv/cpu/cpu.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c > index 52ab02519f..dc949c1306 100644 > --- a/arch/riscv/cpu/cpu.c > +++ b/arch/riscv/cpu/cpu.c > @@ -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] - '_')) Why not use "if (desc[i] == '_')"? Also, you need to stop at the null terminator. Regards, Samuel > + break; > + if (desc[i] == ext) > + return true; > + } > } > > return false;
On Fri, Nov 04, 2022 at 11:39:43PM -0500, Samuel Holland wrote: > On 11/4/22 06:21, Yu Chien Peter Lin wrote: > > 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 <peterlin@andestech.com> > > --- > > arch/riscv/cpu/cpu.c | 14 +++++++++++--- > > 1 file changed, 11 insertions(+), 3 deletions(-) > > > > diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c > > index 52ab02519f..dc949c1306 100644 > > --- a/arch/riscv/cpu/cpu.c > > +++ b/arch/riscv/cpu/cpu.c > > @@ -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] - '_')) > > Why not use "if (desc[i] == '_')"? Also, you need to stop at the null > terminator. > > Regards, > Samuel Hi Samuel, Oops, I'll fix this. Thanks for your review! Best regards, Peter Lin > > > + break; > > + if (desc[i] == ext) > > + return true; > > + } > > } > > > > return false; >
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index 52ab02519f..dc949c1306 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -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] - '_')) + break; + if (desc[i] == ext) + return true; + } } return false;
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 <peterlin@andestech.com> --- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)