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

Commit 83d0515b authored by Venkatesh Pallipadi's avatar Venkatesh Pallipadi Committed by Dave Jones
Browse files

[CPUFREQ][4/8] acpi-cpufreq: Mark speedstep-centrino ACPI as deprecated 



Mark ACPI hooks in speedstep-centrino as deprecated. Change the order in which
speedstep-centrino and acpi-cpufreq (when both are in kernel) will be
added. First driver to be tried is now acpi-cpufreq, followed by
speedstep-centrino.

Add a note in feature-removal-schedule to mark this deprecation.

Signed-off-by: default avatarDenis Sadykov <denis.m.sadykov@intel.com>
Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent dde9f7ba

Documentation/feature-removal-schedule.txt

+22 −0
Original line number Diff line number Diff line
@@ -280,3 +280,25 @@ Why: Orphaned for ages. SMP bugs long unfixed. Few users left 
Who:	Jeff Garzik <jeff@garzik.org>



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



What:	ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver

When:	December 2006

Why:	Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are

	functionally very much similar. They talk to ACPI in same way. Only

	difference between them is the way they do frequency transitions.

	One uses MSRs and the other one uses IO ports. Functionaliy of

	speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.

	That means one common driver will support all Intel Enhanced Speedstep

	capable CPUs. That means less confusion over name of

	speedstep-centrino driver (with that driver supposed to be used on

	non-centrino platforms). That means less duplication of code and

	less maintenance effort and no possibility of these two drivers

	going out of sync.

	Current users of speedstep_centrino with ACPI hooks are requested to

	switch over to acpi-cpufreq driver. speedstep-centrino will continue

	to work using older non-ACPI static table based scheme even after this

	date.



Who:	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>



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

arch/i386/kernel/cpu/cpufreq/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config X86_ACPI_CPUFREQ 
	help

	  This driver adds a CPUFreq driver which utilizes the ACPI

	  Processor Performance States.

	  This driver also supports Intel Enhanced Speedstep.



	  For details, take a look at <file:Documentation/cpu-freq/>.
@@ -121,11 +122,14 @@ config X86_SPEEDSTEP_CENTRINO 
	  If in doubt, say N.



config X86_SPEEDSTEP_CENTRINO_ACPI

	bool "Use ACPI tables to decode valid frequency/voltage pairs"

	bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"

	depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR

	depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)

	default y

	help

	  This is deprecated and this functionality is now merged into

	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of

	  speedstep_centrino.

	  Use primarily the information provided in the BIOS ACPI tables

	  to determine valid CPU frequency and voltage pairings. It is

	  required for the driver to work on non-Banias CPUs.

arch/i386/kernel/cpu/cpufreq/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ obj-$(CONFIG_SC520_CPUFREQ) += sc520_freq.o 
obj-$(CONFIG_X86_LONGRUN)		+= longrun.o  

obj-$(CONFIG_X86_GX_SUSPMOD)		+= gx-suspmod.o

obj-$(CONFIG_X86_SPEEDSTEP_ICH)		+= speedstep-ich.o

obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)	+= speedstep-centrino.o

obj-$(CONFIG_X86_SPEEDSTEP_LIB)		+= speedstep-lib.o

obj-$(CONFIG_X86_SPEEDSTEP_SMI)		+= speedstep-smi.o

obj-$(CONFIG_X86_ACPI_CPUFREQ)		+= acpi-cpufreq.o

obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)	+= speedstep-centrino.o

obj-$(CONFIG_X86_P4_CLOCKMOD)		+= p4-clockmod.o

obj-$(CONFIG_X86_CPUFREQ_NFORCE2)	+= cpufreq-nforce2.o

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c

+3 −0
Original line number Diff line number Diff line
@@ -531,6 +531,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy) 


	/* notify BIOS that we exist */

	acpi_processor_notify_smm(THIS_MODULE);

	printk("speedstep-centrino with X86_SPEEDSTEP_CENTRINO_ACPI"

			"config is deprecated.\n "

			"Use X86_ACPI_CPUFREQ (acpi-cpufreq instead.\n" );



	return 0;

arch/x86_64/kernel/cpufreq/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -27,10 +27,13 @@ config X86_POWERNOW_K8_ACPI 
	default y



config X86_SPEEDSTEP_CENTRINO

	tristate "Intel Enhanced SpeedStep"

	tristate "Intel Enhanced SpeedStep (deprecated)"

	select CPU_FREQ_TABLE

	depends on ACPI_PROCESSOR

	help

	  This is deprecated and this functionality is now merged into

	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of

	  speedstep_centrino.

	  This adds the CPUFreq driver for Enhanced SpeedStep enabled

	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs

	  or 64bit enabled Intel Xeons.
@@ -50,6 +53,7 @@ config X86_ACPI_CPUFREQ 
	help

	  This driver adds a CPUFreq driver which utilizes the ACPI

	  Processor Performance States.

	  This driver also supports Intel Enhanced Speedstep.



	  For details, take a look at <file:Documentation/cpu-freq/>.