2022-12-28 16:43:37

by Samuel Holland

Subject: [PATCH 2/3] riscv: sbi: Share the code for unsupported extension warnings

This reduces the code size by sharing most of the code and the format
string across all affected extensions.

Signed-off-by: Samuel Holland <[email protected]>
---

arch/riscv/kernel/sbi.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c
index 5c87db8fdff2..1196c12299f6 100644
--- a/arch/riscv/kernel/sbi.c
+++ b/arch/riscv/kernel/sbi.c
@@ -210,16 +210,20 @@ static void sbi_set_power_off(void)
pm_power_off = sbi_shutdown;
}
#else
+static void __sbi_warn_unsupported(const char *extension)
+{
+ pr_warn("%s extension is not available in SBI v%lu.%lu\n",
+ extension, sbi_major_version(), sbi_minor_version());
+}
+
static void __sbi_set_timer_v01(uint64_t stime_value)
{
- pr_warn("Timer extension is not available in SBI v%lu.%lu\n",
- sbi_major_version(), sbi_minor_version());
+ __sbi_warn_unsupported("Timer");
}

static int __sbi_send_ipi_v01(const struct cpumask *cpu_mask)
{
- pr_warn("IPI extension is not available in SBI v%lu.%lu\n",
- sbi_major_version(), sbi_minor_version());
+ __sbi_warn_unsupported("IPI");

return 0;
}
@@ -228,8 +232,7 @@ static int __sbi_rfence_v01(int fid, const struct cpumask *cpu_mask,
unsigned long start, unsigned long size,
unsigned long arg4, unsigned long arg5)
{
- pr_warn("remote fence extension is not available in SBI v%lu.%lu\n",
- sbi_major_version(), sbi_minor_version());
+ __sbi_warn_unsupported("Remote fence");

return 0;
}
--
2.37.4

2023-01-03 09:28:33

by Geert Uytterhoeven

Subject: Re: [PATCH 2/3] riscv: sbi: Share the code for unsupported extension warnings

On Wed, Dec 28, 2022 at 5:19 PM Samuel Holland <[email protected]> wrote:
> This reduces the code size by sharing most of the code and the format
> string across all affected extensions.
>
> Signed-off-by: Samuel Holland <[email protected]>

Reviewed-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds