Skip to contentSkip to conversation

lib: utils/sys: Allow custom HTIF base address for RV32

PATCH New Bin Meng 3 participants 3 messages Dec 26, 2022 – Jan 6, 2023

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/1 lib: utils/sys: Allow custom HTIF base address for RV32

commit 6dde43584f18 ("lib: utils/sys: Extend HTIF library to allow custom base address") forgot to update do_tohost_fromhost() codes for RV32, which still
accesses the HTIF registers using the ELF symbol address directly.

Fixes 6dde43584f18 ("lib: utils/sys: Extend HTIF library to allow custom base address")

---

 lib/utils/sys/htif.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/utils/sys/htif.c +2 -2
index d7cbeaf..b4e6321 100644
@@ -135,11 +135,11 @@ static void do_tohost_fromhost(uint64_t dev, uint64_t cmd, uint64_t data)
 	__set_tohost(HTIF_DEV_SYSTEM, cmd, data);
 
 	while (1) {
-		uint64_t fh = fromhost;
+		uint64_t fh = __read_fromhost();
 		if (fh) {
 			if (FROMHOST_DEV(fh) == HTIF_DEV_SYSTEM &&
 			    FROMHOST_CMD(fh) == cmd) {
-				fromhost = 0;
+				__write_fromhost(0);
 				break;
 			}
 			__check_fromhost();
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/1 lib: utils/sys: Allow custom HTIF base address for RV32

Quoted 7 lines · Bin Meng

commit 6dde43584f18 ("lib: utils/sys: Extend HTIF library to allow custom base address") forgot to update do_tohost_fromhost() codes for RV32, which still
accesses the HTIF registers using the ELF symbol address directly.

Fixes 6dde43584f18 ("lib: utils/sys: Extend HTIF library to allow custom base address")

---

With this patch, "qemu-system-riscv32 -M spike -bios fw_payload.bin -nographic" now displays OpenSBI output in the terminal

Quoted 22 lines
  lib/utils/sys/htif.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
lib/utils/sys/htif.c +2 -2
index d7cbeaf..b4e6321 100644
@@ -135,11 +135,11 @@ static void do_tohost_fromhost(uint64_t dev, uint64_t cmd, uint64_t data)
  	__set_tohost(HTIF_DEV_SYSTEM, cmd, data);
 
  	while (1) {
-		uint64_t fh = fromhost;
+		uint64_t fh = __read_fromhost();
  		if (fh) {
  			if (FROMHOST_DEV(fh) == HTIF_DEV_SYSTEM &&
  			    FROMHOST_CMD(fh) == cmd) {
-				fromhost = 0;
+				__write_fromhost(0);
  				break;
  			}
  			__check_fromhost();
Applied
#2 lore raw

PATCH 1/1 lib: utils/sys: Allow custom HTIF base address for RV32

In reply to Bin Meng
Quoted 7 lines · Bin Meng

commit 6dde43584f18 ("lib: utils/sys: Extend HTIF library to allow custom base address") forgot to update do_tohost_fromhost() codes for RV32, which still
accesses the HTIF registers using the ELF symbol address directly.

Fixes 6dde43584f18 ("lib: utils/sys: Extend HTIF library to allow custom base address")

Looks good to me.

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

Quoted 26 lines

---

 lib/utils/sys/htif.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/utils/sys/htif.c +2 -3
index d7cbeaf..b4e6321 100644
@@ -135,11 +135,11 @@ static void do_tohost_fromhost(uint64_t dev, uint64_t cmd, uint64_t data)
        __set_tohost(HTIF_DEV_SYSTEM, cmd, data);
 
        while (1) {
-               uint64_t fh = fromhost;
+               uint64_t fh = __read_fromhost();
                if (fh) {
                        if (FROMHOST_DEV(fh) == HTIF_DEV_SYSTEM &&
                            FROMHOST_CMD(fh) == cmd) {
-                               fromhost = 0;
+                               __write_fromhost(0);
                                break;
                        }
                        __check_fromhost();
--

2.34.1