lib: sbi: Alphabetically sort HART ISA extensions

Let us follow alphabetical order for HART ISA extension so that
it is simpler to maintain.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Xiang W <wxjstz@126.com>

diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h
index 938248f36c468235fd1d4a46ab0bc3f411660448..b97f78cd11ec887f2755b44879e5c70180095027 100644 (file)
--- a/include/sbi/sbi_hart.h
+++ b/include/sbi/sbi_hart.h
@@ -26,16 +26,16 @@ enum sbi_hart_priv_versions {
 
 /** Possible ISA extensions of a hart */
 enum sbi_hart_extensions {
-       /** Hart has Sscofpmt extension */
-       SBI_HART_EXT_SSCOFPMF = 0,
-       /** HART has Zicntr extension (i.e. HW cycle, time & instret CSRs) */
-       SBI_HART_EXT_ZICNTR,
        /** HART has AIA M-mode CSRs */
-       SBI_HART_EXT_SMAIA,
+       SBI_HART_EXT_SMAIA = 0,
        /** HART has Smstateen CSR **/
        SBI_HART_EXT_SMSTATEEN,
+       /** Hart has Sscofpmt extension */
+       SBI_HART_EXT_SSCOFPMF,
        /** HART has Sstc extension */
        SBI_HART_EXT_SSTC,
+       /** HART has Zicntr extension (i.e. HW cycle, time & instret CSRs) */
+       SBI_HART_EXT_ZICNTR,
        /** HART has Zihpm extension */
        SBI_HART_EXT_ZIHPM,
 

diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c
index ff6f5826c6294388266673436298c278b8b68f83..2eacefb17c2d06c12357c8a8d3ff19509b69b55e 100644 (file)
--- a/lib/sbi/sbi_hart.c
+++ b/lib/sbi/sbi_hart.c
@@ -438,20 +438,20 @@ static inline char *sbi_hart_extension_id2string(int ext)
        char *estr = NULL;
 
        switch (ext) {
-       case SBI_HART_EXT_SSCOFPMF:
-               estr = "sscofpmf";
-               break;
-       case SBI_HART_EXT_ZICNTR:
-               estr = "zicntr";
-               break;
        case SBI_HART_EXT_SMAIA:
                estr = "smaia";
                break;
+       case SBI_HART_EXT_SMSTATEEN:
+               estr = "smstateen";
+               break;
+       case SBI_HART_EXT_SSCOFPMF:
+               estr = "sscofpmf";
+               break;
        case SBI_HART_EXT_SSTC:
                estr = "sstc";
                break;
-       case SBI_HART_EXT_SMSTATEEN:
-               estr = "smstateen";
+       case SBI_HART_EXT_ZICNTR:
+               estr = "zicntr";
                break;
        case SBI_HART_EXT_ZIHPM:
                estr = "zihpm";