From: Oliver Upton <oliver.upton@linux.dev>
Date: Mon, 13 Feb 2023 23:32:59 +0000 (+0000)
Subject: Merge branch kvm-arm64/misc into kvmarm/next
X-Git-Tag: v6.6.7~3413^2~2^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=022d3f0800682f84e1437ad2a2f6fb85fc94abf6;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch kvm-arm64/misc into kvmarm/next

* kvm-arm64/misc:
  : Miscellaneous updates
  :
  :  - Convert CPACR_EL1_TTA to the new, generated system register
  :    definitions.
  :
  :  - Serialize toggling CPACR_EL1.SMEN to avoid unexpected exceptions when
  :    accessing SVCR in the host.
  :
  :  - Avoid quiescing the guest if a vCPU accesses its own redistributor's
  :    SGIs/PPIs, eliminating the need to IPI. Largely an optimization for
  :    nested virtualization, as the L1 accesses the affected registers
  :    rather often.
  :
  :  - Conversion to kstrtobool()
  :
  :  - Common definition of INVALID_GPA across architectures
  :
  :  - Enable CONFIG_USERFAULTFD for CI runs of KVM selftests
  KVM: arm64: Fix non-kerneldoc comments
  KVM: selftests: Enable USERFAULTFD
  KVM: selftests: Remove redundant setbuf()
  arm64/sysreg: clean up some inconsistent indenting
  KVM: MMU: Make the definition of 'INVALID_GPA' common
  KVM: arm64: vgic-v3: Use kstrtobool() instead of strtobool()
  KVM: arm64: vgic-v3: Limit IPI-ing when accessing GICR_{C,S}ACTIVER0
  KVM: arm64: Synchronize SMEN on vcpu schedule out
  KVM: arm64: Kill CPACR_EL1_TTA definition

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---

022d3f0800682f84e1437ad2a2f6fb85fc94abf6
diff --cc arch/arm64/kvm/arm.c
index 69d9995,6b59d89..64da2c2
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -1922,10 -1909,8 +1922,8 @@@ static int __init kvm_hyp_init_protecti
  	return 0;
  }
  
- /**
-  * Inits Hyp-mode on all online CPUs
-  */
+ /* Inits Hyp-mode on all online CPUs */
 -static int init_hyp_mode(void)
 +static int __init init_hyp_mode(void)
  {
  	u32 hyp_va_bits;
  	int cpu;
@@@ -2200,10 -2185,8 +2198,8 @@@ void kvm_arch_irq_bypass_start(struct i
  	kvm_arm_resume_guest(irqfd->kvm);
  }
  
- /**
-  * Initialize Hyp-mode and memory mappings on all CPUs.
-  */
+ /* Initialize Hyp-mode and memory mappings on all CPUs */
 -int kvm_arch_init(void *opaque)
 +static __init int kvm_arm_init(void)
  {
  	int err;
  	bool in_hyp_mode;
diff --cc arch/arm64/kvm/sys_regs.c
index 6d2e6e4,d852e4c..0bc7df5
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@@ -79,9 -78,12 +79,9 @@@ void vcpu_write_sys_reg(struct kvm_vcp
  	    __vcpu_write_sys_reg_to_cpu(val, reg))
  		return;
  
- 	 __vcpu_sys_reg(vcpu, reg) = val;
+ 	__vcpu_sys_reg(vcpu, reg) = val;
  }
  
 -/* 3 bits per cache level, as per CLIDR, but non-existent caches always 0 */
 -static u32 cache_levels;
 -
  /* CSSELR values; used to index KVM_REG_ARM_DEMUX_ID_CCSIDR */
  #define CSSELR_MAX 14