Merge branch 'pdc' into release (da3df858) · Commits · e / devices / android_kernel_teracube_emerald

arch/ia64/include/asm/acpi.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,12 @@ extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];
		extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
		#endif

		static inline bool arch_has_acpi_pdc(void) { return true; }
		static inline void arch_acpi_set_pdc_bits(u32 *buf)
		{
		buf[2] \|= ACPI_PDC_EST_CAPABILITY_SMP;
		}

		#define acpi_unlazy_tlb(x)

		#ifdef CONFIG_ACPI_NUMA

arch/ia64/kernel/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -18,10 +18,6 @@ obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
		obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
		obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o

		ifneq ($(CONFIG_ACPI_PROCESSOR),)
		obj-y += acpi-processor.o
		endif

		obj-$(CONFIG_IA64_PALINFO) += palinfo.o
		obj-$(CONFIG_IOSAPIC) += iosapic.o
		obj-$(CONFIG_MODULES) += module.o

arch/ia64/kernel/acpi-processor.c

deleted100644 → 0

+0 −85

Original line number	Diff line number	Diff line
		/*
		* arch/ia64/kernel/acpi-processor.c
		*
		* Copyright (C) 2005 Intel Corporation
		* Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
		* - Added _PDC for platforms with Intel CPUs
		*/

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/acpi.h>

		#include <acpi/processor.h>
		#include <asm/acpi.h>

		static void init_intel_pdc(struct acpi_processor *pr)
		{
		struct acpi_object_list *obj_list;
		union acpi_object *obj;
		u32 *buf;

		/* allocate and initialize pdc. It will be used later. */
		obj_list = kmalloc(sizeof(struct acpi_object_list), GFP_KERNEL);
		if (!obj_list) {
		printk(KERN_ERR "Memory allocation error\n");
		return;
		}

		obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
		if (!obj) {
		printk(KERN_ERR "Memory allocation error\n");
		kfree(obj_list);
		return;
		}

		buf = kmalloc(12, GFP_KERNEL);
		if (!buf) {
		printk(KERN_ERR "Memory allocation error\n");
		kfree(obj);
		kfree(obj_list);
		return;
		}

		buf[0] = ACPI_PDC_REVISION_ID;
		buf[1] = 1;
		buf[2] = ACPI_PDC_EST_CAPABILITY_SMP;
		/*
		* The default of PDC_SMP_T_SWCOORD bit is set for IA64 cpu so
		* that OSPM is capable of native ACPI throttling software
		* coordination using BIOS supplied _TSD info.
		*/
		buf[2] \|= ACPI_PDC_SMP_T_SWCOORD;

		obj->type = ACPI_TYPE_BUFFER;
		obj->buffer.length = 12;
		obj->buffer.pointer = (u8 *) buf;
		obj_list->count = 1;
		obj_list->pointer = obj;
		pr->pdc = obj_list;

		return;
		}

		/* Initialize _PDC data based on the CPU vendor */
		void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
		{
		pr->pdc = NULL;
		init_intel_pdc(pr);
		return;
		}

		EXPORT_SYMBOL(arch_acpi_processor_init_pdc);

		void arch_acpi_processor_cleanup_pdc(struct acpi_processor *pr)
		{
		if (pr->pdc) {
		kfree(pr->pdc->pointer->buffer.pointer);
		kfree(pr->pdc->pointer);
		kfree(pr->pdc);
		pr->pdc = NULL;
		}
		}

		EXPORT_SYMBOL(arch_acpi_processor_cleanup_pdc);

arch/x86/include/asm/acpi.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,32 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
		return max_cstate;
		}

		static inline bool arch_has_acpi_pdc(void)
		{
		struct cpuinfo_x86 *c = &cpu_data(0);
		return (c->x86_vendor == X86_VENDOR_INTEL \|\|
		c->x86_vendor == X86_VENDOR_CENTAUR);
		}

		static inline void arch_acpi_set_pdc_bits(u32 *buf)
		{
		struct cpuinfo_x86 *c = &cpu_data(0);

		buf[2] \|= ACPI_PDC_C_CAPABILITY_SMP;

		if (cpu_has(c, X86_FEATURE_EST))
		buf[2] \|= ACPI_PDC_EST_CAPABILITY_SWSMP;

		if (cpu_has(c, X86_FEATURE_ACPI))
		buf[2] \|= ACPI_PDC_T_FFH;

		/*
		* If mwait/monitor is unsupported, C2/C3_FFH will be disabled
		*/
		if (!cpu_has(c, X86_FEATURE_MWAIT))
		buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);
		}

		#else /* !CONFIG_ACPI */

		#define acpi_lapic 0

arch/x86/kernel/acpi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ obj-$(CONFIG_ACPI) += boot.o
		obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_rm.o wakeup_$(BITS).o

		ifneq ($(CONFIG_ACPI_PROCESSOR),)
		obj-y += cstate.o processor.o
		obj-y += cstate.o
		endif

		$(obj)/wakeup_rm.o: $(obj)/realmode/wakeup.bin