Commit 373adb73 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv/for-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Paul Walmsley:
 "Two fixes for RISC-V:

   - Clear FP registers during boot when FP support is present, rather
     than when they aren't present

   - Move the header files associated with the SiFive L2 cache
     controller to drivers/soc (where the code was recently moved)"

* tag 'riscv/for-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fixup obvious bug for fp-regs reset
  riscv: move sifive_l2_cache.h to include/soc
parents 040a3c33 dc6fcba7

arch/riscv/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ ENTRY(reset_regs) 
#ifdef CONFIG_FPU

	csrr	t0, CSR_MISA

	andi	t0, t0, (COMPAT_HWCAP_ISA_F | COMPAT_HWCAP_ISA_D)

	bnez	t0, .Lreset_regs_done

	beqz	t0, .Lreset_regs_done



	li	t1, SR_FS

	csrs	CSR_STATUS, t1

drivers/edac/sifive_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/edac.h>

#include <linux/platform_device.h>

#include "edac_module.h"

#include <asm/sifive_l2_cache.h>

#include <soc/sifive/sifive_l2_cache.h>



#define DRVNAME "sifive_edac"

drivers/soc/sifive/sifive_l2_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/interrupt.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <asm/sifive_l2_cache.h>

#include <soc/sifive/sifive_l2_cache.h>



#define SIFIVE_L2_DIRECCFIX_LOW 0x100

#define SIFIVE_L2_DIRECCFIX_HIGH 0x104

arch/riscv/include/asm/sifive_l2_cache.h→include/soc/sifive/sifive_l2_cache.h

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
 *

 */



#ifndef _ASM_RISCV_SIFIVE_L2_CACHE_H

#define _ASM_RISCV_SIFIVE_L2_CACHE_H

#ifndef __SOC_SIFIVE_L2_CACHE_H

#define __SOC_SIFIVE_L2_CACHE_H



extern int register_sifive_l2_error_notifier(struct notifier_block *nb);

extern int unregister_sifive_l2_error_notifier(struct notifier_block *nb);
@@ -13,4 +13,4 @@ extern int unregister_sifive_l2_error_notifier(struct notifier_block *nb); 
#define SIFIVE_L2_ERR_TYPE_CE 0

#define SIFIVE_L2_ERR_TYPE_UE 1



#endif /* _ASM_RISCV_SIFIVE_L2_CACHE_H */
 
#endif /* __SOC_SIFIVE_L2_CACHE_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE