From 648507a86791d4558e96c9876e757cee2c30b203 Mon Sep 17 00:00:00 2001
From: Anup Patel <anup.patel@wdc.com>
Date: Fri, 27 Mar 2020 12:16:16 +0530
Subject: include: sbi_console: Remove scratch parameter from sbi_dprintf()
This patch removes scratch parameter from sbi_dprintf() function
because sbi_dprintf() can use sbi_scratch_thishart_ptr() to get
current HART scratch space.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
---
include/sbi/sbi_console.h | 5 ++---
lib/sbi/sbi_console.c | 8 +++++---
lib/sbi/sbi_emulate_csr.c | 7 ++-----
lib/sbi/sbi_tlb.c | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/include/sbi/sbi_console.h b/include/sbi/sbi_console.h
index 45af22f..7d648f0 100644
--- a/include/sbi/sbi_console.h
+++ b/include/sbi/sbi_console.h
@@ -30,10 +30,9 @@ int __printf(3, 4) sbi_snprintf(char *out, u32 out_sz, const char *format, ...);
int __printf(1, 2) sbi_printf(const char *format, ...);
-struct sbi_scratch;
+int __printf(1, 2) sbi_dprintf(const char *format, ...);
-int __printf(2, 3) sbi_dprintf(struct sbi_scratch *scratch,
- const char *format, ...);
+struct sbi_scratch;
int sbi_console_init(struct sbi_scratch *scratch);
diff --git a/lib/sbi/sbi_console.c b/lib/sbi/sbi_console.c
index 03dcdb2..7189b9b 100644
--- a/lib/sbi/sbi_console.c
+++ b/lib/sbi/sbi_console.c
@@ -7,9 +7,10 @@
* Anup Patel <anup.patel@wdc.com>
*/
-#include <sbi/sbi_platform.h>
-#include <sbi/sbi_console.h>
#include <sbi/riscv_locks.h>
+#include <sbi/sbi_console.h>
+#include <sbi/sbi_platform.h>
+#include <sbi/sbi_scratch.h>
static const struct sbi_platform *console_plat = NULL;
static spinlock_t console_out_lock = SPIN_LOCK_INITIALIZER;
@@ -375,10 +376,11 @@ int sbi_printf(const char *format, ...)
return retval;
}
-int sbi_dprintf(struct sbi_scratch *scratch, const char *format, ...)
+int sbi_dprintf(const char *format, ...)
{
va_list args;
int retval = 0;
+ struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
va_start(args, format);
if (scratch->options & SBI_SCRATCH_DEBUG_PRINTS)
diff --git a/lib/sbi/sbi_emulate_csr.c b/lib/sbi/sbi_emulate_csr.c
index a85277e..62c21a6 100644
--- a/lib/sbi/sbi_emulate_csr.c
+++ b/lib/sbi/sbi_emulate_csr.c
@@ -13,7 +13,6 @@
#include <sbi/sbi_console.h>
#include <sbi/sbi_emulate_csr.h>
#include <sbi/sbi_error.h>
-#include <sbi/sbi_scratch.h>
#include <sbi/sbi_timer.h>
#include <sbi/sbi_trap.h>
@@ -111,8 +110,7 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs,
};
if (ret)
- sbi_dprintf(sbi_scratch_thishart_ptr(),
- "%s: hartid%d: invalid csr_num=0x%x\n",
+ sbi_dprintf("%s: hartid%d: invalid csr_num=0x%x\n",
__func__, current_hartid(), csr_num);
return ret;
@@ -180,8 +178,7 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs,
};
if (ret)
- sbi_dprintf(sbi_scratch_thishart_ptr(),
- "%s: hartid%d: invalid csr_num=0x%x\n",
+ sbi_dprintf("%s: hartid%d: invalid csr_num=0x%x\n",
__func__, current_hartid(), csr_num);
return ret;
diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c
index 5e39da4..d857162 100644
--- a/lib/sbi/sbi_tlb.c
+++ b/lib/sbi/sbi_tlb.c
@@ -359,7 +359,7 @@ static int sbi_tlb_update(struct sbi_scratch *scratch,
* this properly.
*/
sbi_tlb_process_count(scratch, 1);
- sbi_dprintf(remote_scratch, "hart%d: hart%d tlb fifo full\n",
+ sbi_dprintf("hart%d: hart%d tlb fifo full\n",
curr_hartid, remote_hartid);
}
--
cgit v1.2.3