Commit 5a61b7a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1a6436f3 417166dd

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

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
	model = "Microchip PolarFire-SoC Icicle Kit";

	compatible = "microchip,mpfs-icicle-kit";



	aliases {

		ethernet0 = &emac1;

	};



	chosen {

		stdout-path = &serial0;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ 
			reg = <0x0 0x20112000 0x0 0x2000>;

			interrupt-parent = <&plic>;

			interrupts = <70 71 72 73>;

			mac-address = [00 00 00 00 00 00];

			local-mac-address = [00 00 00 00 00 00];

			clocks = <&clkcfg 5>, <&clkcfg 2>;

			status = "disabled";

			clock-names = "pclk", "hclk";

arch/riscv/kernel/ptrace.c

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/ptrace.h>

#include <asm/syscall.h>

#include <asm/thread_info.h>

#include <asm/switch_to.h>

#include <linux/audit.h>

#include <linux/ptrace.h>

#include <linux/elf.h>
@@ -56,6 +57,9 @@ static int riscv_fpr_get(struct task_struct *target, 
{

	struct __riscv_d_ext_state *fstate = &target->thread.fstate;



	if (target == current)

		fstate_save(current, task_pt_regs(current));



	membuf_write(&to, fstate, offsetof(struct __riscv_d_ext_state, fcsr));

	membuf_store(&to, fstate->fcsr);

	return membuf_zero(&to, 4);	// explicitly pad