mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 13:14:07 +08:00
498574970f
* A handful of DT updates for the PolarFire SOC. * A fix to correct the handling of write-only mappings. * m{vetndor,arcd,imp}id is now in /proc/cpuinfo * The SiFive L2 cache controller support has been refactored to also support L3 caches. There's also a handful of fixes, cleanups and improvements throughout the tree. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEKzw3R0RoQ7JKlDp6LhMZ81+7GIkFAmNJiegTHHBhbG1lckBk YWJiZWx0LmNvbQAKCRAuExnzX7sYiaW+D/9nN7JMKD4KbED8MUgRVcs+TS4MQk5J QkjmAXme7w2H1+T5mxNWHk0QvEC6qMu2JQWHeott0ROYPkbXoNtuOOkzcsZhVaeb rjWH/WC5QhEeMPDc1qc0AmxVkOa937f2NkGtoEvhW6SMWvStHpefdOHo/ij106Re 7wxkcj0fjgn/zPmDltRbWSMyFZWJec5DvZ3AB4NYHnc2ycr8Z7HAG08rjZkdkIjQ zYGsCkUtrk4qShikKK3cSelW6hH1/FdM+bAo0rzt1frmTw1FLaFOsZZjOaVYekzi l0jxsb8FRBWyKBFqcagukjZwFy6D+7Q+masb0cXY03eZpEVrroA4bHiPkuZ22Ms/ 7ol/I5FvTyrj2R4zd70ziYVF3usO78t5HC4AIQmFl25TNcQdYQd8X28yh12iG6QN Pa0lh/EOr5idaT2+TErhzRepICnK1Nj9y0H5TZxYljLAhH9j0d/8+Iw88vzJnPga vek7unZ3BzkooLVIpfpkT8vC94MA0hoP849MVFQDtZgZhPMbjIkN91HrDiw9ktV2 SK9cuPndfrs5nW1WKu8F0cDziusbMHv4F51TPVRu/dFcIkspv+aLojAThgvcm42K 55LgvDgLjo7P3PUghiDXUoPZXvL19t5Bnq2/E47rlSTvvGssIu/onZO6BkxybAm6 BkHuchr8TGBWMg== =iCOr -----END PGP SIGNATURE----- Merge tag 'riscv-for-linus-6.1-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux Pull more RISC-V updates from Palmer Dabbelt: - DT updates for the PolarFire SOC - a fix to correct the handling of write-only mappings - m{vetndor,arcd,imp}id is now in /proc/cpuinfo - the SiFive L2 cache controller support has been refactored to also support L3 caches - misc fixes, cleanups and improvements throughout the tree * tag 'riscv-for-linus-6.1-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (42 commits) MAINTAINERS: add RISC-V's patchwork RISC-V: Make port I/O string accessors actually work riscv: enable software resend of irqs RISC-V: Re-enable counter access from userspace riscv: vdso: fix NULL deference in vdso_join_timens() when vfork riscv: Add cache information in AUX vector soc: sifive: ccache: define the macro for the register shifts soc: sifive: ccache: use pr_fmt() to remove CCACHE: prefixes soc: sifive: ccache: reduce printing on init soc: sifive: ccache: determine the cache level from dts soc: sifive: ccache: Rename SiFive L2 cache to Composable cache. dt-bindings: sifive-ccache: change Sifive L2 cache to Composable cache riscv: check for kernel config option in t-head memory types errata riscv: use BIT() marco for cpufeature probing riscv: use BIT() macros in t-head errata init riscv: drop some idefs from CMO initialization riscv: cleanup svpbmt cpufeature probing riscv: Pass -mno-relax only on lld < 15.0.0 RISC-V: Avoid dereferening NULL regs in die() dt-bindings: riscv: add new riscv,isa strings for emulators ...
324 lines
8.1 KiB
C
324 lines
8.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copied from arch/arm64/kernel/cpufeature.c
|
|
*
|
|
* Copyright (C) 2015 ARM Ltd.
|
|
* Copyright (C) 2017 SiFive
|
|
*/
|
|
|
|
#include <linux/bitmap.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/libfdt.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <asm/alternative.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/errata_list.h>
|
|
#include <asm/hwcap.h>
|
|
#include <asm/patch.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/smp.h>
|
|
#include <asm/switch_to.h>
|
|
|
|
#define NUM_ALPHA_EXTS ('z' - 'a' + 1)
|
|
|
|
unsigned long elf_hwcap __read_mostly;
|
|
|
|
/* Host ISA bitmap */
|
|
static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly;
|
|
|
|
DEFINE_STATIC_KEY_ARRAY_FALSE(riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX);
|
|
EXPORT_SYMBOL(riscv_isa_ext_keys);
|
|
|
|
/**
|
|
* riscv_isa_extension_base() - Get base extension word
|
|
*
|
|
* @isa_bitmap: ISA bitmap to use
|
|
* Return: base extension word as unsigned long value
|
|
*
|
|
* NOTE: If isa_bitmap is NULL then Host ISA bitmap will be used.
|
|
*/
|
|
unsigned long riscv_isa_extension_base(const unsigned long *isa_bitmap)
|
|
{
|
|
if (!isa_bitmap)
|
|
return riscv_isa[0];
|
|
return isa_bitmap[0];
|
|
}
|
|
EXPORT_SYMBOL_GPL(riscv_isa_extension_base);
|
|
|
|
/**
|
|
* __riscv_isa_extension_available() - Check whether given extension
|
|
* is available or not
|
|
*
|
|
* @isa_bitmap: ISA bitmap to use
|
|
* @bit: bit position of the desired extension
|
|
* Return: true or false
|
|
*
|
|
* NOTE: If isa_bitmap is NULL then Host ISA bitmap will be used.
|
|
*/
|
|
bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, int bit)
|
|
{
|
|
const unsigned long *bmap = (isa_bitmap) ? isa_bitmap : riscv_isa;
|
|
|
|
if (bit >= RISCV_ISA_EXT_MAX)
|
|
return false;
|
|
|
|
return test_bit(bit, bmap) ? true : false;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__riscv_isa_extension_available);
|
|
|
|
void __init riscv_fill_hwcap(void)
|
|
{
|
|
struct device_node *node;
|
|
const char *isa;
|
|
char print_str[NUM_ALPHA_EXTS + 1];
|
|
int i, j, rc;
|
|
static unsigned long isa2hwcap[256] = {0};
|
|
unsigned long hartid;
|
|
|
|
isa2hwcap['i'] = isa2hwcap['I'] = COMPAT_HWCAP_ISA_I;
|
|
isa2hwcap['m'] = isa2hwcap['M'] = COMPAT_HWCAP_ISA_M;
|
|
isa2hwcap['a'] = isa2hwcap['A'] = COMPAT_HWCAP_ISA_A;
|
|
isa2hwcap['f'] = isa2hwcap['F'] = COMPAT_HWCAP_ISA_F;
|
|
isa2hwcap['d'] = isa2hwcap['D'] = COMPAT_HWCAP_ISA_D;
|
|
isa2hwcap['c'] = isa2hwcap['C'] = COMPAT_HWCAP_ISA_C;
|
|
|
|
elf_hwcap = 0;
|
|
|
|
bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX);
|
|
|
|
for_each_of_cpu_node(node) {
|
|
unsigned long this_hwcap = 0;
|
|
DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX);
|
|
const char *temp;
|
|
|
|
rc = riscv_of_processor_hartid(node, &hartid);
|
|
if (rc < 0)
|
|
continue;
|
|
|
|
if (of_property_read_string(node, "riscv,isa", &isa)) {
|
|
pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
|
|
continue;
|
|
}
|
|
|
|
temp = isa;
|
|
#if IS_ENABLED(CONFIG_32BIT)
|
|
if (!strncmp(isa, "rv32", 4))
|
|
isa += 4;
|
|
#elif IS_ENABLED(CONFIG_64BIT)
|
|
if (!strncmp(isa, "rv64", 4))
|
|
isa += 4;
|
|
#endif
|
|
/* The riscv,isa DT property must start with rv64 or rv32 */
|
|
if (temp == isa)
|
|
continue;
|
|
bitmap_zero(this_isa, RISCV_ISA_EXT_MAX);
|
|
for (; *isa; ++isa) {
|
|
const char *ext = isa++;
|
|
const char *ext_end = isa;
|
|
bool ext_long = false, ext_err = false;
|
|
|
|
switch (*ext) {
|
|
case 's':
|
|
/**
|
|
* Workaround for invalid single-letter 's' & 'u'(QEMU).
|
|
* No need to set the bit in riscv_isa as 's' & 'u' are
|
|
* not valid ISA extensions. It works until multi-letter
|
|
* extension starting with "Su" appears.
|
|
*/
|
|
if (ext[-1] != '_' && ext[1] == 'u') {
|
|
++isa;
|
|
ext_err = true;
|
|
break;
|
|
}
|
|
fallthrough;
|
|
case 'x':
|
|
case 'z':
|
|
ext_long = true;
|
|
/* Multi-letter extension must be delimited */
|
|
for (; *isa && *isa != '_'; ++isa)
|
|
if (unlikely(!islower(*isa)
|
|
&& !isdigit(*isa)))
|
|
ext_err = true;
|
|
/* Parse backwards */
|
|
ext_end = isa;
|
|
if (unlikely(ext_err))
|
|
break;
|
|
if (!isdigit(ext_end[-1]))
|
|
break;
|
|
/* Skip the minor version */
|
|
while (isdigit(*--ext_end))
|
|
;
|
|
if (ext_end[0] != 'p'
|
|
|| !isdigit(ext_end[-1])) {
|
|
/* Advance it to offset the pre-decrement */
|
|
++ext_end;
|
|
break;
|
|
}
|
|
/* Skip the major version */
|
|
while (isdigit(*--ext_end))
|
|
;
|
|
++ext_end;
|
|
break;
|
|
default:
|
|
if (unlikely(!islower(*ext))) {
|
|
ext_err = true;
|
|
break;
|
|
}
|
|
/* Find next extension */
|
|
if (!isdigit(*isa))
|
|
break;
|
|
/* Skip the minor version */
|
|
while (isdigit(*++isa))
|
|
;
|
|
if (*isa != 'p')
|
|
break;
|
|
if (!isdigit(*++isa)) {
|
|
--isa;
|
|
break;
|
|
}
|
|
/* Skip the major version */
|
|
while (isdigit(*++isa))
|
|
;
|
|
break;
|
|
}
|
|
if (*isa != '_')
|
|
--isa;
|
|
|
|
#define SET_ISA_EXT_MAP(name, bit) \
|
|
do { \
|
|
if ((ext_end - ext == sizeof(name) - 1) && \
|
|
!memcmp(ext, name, sizeof(name) - 1)) \
|
|
set_bit(bit, this_isa); \
|
|
} while (false) \
|
|
|
|
if (unlikely(ext_err))
|
|
continue;
|
|
if (!ext_long) {
|
|
this_hwcap |= isa2hwcap[(unsigned char)(*ext)];
|
|
set_bit(*ext - 'a', this_isa);
|
|
} else {
|
|
SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF);
|
|
SET_ISA_EXT_MAP("svpbmt", RISCV_ISA_EXT_SVPBMT);
|
|
SET_ISA_EXT_MAP("zicbom", RISCV_ISA_EXT_ZICBOM);
|
|
SET_ISA_EXT_MAP("zihintpause", RISCV_ISA_EXT_ZIHINTPAUSE);
|
|
SET_ISA_EXT_MAP("sstc", RISCV_ISA_EXT_SSTC);
|
|
SET_ISA_EXT_MAP("svinval", RISCV_ISA_EXT_SVINVAL);
|
|
}
|
|
#undef SET_ISA_EXT_MAP
|
|
}
|
|
|
|
/*
|
|
* All "okay" hart should have same isa. Set HWCAP based on
|
|
* common capabilities of every "okay" hart, in case they don't
|
|
* have.
|
|
*/
|
|
if (elf_hwcap)
|
|
elf_hwcap &= this_hwcap;
|
|
else
|
|
elf_hwcap = this_hwcap;
|
|
|
|
if (bitmap_empty(riscv_isa, RISCV_ISA_EXT_MAX))
|
|
bitmap_copy(riscv_isa, this_isa, RISCV_ISA_EXT_MAX);
|
|
else
|
|
bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX);
|
|
}
|
|
|
|
/* We don't support systems with F but without D, so mask those out
|
|
* here. */
|
|
if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) {
|
|
pr_info("This kernel does not support systems with F but not D\n");
|
|
elf_hwcap &= ~COMPAT_HWCAP_ISA_F;
|
|
}
|
|
|
|
memset(print_str, 0, sizeof(print_str));
|
|
for (i = 0, j = 0; i < NUM_ALPHA_EXTS; i++)
|
|
if (riscv_isa[0] & BIT_MASK(i))
|
|
print_str[j++] = (char)('a' + i);
|
|
pr_info("riscv: base ISA extensions %s\n", print_str);
|
|
|
|
memset(print_str, 0, sizeof(print_str));
|
|
for (i = 0, j = 0; i < NUM_ALPHA_EXTS; i++)
|
|
if (elf_hwcap & BIT_MASK(i))
|
|
print_str[j++] = (char)('a' + i);
|
|
pr_info("riscv: ELF capabilities %s\n", print_str);
|
|
|
|
for_each_set_bit(i, riscv_isa, RISCV_ISA_EXT_MAX) {
|
|
j = riscv_isa_ext2key(i);
|
|
if (j >= 0)
|
|
static_branch_enable(&riscv_isa_ext_keys[j]);
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_RISCV_ALTERNATIVE
|
|
static bool __init_or_module cpufeature_probe_svpbmt(unsigned int stage)
|
|
{
|
|
if (!IS_ENABLED(CONFIG_RISCV_ISA_SVPBMT))
|
|
return false;
|
|
|
|
if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
|
|
return false;
|
|
|
|
return riscv_isa_extension_available(NULL, SVPBMT);
|
|
}
|
|
|
|
static bool __init_or_module cpufeature_probe_zicbom(unsigned int stage)
|
|
{
|
|
if (!IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM))
|
|
return false;
|
|
|
|
if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
|
|
return false;
|
|
|
|
if (!riscv_isa_extension_available(NULL, ZICBOM))
|
|
return false;
|
|
|
|
riscv_noncoherent_supported();
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* Probe presence of individual extensions.
|
|
*
|
|
* This code may also be executed before kernel relocation, so we cannot use
|
|
* addresses generated by the address-of operator as they won't be valid in
|
|
* this context.
|
|
*/
|
|
static u32 __init_or_module cpufeature_probe(unsigned int stage)
|
|
{
|
|
u32 cpu_req_feature = 0;
|
|
|
|
if (cpufeature_probe_svpbmt(stage))
|
|
cpu_req_feature |= BIT(CPUFEATURE_SVPBMT);
|
|
|
|
if (cpufeature_probe_zicbom(stage))
|
|
cpu_req_feature |= BIT(CPUFEATURE_ZICBOM);
|
|
|
|
return cpu_req_feature;
|
|
}
|
|
|
|
void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin,
|
|
struct alt_entry *end,
|
|
unsigned int stage)
|
|
{
|
|
u32 cpu_req_feature = cpufeature_probe(stage);
|
|
struct alt_entry *alt;
|
|
u32 tmp;
|
|
|
|
for (alt = begin; alt < end; alt++) {
|
|
if (alt->vendor_id != 0)
|
|
continue;
|
|
if (alt->errata_id >= CPUFEATURE_NUMBER) {
|
|
WARN(1, "This feature id:%d is not in kernel cpufeature list",
|
|
alt->errata_id);
|
|
continue;
|
|
}
|
|
|
|
tmp = (1U << alt->errata_id);
|
|
if (cpu_req_feature & tmp)
|
|
patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len);
|
|
}
|
|
}
|
|
#endif
|