Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b79701b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.188 into android-4.19-stable 



Changes in 4.19.188
	KVM: arm64: Hide system instruction access to Trace registers
	KVM: arm64: Disable guest access to trace filter controls
	drm/imx: imx-ldb: fix out of bounds array access warning
	gfs2: report "already frozen/thawed" errors
	drm/tegra: dc: Don't set PLL clock to 0Hz
	block: only update parent bi_status when bio fail
	riscv,entry: fix misaligned base for excp_vect_table
	net: phy: broadcom: Only advertise EEE for supported modes
	staging: m57621-mmc: delete driver from the tree.
	netfilter: x_tables: fix compat match/target pad out-of-bound write
	driver core: Fix locking bug in deferred_probe_timeout_work_func()
	perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches
	xen/events: fix setting irq affinity
	Linux 4.19.188

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7cc3b26cb1f8929e20fbdb1e6585f888da31d1e6
parents fcab4861 2965db2e

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 187

SUBLEVEL = 188

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
#define CPTR_EL2_DEFAULT	CPTR_EL2_RES1



/* Hyp Debug Configuration Register bits */

#define MDCR_EL2_TTRF		(1 << 19)

#define MDCR_EL2_TPMS		(1 << 14)

#define MDCR_EL2_E2PB_MASK	(UL(0x3))

#define MDCR_EL2_E2PB_SHIFT	(UL(12))

arch/arm64/kernel/cpufeature.c

+0 −1
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = { 
	 * of support.

	 */

	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64DFR0_PMUVER_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_TRACEVER_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_DEBUGVER_SHIFT, 4, 0x6),

	ARM64_FTR_END,

};

arch/arm64/kvm/debug.c

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) 
 *  - Debug ROM Address (MDCR_EL2_TDRA)

 *  - OS related registers (MDCR_EL2_TDOSA)

 *  - Statistical profiler (MDCR_EL2_TPMS/MDCR_EL2_E2PB)

 *  - Self-hosted Trace Filter controls (MDCR_EL2_TTRF)

 *

 * Additionally, KVM only traps guest accesses to the debug registers if

 * the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY
@@ -123,6 +124,7 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) 
	vcpu->arch.mdcr_el2 = __this_cpu_read(mdcr_el2) & MDCR_EL2_HPMN_MASK;

	vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM |

				MDCR_EL2_TPMS |

				MDCR_EL2_TTRF |

				MDCR_EL2_TPMCR |

				MDCR_EL2_TDRA |

				MDCR_EL2_TDOSA);

arch/riscv/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ ENDPROC(__fstate_restore) 




	.section ".rodata"

	.align LGREG

	/* Exception vector table */

ENTRY(excp_vect_table)

	RISCV_PTR do_trap_insn_misaligned