Merge patch series "Putting some basic order on isa extension lists"

This cleans up the ISA string handling to more closely match a version
of the ISA spec.  This is visible in /proc/cpuinfo and the ordering
changes may break something in userspace, but these orderings have
changed before without issues so with any luck that's still the case.

This also adds documentation so userspace has a better idea of what is
intended when it comes to compatibility for /proc/cpuinfo, which should
help everyone as this will likely keep changing.

* b4-shazam-merge:
  Documentation: riscv: add a section about ISA string ordering in /proc/cpuinfo
  RISC-V: resort all extensions in consistent orders
  RISC-V: clarify ISA string ordering rules in cpu.c

Link: https://lore.kernel.org/r/20221205144525.2148448-1-conor.dooley@microchip.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --cc arch/riscv/include/asm/hwcap.h
index 86328e3acb02ee3b5752642039c2cdd2806989a1,ce522aad641a2cdbba3a2faa50fcedabd1eea6be..57439da71c775aba08fb419ca23e14264ff4364e
--- 1/arch/riscv/include/asm/hwcap.h
--- 2/arch/riscv/include/asm/hwcap.h
+++ b/arch/riscv/include/asm/hwcap.h
@@@ -57,11 -60,8 +60,9 @@@ enum riscv_isa_ext_id 
        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 = RISCV_ISA_EXT_MAX,
 +      RISCV_ISA_EXT_ID_MAX
  };
 +static_assert(RISCV_ISA_EXT_ID_MAX <= RISCV_ISA_EXT_MAX);
  
  /*
   * This enum represents the logical ID for each RISC-V ISA extension static

diff --cc arch/riscv/kernel/cpu.c
Simple merge

diff --cc arch/riscv/kernel/cpufeature.c
index 205bbd6b1fce0b57f3a500a1853b7b2f0bae6726,8a76a6ce70cf33d1db94a96f0a93c8d123be6e36..dde0e91d766887880d2870732705f0bd939b20dc
--- 1/arch/riscv/kernel/cpufeature.c
--- 2/arch/riscv/kernel/cpufeature.c
+++ b/arch/riscv/kernel/cpufeature.c
@@@ -215,14 -196,13 +215,17 @@@ void __init riscv_fill_hwcap(void
                        if (unlikely(ext_err))
                                continue;
                        if (!ext_long) {
 -                              this_hwcap |= isa2hwcap[(unsigned char)(*ext)];
 -                              set_bit(*ext - 'a', this_isa);
 +                              int nr = *ext - 'a';
 +
 +                              if (riscv_isa_extension_check(nr)) {
 +                                      this_hwcap |= isa2hwcap[nr];
 +                                      set_bit(nr, this_isa);
 +                              }
                        } else {
+                               /* sorted alphabetically */
                                SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF);
+                               SET_ISA_EXT_MAP("sstc", RISCV_ISA_EXT_SSTC);
+                               SET_ISA_EXT_MAP("svinval", RISCV_ISA_EXT_SVINVAL);
                                SET_ISA_EXT_MAP("svpbmt", RISCV_ISA_EXT_SVPBMT);
                                SET_ISA_EXT_MAP("zicbom", RISCV_ISA_EXT_ZICBOM);
                                SET_ISA_EXT_MAP("zihintpause", RISCV_ISA_EXT_ZIHINTPAUSE);