Commit 2076cba2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back ACPI processor driver changes for 6.13

parents b79276dc bf41bb57

drivers/acpi/processor_perflib.c

+5 −8
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#define ACPI_PROCESSOR_FILE_PERFORMANCE	"performance"



static DEFINE_MUTEX(performance_mutex);



/*

 * _PPC support is implemented as a CPUfreq policy notifier:

 * This means each time a CPUfreq driver registered also with
@@ -209,6 +207,10 @@ void acpi_processor_ppc_exit(struct cpufreq_policy *policy) 
	}

}



#ifdef CONFIG_X86



static DEFINE_MUTEX(performance_mutex);



static int acpi_processor_get_performance_control(struct acpi_processor *pr)

{

	int result = 0;
@@ -267,7 +269,6 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr) 
	return result;

}



#ifdef CONFIG_X86

/*

 * Some AMDs have 50MHz frequency multiples, but only provide 100MHz rounding

 * in their ACPI data. Calculate the real values and fix up the _PSS data.
@@ -298,9 +299,6 @@ static void amd_fixup_frequency(struct acpi_processor_px *px, int i) 
			px->core_frequency = (100 * (fid + 8)) >> did;

	}

}

#else

static void amd_fixup_frequency(struct acpi_processor_px *px, int i) {};

#endif



static int acpi_processor_get_performance_states(struct acpi_processor *pr)

{
@@ -440,13 +438,11 @@ int acpi_processor_get_performance_info(struct acpi_processor *pr) 
	 * the BIOS is older than the CPU and does not know its frequencies

	 */

 update_bios:

#ifdef CONFIG_X86

	if (acpi_has_method(pr->handle, "_PPC")) {

		if(boot_cpu_has(X86_FEATURE_EST))

			pr_warn(FW_BUG "BIOS needs update for CPU "

			       "frequency support\n");

	}

#endif

	return result;

}

EXPORT_SYMBOL_GPL(acpi_processor_get_performance_info);
@@ -788,3 +784,4 @@ void acpi_processor_unregister_performance(unsigned int cpu) 
	mutex_unlock(&performance_mutex);

}

EXPORT_SYMBOL(acpi_processor_unregister_performance);

#endif