Commit 049e03d7 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents 640f592e 8979da25

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 93

SUBLEVEL = 94

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/include/asm/kvm_host.h

+13 −0
Original line number Diff line number Diff line
@@ -539,7 +539,20 @@ struct kvm_vcpu_arch { 
	struct kvm_mmu_memory_cache mmu_page_cache;

	struct kvm_mmu_memory_cache mmu_page_header_cache;



	/*

	 * QEMU userspace and the guest each have their own FPU state.

	 * In vcpu_run, we switch between the user and guest FPU contexts.

	 * While running a VCPU, the VCPU thread will have the guest FPU

	 * context.

	 *

	 * Note that while the PKRU state lives inside the fpu registers,

	 * it is switched out separately at VMENTER and VMEXIT time. The

	 * "guest_fpu" state here contains the guest FPU context, with the

	 * host PRKU bits.

	 */

	struct fpu user_fpu;

	struct fpu guest_fpu;



	u64 xcr0;

	u64 guest_supported_xcr0;

	u32 guest_xstate_size;

arch/x86/kernel/cpu/bugs.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = 
static enum spectre_v2_user_mitigation spectre_v2_user __ro_after_init =

	SPECTRE_V2_USER_NONE;



#ifdef RETPOLINE

#ifdef CONFIG_RETPOLINE

static bool spectre_v2_bad_module;



bool retpoline_module_ok(bool has_retpoline)

arch/x86/kvm/x86.c

+13 −21
Original line number Diff line number Diff line
@@ -3020,7 +3020,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
	srcu_read_unlock(&vcpu->kvm->srcu, idx);

	pagefault_enable();

	kvm_x86_ops->vcpu_put(vcpu);

	kvm_put_guest_fpu(vcpu);

	vcpu->arch.last_host_tsc = rdtsc();

	/*

	 * If userspace has set any breakpoints or watchpoints, dr6 is restored
@@ -5377,13 +5376,10 @@ static void emulator_halt(struct x86_emulate_ctxt *ctxt) 


static void emulator_get_fpu(struct x86_emulate_ctxt *ctxt)

{

	preempt_disable();

	kvm_load_guest_fpu(emul_to_vcpu(ctxt));

}



static void emulator_put_fpu(struct x86_emulate_ctxt *ctxt)

{

	preempt_enable();

}



static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
@@ -7083,7 +7079,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
	preempt_disable();



	kvm_x86_ops->prepare_guest_switch(vcpu);

	kvm_load_guest_fpu(vcpu);



	/*

	 * Disable IRQs before setting IN_GUEST_MODE.  Posted interrupt
@@ -7428,12 +7423,14 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		}

	}



	kvm_load_guest_fpu(vcpu);



	if (unlikely(vcpu->arch.complete_userspace_io)) {

		int (*cui)(struct kvm_vcpu *) = vcpu->arch.complete_userspace_io;

		vcpu->arch.complete_userspace_io = NULL;

		r = cui(vcpu);

		if (r <= 0)

			goto out;

			goto out_fpu;

	} else

		WARN_ON(vcpu->arch.pio.count || vcpu->mmio_needed);
@@ -7442,6 +7439,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	else

		r = vcpu_run(vcpu);



out_fpu:

	kvm_put_guest_fpu(vcpu);

out:

	kvm_put_guest_fpu(vcpu);

	post_kvm_run_save(vcpu);
@@ -7865,32 +7864,25 @@ static void fx_init(struct kvm_vcpu *vcpu) 
	vcpu->arch.cr0 |= X86_CR0_ET;

}



/* Swap (qemu) user FPU context for the guest FPU context. */

void kvm_load_guest_fpu(struct kvm_vcpu *vcpu)

{

	if (vcpu->guest_fpu_loaded)

		return;



	/*

	 * Restore all possible states in the guest,

	 * and assume host would use all available bits.

	 * Guest xcr0 would be loaded later.

	 */

	vcpu->guest_fpu_loaded = 1;

	__kernel_fpu_begin();

	preempt_disable();

	copy_fpregs_to_fpstate(&vcpu->arch.user_fpu);

	/* PKRU is separately restored in kvm_x86_ops->run.  */

	__copy_kernel_to_fpregs(&vcpu->arch.guest_fpu.state,

				~XFEATURE_MASK_PKRU);

	preempt_enable();

	trace_kvm_fpu(1);

}



/* When vcpu_run ends, restore user space FPU context. */

void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)

