mirror of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
synced 2025-09-16 12:06:08 +10:00
9493e6f3ce
Guenter reported a splat during boot, that Samuel pointed out was the lockdep assertion failing in patch_insn_write(): WARNING: CPU: 0 PID: 0 at arch/riscv/kernel/patch.c:63 patch_insn_write+0x222/0x2f6 epc : patch_insn_write+0x222/0x2f6 ra : patch_insn_write+0x21e/0x2f6 epc : ffffffff800068c6 ra : ffffffff800068c2 sp : ffffffff81803df0 gp : ffffffff81a1ab78 tp : ffffffff81814f80 t0 : ffffffffffffe000 t1 : 0000000000000001 t2 : 4c45203a76637369 s0 : ffffffff81803e40 s1 : 0000000000000004 a0 : 0000000000000000 a1 : ffffffffffffffff a2 : 0000000000000004 a3 : 0000000000000000 a4 : 0000000000000001 a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000052464e43 s2 : ffffffff80b4889c s3 : 000000000000082c s4 : ffffffff80b48828 s5 : 0000000000000828 s6 : ffffffff8131a0a0 s7 : 0000000000000fff s8 : 0000000008000200 s9 : ffffffff8131a520 s10: 0000000000000018 s11: 000000000000000b t3 : 0000000000000001 t4 : 000000000000000d t5 : ffffffffd8180000 t6 : ffffffff81803bc8 status: 0000000200000100 badaddr: 0000000000000000 cause: 0000000000000003 [<ffffffff800068c6>] patch_insn_write+0x222/0x2f6 [<ffffffff80006a36>] patch_text_nosync+0xc/0x2a [<ffffffff80003b86>] riscv_cpufeature_patch_func+0x52/0x98 [<ffffffff80003348>] _apply_alternatives+0x46/0x86 [<ffffffff80c02d36>] apply_boot_alternatives+0x3c/0xfa [<ffffffff80c03ad8>] setup_arch+0x584/0x5b8 [<ffffffff80c0075a>] start_kernel+0xa2/0x8f8 This issue was exposed by702e64550b("riscv: fpu: switch has_fpu() to riscv_has_extension_likely()"), as it is the patching in has_fpu() that triggers the splats in Guenter's report. Take the text_mutex before doing any code patching to satisfy lockdep. Fixes:ff689fd21c("riscv: add RISC-V Svpbmt extension support") Fixes:a35707c3d8("riscv: add memory-type errata for T-Head") Fixes:1a0e5dbd37("riscv: sifive: Add SiFive alternative ports") Reported-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/all/20230212154333.GA3760469@roeck-us.net/ Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Samuel Holland <samuel@sholland.org> Tested-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20230212194735.491785-1-conor@kernel.org Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
122 lines
3.1 KiB
C
122 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2021 Sifive.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/memory.h>
|
|
#include <linux/module.h>
|
|
#include <linux/string.h>
|
|
#include <linux/bug.h>
|
|
#include <asm/patch.h>
|
|
#include <asm/alternative.h>
|
|
#include <asm/vendorid_list.h>
|
|
#include <asm/errata_list.h>
|
|
|
|
struct errata_info_t {
|
|
char name[ERRATA_STRING_LENGTH_MAX];
|
|
bool (*check_func)(unsigned long arch_id, unsigned long impid);
|
|
};
|
|
|
|
static bool errata_cip_453_check_func(unsigned long arch_id, unsigned long impid)
|
|
{
|
|
/*
|
|
* Affected cores:
|
|
* Architecture ID: 0x8000000000000007
|
|
* Implement ID: 0x20181004 <= impid <= 0x20191105
|
|
*/
|
|
if (arch_id != 0x8000000000000007 ||
|
|
(impid < 0x20181004 || impid > 0x20191105))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
static bool errata_cip_1200_check_func(unsigned long arch_id, unsigned long impid)
|
|
{
|
|
/*
|
|
* Affected cores:
|
|
* Architecture ID: 0x8000000000000007 or 0x1
|
|
* Implement ID: mimpid[23:0] <= 0x200630 and mimpid != 0x01200626
|
|
*/
|
|
if (arch_id != 0x8000000000000007 && arch_id != 0x1)
|
|
return false;
|
|
if ((impid & 0xffffff) > 0x200630 || impid == 0x1200626)
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
static struct errata_info_t errata_list[ERRATA_SIFIVE_NUMBER] = {
|
|
{
|
|
.name = "cip-453",
|
|
.check_func = errata_cip_453_check_func
|
|
},
|
|
{
|
|
.name = "cip-1200",
|
|
.check_func = errata_cip_1200_check_func
|
|
},
|
|
};
|
|
|
|
static u32 __init_or_module sifive_errata_probe(unsigned long archid,
|
|
unsigned long impid)
|
|
{
|
|
int idx;
|
|
u32 cpu_req_errata = 0;
|
|
|
|
for (idx = 0; idx < ERRATA_SIFIVE_NUMBER; idx++)
|
|
if (errata_list[idx].check_func(archid, impid))
|
|
cpu_req_errata |= (1U << idx);
|
|
|
|
return cpu_req_errata;
|
|
}
|
|
|
|
static void __init_or_module warn_miss_errata(u32 miss_errata)
|
|
{
|
|
int i;
|
|
|
|
pr_warn("----------------------------------------------------------------\n");
|
|
pr_warn("WARNING: Missing the following errata may cause potential issues\n");
|
|
for (i = 0; i < ERRATA_SIFIVE_NUMBER; i++)
|
|
if (miss_errata & 0x1 << i)
|
|
pr_warn("\tSiFive Errata[%d]:%s\n", i, errata_list[i].name);
|
|
pr_warn("Please enable the corresponding Kconfig to apply them\n");
|
|
pr_warn("----------------------------------------------------------------\n");
|
|
}
|
|
|
|
void __init_or_module sifive_errata_patch_func(struct alt_entry *begin,
|
|
struct alt_entry *end,
|
|
unsigned long archid,
|
|
unsigned long impid,
|
|
unsigned int stage)
|
|
{
|
|
struct alt_entry *alt;
|
|
u32 cpu_req_errata;
|
|
u32 cpu_apply_errata = 0;
|
|
u32 tmp;
|
|
|
|
if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
|
|
return;
|
|
|
|
cpu_req_errata = sifive_errata_probe(archid, impid);
|
|
|
|
for (alt = begin; alt < end; alt++) {
|
|
if (alt->vendor_id != SIFIVE_VENDOR_ID)
|
|
continue;
|
|
if (alt->errata_id >= ERRATA_SIFIVE_NUMBER) {
|
|
WARN(1, "This errata id:%d is not in kernel errata list", alt->errata_id);
|
|
continue;
|
|
}
|
|
|
|
tmp = (1U << alt->errata_id);
|
|
if (cpu_req_errata & tmp) {
|
|
mutex_lock(&text_mutex);
|
|
patch_text_nosync(ALT_OLD_PTR(alt), ALT_ALT_PTR(alt),
|
|
alt->alt_len);
|
|
mutex_lock(&text_mutex);
|
|
cpu_apply_errata |= tmp;
|
|
}
|
|
}
|
|
if (stage != RISCV_ALTERNATIVES_MODULE &&
|
|
cpu_apply_errata != cpu_req_errata)
|
|
warn_miss_errata(cpu_req_errata - cpu_apply_errata);
|
|
}
|