History

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 ...

Linus Torvalds committed 4 years ago

Commit 49857492 parents 70609c1 ab0c23b41 files · +968 −379Browse files

Showing the changes to include (2 of 41 files). Show all

Unified · Split

2 files
  1. include/soc/sifive/sifive_ccache.h +16 −0
  2. include/soc/sifive/sifive_l2_cache.h +0 −16
include/soc/sifive/sifive_ccache.h+16−0
@@ -0,0 +1,16 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
2+/*
3+ * SiFive Composable Cache Controller header file
4+ *
5+ */
6+
7+#ifndef __SOC_SIFIVE_CCACHE_H
8+#define __SOC_SIFIVE_CCACHE_H
9+
10+extern int register_sifive_ccache_error_notifier(struct notifier_block *nb);
11+extern int unregister_sifive_ccache_error_notifier(struct notifier_block *nb);
12+
13+#define SIFIVE_CCACHE_ERR_TYPE_CE 0
14+#define SIFIVE_CCACHE_ERR_TYPE_UE 1
15+
16+#endif /* __SOC_SIFIVE_CCACHE_H */
include/soc/sifive/sifive_l2_cache.h+0−16
@@ -1,16 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
2−/*
3− * SiFive L2 Cache Controller header file
4− *
5− */
6−
7−#ifndef __SOC_SIFIVE_L2_CACHE_H
8−#define __SOC_SIFIVE_L2_CACHE_H
9−
10−extern int register_sifive_l2_error_notifier(struct notifier_block *nb);
11−extern int unregister_sifive_l2_error_notifier(struct notifier_block *nb);
12−
13−#define SIFIVE_L2_ERR_TYPE_CE 0
14−#define SIFIVE_L2_ERR_TYPE_UE 1
15−
16−#endif /* __SOC_SIFIVE_L2_CACHE_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t