Commit 3ce195bf authored by LeoLiu-oc's avatar LeoLiu-oc
Browse files

Revert "cpufreq: ACPI: add ITMT support when CPPC enabled" 

zhaoxin inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBB6OU


CVE: NA

-------------------

This reverts commit a5456c60.
Revoke this version first before updating to the new version:
commit a5456c60 ("cpufreq: ACPI: add ITMT support when CPPC enabled")

Fixes: a5456c60 ("cpufreq: ACPI: add ITMT support when CPPC enabled").
Signed-off-by: default avatarLeoLiu-oc <leoliu-oc@zhaoxin.com>
parent 24f2faf5

arch/x86/kernel/itmt.c

+0 −2
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ int sched_set_itmt_support(void) 


	return 0;

}

EXPORT_SYMBOL_GPL(sched_set_itmt_support);



/**

 * sched_clear_itmt_support() - Revoke platform's support of ITMT
@@ -182,4 +181,3 @@ void sched_set_itmt_core_prio(int prio, int cpu) 
{

	per_cpu(sched_core_priority, cpu) = prio;

}
 
EXPORT_SYMBOL_GPL(sched_set_itmt_core_prio);

drivers/cpufreq/acpi-cpufreq.c

+13 −72
Original line number Diff line number Diff line
@@ -628,39 +628,28 @@ static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 
#endif



#ifdef CONFIG_ACPI_CPPC_LIB

static bool cppc_highest_perf_diff;

static struct cpumask core_prior_mask;



static void cppc_get_highest_nominal_perf(int cpu, u64 *highest_perf, u64 *nominal_perf)

static u64 get_max_boost_ratio(unsigned int cpu)

{

	struct cppc_perf_caps perf_caps;

	u64 highest_perf, nominal_perf;

	int ret;



	if (acpi_pstate_strict)

		return 0;



	ret = cppc_get_perf_caps(cpu, &perf_caps);

	if (ret) {

		pr_debug("CPU%d: Unable to get performance capabilities (%d)\n", cpu, ret);

		return;

		pr_debug("CPU%d: Unable to get performance capabilities (%d)\n",

			 cpu, ret);

		return 0;

	}



	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)

		*highest_perf = amd_get_highest_perf();

		highest_perf = amd_get_highest_perf();

	else

		*highest_perf = perf_caps.highest_perf;

		highest_perf = perf_caps.highest_perf;



	*nominal_perf = perf_caps.nominal_perf;

}



static u64 get_max_boost_ratio(unsigned int cpu)

{

	u64 highest_perf, nominal_perf;



	if (acpi_pstate_strict)

		return 0;



	if (boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN ||

	    boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR)

		return 0;



	cppc_get_highest_nominal_perf(cpu, &highest_perf, &nominal_perf);

	nominal_perf = perf_caps.nominal_perf;



	if (!highest_perf || !nominal_perf) {

		pr_debug("CPU%d: highest or nominal performance missing\n", cpu);
@@ -674,51 +663,8 @@ static u64 get_max_boost_ratio(unsigned int cpu) 


	return div_u64(highest_perf << SCHED_CAPACITY_SHIFT, nominal_perf);

}



/* The work item is needed to avoid CPU hotplug locking issues */

static void cpufreq_sched_itmt_work_fn(struct work_struct *work)

{

	sched_set_itmt_support();

}



static DECLARE_WORK(sched_itmt_work, cpufreq_sched_itmt_work_fn);



static void cpufreq_set_itmt_prio(int cpu)

{

	u64 highest_perf, nominal_perf;

	static u64 max_highest_perf = 0, min_highest_perf = U64_MAX;



	cppc_get_highest_nominal_perf(cpu, &highest_perf, &nominal_perf);



	sched_set_itmt_core_prio(highest_perf, cpu);

	cpumask_set_cpu(cpu, &core_prior_mask);



	if (max_highest_perf <= min_highest_perf) {

		if (highest_perf > max_highest_perf)

			max_highest_perf = highest_perf;



		if (highest_perf < min_highest_perf)

			min_highest_perf = highest_perf;



		if (max_highest_perf > min_highest_perf) {

			/*

			 * This code can be run during CPU online under the

			 * CPU hotplug locks, so sched_set_itmt_support()

			 * cannot be called from here.  Queue up a work item

			 * to invoke it.

			 */

			cppc_highest_perf_diff = true;

		}

	}



	if (cppc_highest_perf_diff && cpumask_equal(&core_prior_mask, cpu_online_mask)) {

		pr_debug("queue a work to set itmt enabled\n");

		schedule_work(&sched_itmt_work);

	}

}

#else

static inline u64 get_max_boost_ratio(unsigned int cpu) { return 0; }

static inline void cpufreq_set_itmt_prio(int cpu) { }

#endif



static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
@@ -731,7 +677,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	unsigned int valid_states = 0;

	unsigned int result = 0;

	u64 max_boost_ratio;

	unsigned int i, j;

	unsigned int i;

#ifdef CONFIG_SMP

	static int blacklisted;

#endif
@@ -795,11 +741,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		pr_info_once("overriding BIOS provided _PSD data\n");

	}

#endif

	if (c->x86_vendor == X86_VENDOR_CENTAUR || c->x86_vendor == X86_VENDOR_ZHAOXIN) {

		for_each_cpu(j, policy->cpus) {

			cpufreq_set_itmt_prio(j);

		}

	}



	/* capability check */

	if (perf->state_count <= 1) {