From: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Oct 2014 23:38:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/kvm' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aea5b31b7df7526dcb07000a50d35f3df3e6c283;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/kvm' into linux-linaro-lsk

Conflicts:
	arch/arm/kvm/arm.c
	arch/arm64/Makefile
	arch/arm64/kernel/asm-offsets.c
	virt/kvm/kvm_main.c
---

aea5b31b7df7526dcb07000a50d35f3df3e6c283
diff --cc arch/arm/kernel/perf_event_cpu.c
index 0b48a38e3cf4,0e9609657c79..e0665b871f5b
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@@ -240,48 -205,37 +238,40 @@@ static int probe_current_pmu(struct arm
  
  	pr_info("probing PMU on CPU %d\n", cpu);
  
+ 	switch (read_cpuid_part()) {
  	/* ARM Ltd CPUs. */
- 	if (implementor == ARM_CPU_IMP_ARM) {
- 		switch (part_number) {
- 		case ARM_CPU_PART_ARM1136:
- 		case ARM_CPU_PART_ARM1156:
- 		case ARM_CPU_PART_ARM1176:
- 			ret = armv6pmu_init(pmu);
- 			break;
- 		case ARM_CPU_PART_ARM11MPCORE:
- 			ret = armv6mpcore_pmu_init(pmu);
- 			break;
- 		case ARM_CPU_PART_CORTEX_A8:
- 			ret = armv7_a8_pmu_init(pmu);
- 			break;
- 		case ARM_CPU_PART_CORTEX_A9:
- 			ret = armv7_a9_pmu_init(pmu);
- 			break;
- 		case ARM_CPU_PART_CORTEX_A5:
- 			ret = armv7_a5_pmu_init(pmu);
- 			break;
- 		case ARM_CPU_PART_CORTEX_A15:
- 			ret = armv7_a15_pmu_init(pmu);
- 			break;
- 		case ARM_CPU_PART_CORTEX_A7:
- 			ret = armv7_a7_pmu_init(pmu);
- 			break;
- 		}
- 	/* Intel CPUs [xscale]. */
- 	} else if (implementor == ARM_CPU_IMP_INTEL) {
- 		switch (xscale_cpu_arch_version()) {
- 		case ARM_CPU_XSCALE_ARCH_V1:
- 			ret = xscale1pmu_init(pmu);
- 			break;
- 		case ARM_CPU_XSCALE_ARCH_V2:
- 			ret = xscale2pmu_init(pmu);
- 			break;
+ 	case ARM_CPU_PART_ARM1136:
+ 	case ARM_CPU_PART_ARM1156:
+ 	case ARM_CPU_PART_ARM1176:
+ 		ret = armv6pmu_init(pmu);
+ 		break;
+ 	case ARM_CPU_PART_ARM11MPCORE:
+ 		ret = armv6mpcore_pmu_init(pmu);
+ 		break;
+ 	case ARM_CPU_PART_CORTEX_A8:
+ 		ret = armv7_a8_pmu_init(pmu);
+ 		break;
+ 	case ARM_CPU_PART_CORTEX_A9:
+ 		ret = armv7_a9_pmu_init(pmu);
+ 		break;
+ 
+ 	default:
+ 		if (read_cpuid_implementor() == ARM_CPU_IMP_INTEL) {
+ 			switch (xscale_cpu_arch_version()) {
+ 			case ARM_CPU_XSCALE_ARCH_V1:
+ 				ret = xscale1pmu_init(pmu);
+ 				break;
+ 			case ARM_CPU_XSCALE_ARCH_V2:
+ 				ret = xscale2pmu_init(pmu);
+ 				break;
+ 			}
  		}
+ 		break;
  	}
  
 +	/* assume PMU support all the CPUs in this case */
 +	cpumask_setall(&pmu->valid_cpus);
 +
  	put_cpu();
  	return ret;
  }
diff --cc arch/arm64/Kconfig
index e0a9b48b02c3,de9eeb43f622..279594b83781
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -439,10 -273,10 +439,12 @@@ source "net/Kconfig
  
  source "drivers/Kconfig"
  
 +source "drivers/firmware/Kconfig"
 +
  source "fs/Kconfig"
  
+ source "arch/arm64/kvm/Kconfig"
+ 
  source "arch/arm64/Kconfig.debug"
  
  source "security/Kconfig"
diff --cc arch/arm64/Makefile
index 8f63c8a21b7e,7ab6b358cc35..8a311839e2d7
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -43,7 -37,7 +43,8 @@@ TEXT_OFFSET := 0x0008000
  export	TEXT_OFFSET GZFLAGS
  
  core-y		+= arch/arm64/kernel/ arch/arm64/mm/
+ core-$(CONFIG_KVM) += arch/arm64/kvm/
 +core-$(CONFIG_CRYPTO) += arch/arm64/crypto/
  libs-y		:= arch/arm64/lib/ $(libs-y)
  libs-y		+= $(LIBGCC)
  
diff --cc include/linux/irqchip/arm-gic.h
index 13439bac2967,4483adb61c88..1f004b16641e
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@@ -17,9 -17,10 +17,12 @@@
  #define GIC_CPU_EOI			0x10
  #define GIC_CPU_RUNNINGPRI		0x14
  #define GIC_CPU_HIGHPRI			0x18
+ #define GIC_CPU_ALIAS_BINPOINT		0x1c
+ #define GIC_CPU_ACTIVEPRIO		0xd0
+ #define GIC_CPU_IDENT			0xfc
  
 +#define GICC_IAR_INT_ID_MASK		0x3ff
 +
  #define GIC_DIST_CTRL			0x000
  #define GIC_DIST_CTR			0x004
  #define GIC_DIST_IGROUP			0x080
@@@ -80,17 -85,6 +92,16 @@@ static inline void gic_init(unsigned in
  	gic_init_bases(nr, start, dist, cpu, 0, NULL);
  }
  
 -#endif /* __ASSEMBLY */
 +void gic_send_sgi(unsigned int cpu_id, unsigned int irq);
 +int gic_get_cpu_id(unsigned int cpu);
 +void gic_migrate_target(unsigned int new_cpu_id);
 +unsigned long gic_get_sgir_physaddr(void);
  
- #endif /* __ASSEMBLY */
- 
 +extern const struct irq_domain_ops *gic_routable_irq_domain_ops;
 +static inline void __init register_routable_domain_ops
 +					(const struct irq_domain_ops *ops)
 +{
 +	gic_routable_irq_domain_ops = ops;
 +}
++#endif /* __ASSEMBLY */
  #endif