{

	if (!vcpu->guest_fpu_loaded)

		return;



	vcpu->guest_fpu_loaded = 0;

	preempt_disable();

	copy_fpregs_to_fpstate(&vcpu->arch.guest_fpu);

	__kernel_fpu_end();

	copy_kernel_to_fpregs(&vcpu->arch.user_fpu.state);

	preempt_enable();

	++vcpu->stat.fpu_reload;

	trace_kvm_fpu(0);

}

drivers/acpi/pmic/intel_pmic_xpower.c

+33 −8
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ 
#define GPI1_LDO_ON		(3 << 0)

#define GPI1_LDO_OFF		(4 << 0)



#define AXP288_ADC_TS_PIN_GPADC	0xf2

#define AXP288_ADC_TS_PIN_ON	0xf3

#define AXP288_ADC_TS_CURRENT_ON_OFF_MASK		GENMASK(1, 0)

#define AXP288_ADC_TS_CURRENT_OFF			(0 << 0)

#define AXP288_ADC_TS_CURRENT_ON_WHEN_CHARGING		(1 << 0)

#define AXP288_ADC_TS_CURRENT_ON_ONDEMAND		(2 << 0)

#define AXP288_ADC_TS_CURRENT_ON			(3 << 0)



static struct pmic_table power_table[] = {

	{
@@ -211,22 +214,44 @@ static int intel_xpower_pmic_update_power(struct regmap *regmap, int reg, 
 */

static int intel_xpower_pmic_get_raw_temp(struct regmap *regmap, int reg)

{

	int ret, adc_ts_pin_ctrl;

	u8 buf[2];

	int ret;



	ret = regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL,

			   AXP288_ADC_TS_PIN_GPADC);

	/*

	 * The current-source used for the battery temp-sensor (TS) is shared

	 * with the GPADC. For proper fuel-gauge and charger operation the TS

	 * current-source needs to be permanently on. But to read the GPADC we

	 * need to temporary switch the TS current-source to ondemand, so that

	 * the GPADC can use it, otherwise we will always read an all 0 value.

	 *

	 * Note that the switching from on to on-ondemand is not necessary

	 * when the TS current-source is off (this happens on devices which

	 * do not use the TS-pin).

	 */

	ret = regmap_read(regmap, AXP288_ADC_TS_PIN_CTRL, &adc_ts_pin_ctrl);

	if (ret)

		return ret;



	if (adc_ts_pin_ctrl & AXP288_ADC_TS_CURRENT_ON_OFF_MASK) {

		ret = regmap_update_bits(regmap, AXP288_ADC_TS_PIN_CTRL,

					 AXP288_ADC_TS_CURRENT_ON_OFF_MASK,

					 AXP288_ADC_TS_CURRENT_ON_ONDEMAND);

		if (ret)

			return ret;



	/* After switching to the GPADC pin give things some time to settle */

		/* Wait a bit after switching the current-source */

		usleep_range(6000, 10000);

	}



	ret = regmap_bulk_read(regmap, AXP288_GP_ADC_H, buf, 2);

	if (ret == 0)

		ret = (buf[0] << 4) + ((buf[1] >> 4) & 0x0f);



	regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, AXP288_ADC_TS_PIN_ON);

	if (adc_ts_pin_ctrl & AXP288_ADC_TS_CURRENT_ON_OFF_MASK) {

		regmap_update_bits(regmap, AXP288_ADC_TS_PIN_CTRL,

				   AXP288_ADC_TS_CURRENT_ON_OFF_MASK,

				   AXP288_ADC_TS_CURRENT_ON);

	}



	return ret;

}