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

Commit f797484c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:
 "Two changes:

   - implement various VMWare guest OS improvements/fixes (Alexey
     Makhalov)

   - unexport a spurious export from the intel-mid platform driver
     (Lukas Wunner)"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vmware: Add paravirt sched clock
  x86/vmware: Add basic paravirt ops support
  x86/vmware: Use tsc_khz value for calibrate_cpu()
  x86/platform/intel-mid: Unexport intel_mid_pci_set_power_state()
  x86/vmware: Read tsc_khz only once at boot time
parents 991bc362 80e9a4f2

Documentation/kernel-parameters.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -2750,6 +2750,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	no-kvmapf	[X86,KVM] Disable paravirtualized asynchronous page

	no-kvmapf	[X86,KVM] Disable paravirtualized asynchronous page

			fault handling.

			fault handling.





	no-vmw-sched-clock

			[X86,PV_OPS] Disable paravirtualized VMware scheduler

			clock and use the default one.



	no-steal-acc    [X86,KVM] Disable paravirtualized steal time accounting.

	no-steal-acc    [X86,KVM] Disable paravirtualized steal time accounting.

			steal time is computed, but won't influence scheduler

			steal time is computed, but won't influence scheduler

			behaviour

			behaviour

arch/x86/kernel/cpu/vmware.c

+70 −16
Original line number Original line Diff line number Diff line
@@ -24,11 +24,16 @@ 
#include <linux/dmi.h>

#include <linux/dmi.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/export.h>

#include <linux/export.h>

#include <linux/clocksource.h>

#include <asm/div64.h>

#include <asm/div64.h>

#include <asm/x86_init.h>

#include <asm/x86_init.h>

#include <asm/hypervisor.h>

#include <asm/hypervisor.h>

#include <asm/timer.h>

#include <asm/timer.h>

#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/timer.h>



#undef pr_fmt

#define pr_fmt(fmt)	"vmware: " fmt





#define CPUID_VMWARE_INFO_LEAF	0x40000000

#define CPUID_VMWARE_INFO_LEAF	0x40000000

#define VMWARE_HYPERVISOR_MAGIC	0x564D5868

#define VMWARE_HYPERVISOR_MAGIC	0x564D5868
@@ -48,6 +53,8 @@ 
			"2"(VMWARE_HYPERVISOR_PORT), "3"(UINT_MAX) :	\

			"2"(VMWARE_HYPERVISOR_PORT), "3"(UINT_MAX) :	\

			"memory");

			"memory");





static unsigned long vmware_tsc_khz __ro_after_init;



static inline int __vmware_platform(void)

static inline int __vmware_platform(void)

{

{

	uint32_t eax, ebx, ecx, edx;

	uint32_t eax, ebx, ecx, edx;
@@ -57,35 +64,80 @@ static inline int __vmware_platform(void) 




static unsigned long vmware_get_tsc_khz(void)

static unsigned long vmware_get_tsc_khz(void)

{

{

	uint64_t tsc_hz, lpj;

	return vmware_tsc_khz;

	uint32_t eax, ebx, ecx, edx;

}





	VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);

#ifdef CONFIG_PARAVIRT

static struct cyc2ns_data vmware_cyc2ns __ro_after_init;

static int vmw_sched_clock __initdata = 1;





	tsc_hz = eax | (((uint64_t)ebx) << 32);

static __init int setup_vmw_sched_clock(char *s)

	do_div(tsc_hz, 1000);

{

	BUG_ON(tsc_hz >> 32);

	vmw_sched_clock = 0;

	pr_info("TSC freq read from hypervisor : %lu.%03lu MHz\n",

	return 0;

			 (unsigned long) tsc_hz / 1000,

}

			 (unsigned long) tsc_hz % 1000);

early_param("no-vmw-sched-clock", setup_vmw_sched_clock);





	if (!preset_lpj) {

static unsigned long long vmware_sched_clock(void)

		lpj = ((u64)tsc_hz * 1000);

{

		do_div(lpj, HZ);

	unsigned long long ns;

		preset_lpj = lpj;



	ns = mul_u64_u32_shr(rdtsc(), vmware_cyc2ns.cyc2ns_mul,

			     vmware_cyc2ns.cyc2ns_shift);

	ns -= vmware_cyc2ns.cyc2ns_offset;

	return ns;

}



static void __init vmware_sched_clock_setup(void)

{

	struct cyc2ns_data *d = &vmware_cyc2ns;

	unsigned long long tsc_now = rdtsc();



	clocks_calc_mult_shift(&d->cyc2ns_mul, &d->cyc2ns_shift,

			       vmware_tsc_khz, NSEC_PER_MSEC, 0);

	d->cyc2ns_offset = mul_u64_u32_shr(tsc_now, d->cyc2ns_mul,

					   d->cyc2ns_shift);



	pv_time_ops.sched_clock = vmware_sched_clock;

	pr_info("using sched offset of %llu ns\n", d->cyc2ns_offset);

}

}





	return tsc_hz;

static void __init vmware_paravirt_ops_setup(void)

{

	pv_info.name = "VMware hypervisor";

	pv_cpu_ops.io_delay = paravirt_nop;



	if (vmware_tsc_khz && vmw_sched_clock)

		vmware_sched_clock_setup();

}

}

#else

#define vmware_paravirt_ops_setup() do {} while (0)

#endif





static void __init vmware_platform_setup(void)

static void __init vmware_platform_setup(void)

{

{

	uint32_t eax, ebx, ecx, edx;

	uint32_t eax, ebx, ecx, edx;

	uint64_t lpj, tsc_khz;





	VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);

	VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);





	if (ebx != UINT_MAX) {

	if (ebx != UINT_MAX) {

		lpj = tsc_khz = eax | (((uint64_t)ebx) << 32);

		do_div(tsc_khz, 1000);

		WARN_ON(tsc_khz >> 32);

		pr_info("TSC freq read from hypervisor : %lu.%03lu MHz\n",

			(unsigned long) tsc_khz / 1000,

			(unsigned long) tsc_khz % 1000);



		if (!preset_lpj) {

			do_div(lpj, HZ);

			preset_lpj = lpj;

		}



		vmware_tsc_khz = tsc_khz;

		x86_platform.calibrate_tsc = vmware_get_tsc_khz;

		x86_platform.calibrate_tsc = vmware_get_tsc_khz;

		x86_platform.calibrate_cpu = vmware_get_tsc_khz;



#ifdef CONFIG_X86_LOCAL_APIC

#ifdef CONFIG_X86_LOCAL_APIC

		/* Skip lapic calibration since we know the bus frequency. */

		/* Skip lapic calibration since we know the bus frequency. */

		lapic_timer_frequency = ecx / HZ;

		lapic_timer_frequency = ecx / HZ;
@@ -96,6 +148,8 @@ static void __init vmware_platform_setup(void) 
		pr_warn("Failed to get TSC freq from the hypervisor\n");

		pr_warn("Failed to get TSC freq from the hypervisor\n");

	}

	}





	vmware_paravirt_ops_setup();



#ifdef CONFIG_X86_IO_APIC

#ifdef CONFIG_X86_IO_APIC

	no_timer_check = 1;

	no_timer_check = 1;

#endif

#endif

arch/x86/platform/intel-mid/pwr.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -270,7 +270,6 @@ int intel_mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state) 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(intel_mid_pci_set_power_state);





pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev)

pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev)

{

{