Pull processor into release branch (27196c30) · Commits · e / devices / android_kernel_xiaomi_markw

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+15 −26

Original line number	Diff line number	Diff line
		@@ -68,7 +68,8 @@ struct acpi_cpufreq_data {
		};

		static struct acpi_cpufreq_data *drv_data[NR_CPUS];
		static struct acpi_processor_performance *acpi_perf_data[NR_CPUS];
		/* acpi_perf_data is a pointer to percpu data. */
		static struct acpi_processor_performance *acpi_perf_data;

		static struct cpufreq_driver acpi_cpufreq_driver;

		@@ -508,25 +509,15 @@ acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu)
		* do _PDC and _PSD and find out the processor dependency for the
		* actual init that will happen later...
		*/
		static int acpi_cpufreq_early_init(void)
		static int __init acpi_cpufreq_early_init(void)
		{
		struct acpi_processor_performance *data;
		unsigned int i, j;

		dprintk("acpi_cpufreq_early_init\n");

		for_each_possible_cpu(i) {
		data = kzalloc(sizeof(struct acpi_processor_performance),
		GFP_KERNEL);
		if (!data) {
		for_each_possible_cpu(j) {
		kfree(acpi_perf_data[j]);
		acpi_perf_data[j] = NULL;
		}
		acpi_perf_data = alloc_percpu(struct acpi_processor_performance);
		if (!acpi_perf_data) {
		dprintk("Memory allocation error for acpi_perf_data.\n");
		return -ENOMEM;
		}
		acpi_perf_data[i] = data;
		}

		/* Do initialization in ACPI core */
		acpi_processor_preregister_performance(acpi_perf_data);
		@@ -574,14 +565,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)

		dprintk("acpi_cpufreq_cpu_init\n");

		if (!acpi_perf_data[cpu])
		return -ENODEV;

		data = kzalloc(sizeof(struct acpi_cpufreq_data), GFP_KERNEL);
		if (!data)
		return -ENOMEM;

		data->acpi_data = acpi_perf_data[cpu];
		data->acpi_data = percpu_ptr(acpi_perf_data, cpu);
		drv_data[cpu] = data;

		if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
		@@ -778,24 +766,25 @@ static struct cpufreq_driver acpi_cpufreq_driver = {

		static int __init acpi_cpufreq_init(void)
		{
		int ret;

		dprintk("acpi_cpufreq_init\n");

		acpi_cpufreq_early_init();
		ret = acpi_cpufreq_early_init();
		if (ret)
		return ret;

		return cpufreq_register_driver(&acpi_cpufreq_driver);
		}

		static void __exit acpi_cpufreq_exit(void)
		{
		unsigned int i;
		dprintk("acpi_cpufreq_exit\n");

		cpufreq_unregister_driver(&acpi_cpufreq_driver);

		for_each_possible_cpu(i) {
		kfree(acpi_perf_data[i]);
		acpi_perf_data[i] = NULL;
		}
		free_percpu(acpi_perf_data);

		return;
		}

drivers/acpi/processor_idle.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -969,11 +969,17 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
		}

		if (pr->flags.bm_check) {
		/* bus mastering control is necessary */
		if (!pr->flags.bm_control) {
		/* In this case we enter C3 without bus mastering */
		if (pr->flags.has_cst != 1) {
		/* bus mastering control is necessary */
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C3 support requires BM control\n"));
		return;
		} else {
		/* Here we enter C3 without bus mastering */
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"C3 support without bus mastering control\n"));
		"C3 support without BM control\n"));
		}
		}
		} else {
		/*

drivers/acpi/processor_perflib.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -539,7 +539,7 @@ end:
		}

		int acpi_processor_preregister_performance(
		struct acpi_processor_performance **performance)
		struct acpi_processor_performance *performance)
		{
		int count, count_target;
		int retval = 0;
		@@ -567,12 +567,12 @@ int acpi_processor_preregister_performance(
		continue;
		}

		if (!performance \|\| !performance[i]) {
		if (!performance \|\| !percpu_ptr(performance, i)) {
		retval = -EINVAL;
		continue;
		}

		pr->performance = performance[i];
		pr->performance = percpu_ptr(performance, i);
		cpu_set(i, pr->performance->shared_cpu_map);
		if (acpi_processor_get_psd(pr)) {
		retval = -EINVAL;

include/acpi/processor.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ struct acpi_processor_errata {

		extern int acpi_processor_preregister_performance(struct
		acpi_processor_performance
		**performance);
		*performance);

		extern int acpi_processor_register_performance(struct acpi_processor_performance
		*performance, unsigned int cpu);