fix(riscv/sbi): rfence hart mask adjustment and check

Right now, the sbi rfence implementation only supports 64 harts, so the hart mask has to be rectified for always base 0 and return error if an with hart id >= 64 is being targeted. Both this check and the hart adjusment were being incorrectly performed. Signed-off-by: Jose Martins <[email protected]>
ninolomata · Oct 16, 2023 · b1488a3 · b1488a3
1 parent 8459a8e
commit b1488a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/arch/riscv/sbi.c b/src/arch/riscv/sbi.c
@@ -309,13 +309,13 @@ struct sbiret sbi_rfence_handler(unsigned long fid)
 
     const size_t hart_mask_width = sizeof(hart_mask) * 8;
     if ((hart_mask_base != 0) && ((hart_mask_base >= hart_mask_width) ||
-        ((hart_mask >> hart_mask_base) != 0))) 
+        ((hart_mask << hart_mask_base) == 0))) 
     {
         WARNING("sbi invalid hart_mask");
         return (struct sbiret){SBI_ERR_INVALID_PARAM};
     }
 
-    hart_mask = hart_mask >> hart_mask_base;
+    hart_mask = hart_mask << hart_mask_base;
 
     unsigned long phart_mask = vm_translate_to_pcpu_mask(
         cpu()->vcpu->vm, hart_mask, sizeof(hart_mask) * 8);