Commit f4c8824c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "An unfortunately large collection of arm64 fixes for -rc5.

  Some of this is absolutely trivial, but the alternatives, vDSO and CPU
  errata workaround fixes are significant. At least people are finding
  and fixing these things, I suppose.

   - Fix workaround for CPU erratum #1418040 to disable the compat vDSO

   - Fix Oops when single-stepping with KGDB

   - Fix memory attributes for hypervisor device mappings at EL2

   - Fix memory leak in PSCI and remove useless variable assignment

   - Fix up some comments and asm labels in our entry code

   - Fix broken register table formatting in our generated html docs

   - Fix missing NULL sentinel in CPU errata workaround list

   - Fix patching of branches in alternative instruction sections"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64/alternatives: don't patch up internal branches
  arm64: Add missing sentinel to erratum_1463225
  arm64: Documentation: Fix broken table in generated HTML
  arm64: kgdb: Fix single-step exception handling oops
  arm64: entry: Tidy up block comments and label numbers
  arm64: Rework ARM_ERRATUM_1414080 handling
  arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040
  arm64: arch_timer: Allow an workaround descriptor to disable compat vdso
  arm64: Introduce a way to disable the 32bit vdso
  arm64: entry: Fix the typo in the comment of el1_dbg()
  drivers/firmware/psci: Assign @err directly in hotplug_tests()
  drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups()
  KVM: arm64: Fix definition of PAGE_HYP_DEVICE
parents e8749d06 5679b281

Documentation/arm64/cpu-feature-registers.rst

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ infrastructure: 




  3) ID_AA64PFR1_EL1 - Processor Feature Register 1



     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+
@@ -181,6 +182,7 @@ infrastructure: 




  4) MIDR_EL1 - Main ID Register



     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+

arch/arm64/include/asm/arch_timer.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct arch_timer_erratum_workaround { 
	u64 (*read_cntvct_el0)(void);

	int (*set_next_event_phys)(unsigned long, struct clock_event_device *);

	int (*set_next_event_virt)(unsigned long, struct clock_event_device *);

	bool disable_compat_vdso;

};



DECLARE_PER_CPU(const struct arch_timer_erratum_workaround *,

arch/arm64/include/asm/pgtable-prot.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern bool arm64_use_ng_mappings; 
#define PAGE_HYP		__pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_HYP_XN)

#define PAGE_HYP_EXEC		__pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY)

#define PAGE_HYP_RO		__pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY | PTE_HYP_XN)

#define PAGE_HYP_DEVICE		__pgprot(PROT_DEVICE_nGnRE | PTE_HYP)

#define PAGE_HYP_DEVICE		__pgprot(_PROT_DEFAULT | PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_HYP | PTE_HYP_XN)



#define PAGE_S2_MEMATTR(attr)						\

	({								\

arch/arm64/include/asm/vdso/clocksource.h

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
#define __ASM_VDSOCLOCKSOURCE_H



#define VDSO_ARCH_CLOCKMODES					\

	VDSO_CLOCKMODE_ARCHTIMER

	/* vdso clocksource for both 32 and 64bit tasks */	\

	VDSO_CLOCKMODE_ARCHTIMER,				\

	/* vdso clocksource for 64bit tasks only */		\

	VDSO_CLOCKMODE_ARCHTIMER_NOCOMPAT



#endif

arch/arm64/include/asm/vdso/compat_gettimeofday.h

+7 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static __always_inline u64 __arch_get_hw_counter(s32 clock_mode) 
	 * update. Return something. Core will do another round and then

	 * see the mode change and fallback to the syscall.

	 */

	if (clock_mode == VDSO_CLOCKMODE_NONE)

	if (clock_mode != VDSO_CLOCKMODE_ARCHTIMER)

		return 0;



	/*
@@ -152,6 +152,12 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void) 
	return ret;

}



static inline bool vdso_clocksource_ok(const struct vdso_data *vd)

{

	return vd->clock_mode == VDSO_CLOCKMODE_ARCHTIMER;

}

#define vdso_clocksource_ok	vdso_clocksource_ok



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_VDSO_GETTIMEOFDAY_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE