Skip to content

Commit 5a61b7a

Browse files
committed
Merge tag 'riscv-for-linus-5.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt: - device tree updates for the Microsemi Polarfire development kit that fix some mismatches between the u-boot and Linux enternet entries - ensure that the F register state is correctly reflected in core dumps * tag 'riscv-for-linus-5.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: dts: microchip: Add ethernet0 to the aliases node riscv: dts: microchip: Use 'local-mac-address' for emac1 riscv: Ensure the value of FP registers in the core dump file is up to date
2 parents 1a6436f + 417166d commit 5a61b7a

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
model = "Microchip PolarFire-SoC Icicle Kit";
1515
compatible = "microchip,mpfs-icicle-kit";
1616

17+
aliases {
18+
ethernet0 = &emac1;
19+
};
20+
1721
chosen {
1822
stdout-path = &serial0;
1923
};

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
reg = <0x0 0x20112000 0x0 0x2000>;
318318
interrupt-parent = <&plic>;
319319
interrupts = <70 71 72 73>;
320-
mac-address = [00 00 00 00 00 00];
320+
local-mac-address = [00 00 00 00 00 00];
321321
clocks = <&clkcfg 5>, <&clkcfg 2>;
322322
status = "disabled";
323323
clock-names = "pclk", "hclk";

arch/riscv/kernel/ptrace.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <asm/ptrace.h>
1111
#include <asm/syscall.h>
1212
#include <asm/thread_info.h>
13+
#include <asm/switch_to.h>
1314
#include <linux/audit.h>
1415
#include <linux/ptrace.h>
1516
#include <linux/elf.h>
@@ -56,6 +57,9 @@ static int riscv_fpr_get(struct task_struct *target,
5657
{
5758
struct __riscv_d_ext_state *fstate = &target->thread.fstate;
5859

60+
if (target == current)
61+
fstate_save(current, task_pt_regs(current));
62+
5963
membuf_write(&to, fstate, offsetof(struct __riscv_d_ext_state, fcsr));
6064
membuf_store(&to, fstate->fcsr);
6165
return membuf_zero(&to, 4); // explicitly pad

0 commit comments

Comments
 (0)