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

Commit 2597dde0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-33c4c2a6' into 4.9" into msm-4.9

parents 42fd5b2a 2bffbf18

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 28

SUBLEVEL = 29

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/kvm/psci.c

+7 −1
Original line number Diff line number Diff line
@@ -208,9 +208,10 @@ int kvm_psci_version(struct kvm_vcpu *vcpu) 


static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)

{

	int ret = 1;

	struct kvm *kvm = vcpu->kvm;

	unsigned long psci_fn = vcpu_get_reg(vcpu, 0) & ~((u32) 0);

	unsigned long val;

	int ret = 1;



	switch (psci_fn) {

	case PSCI_0_2_FN_PSCI_VERSION:
@@ -230,7 +231,9 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) 
		break;

	case PSCI_0_2_FN_CPU_ON:

	case PSCI_0_2_FN64_CPU_ON:

		mutex_lock(&kvm->lock);

		val = kvm_psci_vcpu_on(vcpu);

		mutex_unlock(&kvm->lock);

		break;

	case PSCI_0_2_FN_AFFINITY_INFO:

	case PSCI_0_2_FN64_AFFINITY_INFO:
@@ -279,6 +282,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) 


static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;

	unsigned long psci_fn = vcpu_get_reg(vcpu, 0) & ~((u32) 0);

	unsigned long val;
@@ -288,7 +292,9 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) 
		val = PSCI_RET_SUCCESS;

		break;

	case KVM_PSCI_FN_CPU_ON:

		mutex_lock(&kvm->lock);

		val = kvm_psci_vcpu_on(vcpu);

		mutex_unlock(&kvm->lock);

		break;

	default:

		val = PSCI_RET_NOT_SUPPORTED;

arch/arm64/include/asm/kvm_emulate.h

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ static inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_FSC_TYPE;

}



static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)

{

	u32 esr = kvm_vcpu_get_hsr(vcpu);

	return (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;

}



static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;

arch/arm64/kvm/sys_regs.c

+4 −4
Original line number Diff line number Diff line
@@ -1573,8 +1573,8 @@ static int kvm_handle_cp_64(struct kvm_vcpu *vcpu, 
{

	struct sys_reg_params params;

	u32 hsr = kvm_vcpu_get_hsr(vcpu);

	int Rt = (hsr >> 5) & 0xf;

	int Rt2 = (hsr >> 10) & 0xf;

	int Rt = kvm_vcpu_sys_get_rt(vcpu);

	int Rt2 = (hsr >> 10) & 0x1f;



	params.is_aarch32 = true;

	params.is_32bit = false;
@@ -1625,7 +1625,7 @@ static int kvm_handle_cp_32(struct kvm_vcpu *vcpu, 
{

	struct sys_reg_params params;

	u32 hsr = kvm_vcpu_get_hsr(vcpu);

	int Rt  = (hsr >> 5) & 0xf;

	int Rt  = kvm_vcpu_sys_get_rt(vcpu);



	params.is_aarch32 = true;

	params.is_32bit = true;
@@ -1740,7 +1740,7 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu, struct kvm_run *run) 
{

	struct sys_reg_params params;

	unsigned long esr = kvm_vcpu_get_hsr(vcpu);

	int Rt = (esr >> 5) & 0x1f;

	int Rt = kvm_vcpu_sys_get_rt(vcpu);

	int ret;



	trace_kvm_handle_sys_reg(esr);

arch/powerpc/kernel/nvram_64.c

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type, 
static struct pstore_info nvram_pstore_info = {

	.owner = THIS_MODULE,

	.name = "nvram",

	.flags = PSTORE_FLAGS_DMESG,

	.open = nvram_pstore_open,

	.read = nvram_pstore_read,

	.write = nvram_pstore_write,