Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (ef54b1bb) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-firmware-acpi

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -69,9 +69,13 @@ Description:
	gpe1F: 0 invalid		gpe1F: 0 invalid
	gpe_all: 1192		gpe_all: 1192
	sci: 1194		sci: 1194
			sci_not: 0

	sci - The total number of times the ACPI SCI		sci - The number of times the ACPI SCI
	has claimed an interrupt.		has been called and claimed an interrupt.

			sci_not - The number of times the ACPI SCI
			has been called and NOT claimed an interrupt.

	gpe_all - count of SCI caused by GPEs.		gpe_all - count of SCI caused by GPEs.

Documentation/laptops/thinkpad-acpi.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	ThinkPad ACPI Extras Driver		ThinkPad ACPI Extras Driver

	Version 0.22		Version 0.23
	November 23rd, 2008		April 10th, 2009

	Borislav Deianov <borislav@users.sf.net>		Borislav Deianov <borislav@users.sf.net>
	Henrique de Moraes Holschuh <hmh@hmh.eng.br>		Henrique de Moraes Holschuh <hmh@hmh.eng.br>

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

+16 −14

Original line number	Original line	Diff line number	Diff line
	@@ -65,14 +65,18 @@ enum {
	struct acpi_cpufreq_data {		struct acpi_cpufreq_data {
	struct acpi_processor_performance *acpi_data;		struct acpi_processor_performance *acpi_data;
	struct cpufreq_frequency_table *freq_table;		struct cpufreq_frequency_table *freq_table;
	unsigned int max_freq;
	unsigned int resume;		unsigned int resume;
	unsigned int cpu_feature;		unsigned int cpu_feature;
	u64 saved_aperf, saved_mperf;
	};		};

	static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data);		static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data);

			struct acpi_msr_data {
			u64 saved_aperf, saved_mperf;
			};

			static DEFINE_PER_CPU(struct acpi_msr_data, msr_data);

	DEFINE_TRACE(power_mark);		DEFINE_TRACE(power_mark);

	/* acpi_perf_data is a pointer to percpu data. */		/* acpi_perf_data is a pointer to percpu data. */
	@@ -287,11 +291,11 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy,
	return 0;		return 0;

	cur.aperf.whole = readin.aperf.whole -		cur.aperf.whole = readin.aperf.whole -
	per_cpu(drv_data, cpu)->saved_aperf;		per_cpu(msr_data, cpu).saved_aperf;
	cur.mperf.whole = readin.mperf.whole -		cur.mperf.whole = readin.mperf.whole -
	per_cpu(drv_data, cpu)->saved_mperf;		per_cpu(msr_data, cpu).saved_mperf;
	per_cpu(drv_data, cpu)->saved_aperf = readin.aperf.whole;		per_cpu(msr_data, cpu).saved_aperf = readin.aperf.whole;
	per_cpu(drv_data, cpu)->saved_mperf = readin.mperf.whole;		per_cpu(msr_data, cpu).saved_mperf = readin.mperf.whole;

	#ifdef __i386__		#ifdef __i386__
	/*		/*
	@@ -335,7 +339,7 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy,

	#endif		#endif

	retval = per_cpu(drv_data, policy->cpu)->max_freq * perf_percent / 100;		retval = (policy->cpuinfo.max_freq * perf_percent) / 100;

	return retval;		return retval;
	}		}
	@@ -688,16 +692,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
	/* Check for high latency (>20uS) from buggy BIOSes, like on T42 */		/* Check for high latency (>20uS) from buggy BIOSes, like on T42 */
	if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&		if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
	policy->cpuinfo.transition_latency > 20 * 1000) {		policy->cpuinfo.transition_latency > 20 * 1000) {
	static int print_once;
	policy->cpuinfo.transition_latency = 20 * 1000;		policy->cpuinfo.transition_latency = 20 * 1000;
	if (!print_once) {		printk_once(KERN_INFO "Capping off P-state tranision"
	print_once = 1;		" latency at 20 uS\n");
	printk(KERN_INFO "Capping off P-state tranision latency"
	" at 20 uS\n");
	}
	}		}

	data->max_freq = perf->states[0].core_frequency * 1000;
	/* table init */		/* table init */
	for (i = 0; i < perf->state_count; i++) {		for (i = 0; i < perf->state_count; i++) {
	if (i > 0 && perf->states[i].core_frequency >=		if (i > 0 && perf->states[i].core_frequency >=
	@@ -716,6 +715,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
	if (result)		if (result)
	goto err_freqfree;		goto err_freqfree;

			if (perf->states[0].core_frequency * 1000 != policy->cpuinfo.max_freq)
			printk(KERN_WARNING FW_WARN "P-state 0 is not max freq\n");

	switch (perf->control_register.space_id) {		switch (perf->control_register.space_id) {
	case ACPI_ADR_SPACE_SYSTEM_IO:		case ACPI_ADR_SPACE_SYSTEM_IO:
	/* Current speed is unknown and not detectable by IO port */		/* Current speed is unknown and not detectable by IO port */

drivers/acpi/acpica/hwsleep.c

+26 −17

Original line number	Original line	Diff line number	Diff line
	@@ -211,6 +211,12 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)

	ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)		ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)

			static unsigned int gts, bfs;
			module_param(gts, uint, 0644);
			module_param(bfs, uint, 0644);
			MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
			MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);

	/*******************************************************************************		/*******************************************************************************
	*		*
	* FUNCTION: acpi_enter_sleep_state		* FUNCTION: acpi_enter_sleep_state
	@@ -278,6 +284,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
	return_ACPI_STATUS(status);		return_ACPI_STATUS(status);
	}		}

			if (gts) {
	/* Execute the _GTS method */		/* Execute the _GTS method */

	arg_list.count = 1;		arg_list.count = 1;
	@@ -289,6 +296,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {		if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
	return_ACPI_STATUS(status);		return_ACPI_STATUS(status);
	}		}
			}

	/* Get current value of PM1A control */		/* Get current value of PM1A control */

	@@ -513,6 +521,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
	}		}
	}		}

			if (bfs) {
	/* Execute the _BFS method */		/* Execute the _BFS method */

	arg_list.count = 1;		arg_list.count = 1;
	@@ -524,7 +533,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {		if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
	ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));		ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
	}		}
			}
	return_ACPI_STATUS(status);		return_ACPI_STATUS(status);
	}		}

drivers/acpi/acpica/hwvalid.c

+72 −14

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ static const struct acpi_port_info acpi_protected_ports[] = {
	{"PIT2", 0x0048, 0x004B, ACPI_OSI_WIN_XP},		{"PIT2", 0x0048, 0x004B, ACPI_OSI_WIN_XP},
	{"RTC", 0x0070, 0x0071, ACPI_OSI_WIN_XP},		{"RTC", 0x0070, 0x0071, ACPI_OSI_WIN_XP},
	{"CMOS", 0x0074, 0x0076, ACPI_OSI_WIN_XP},		{"CMOS", 0x0074, 0x0076, ACPI_OSI_WIN_XP},
			{"DMA1", 0x0081, 0x0083, ACPI_OSI_WIN_XP},
	{"DMA1L", 0x0087, 0x0087, ACPI_OSI_WIN_XP},		{"DMA1L", 0x0087, 0x0087, ACPI_OSI_WIN_XP},
	{"DMA2", 0x0089, 0x008B, ACPI_OSI_WIN_XP},		{"DMA2", 0x0089, 0x008B, ACPI_OSI_WIN_XP},
	{"DMA2L", 0x008F, 0x008F, ACPI_OSI_WIN_XP},		{"DMA2L", 0x008F, 0x008F, ACPI_OSI_WIN_XP},
	@@ -151,7 +152,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
	ACPI_ERROR((AE_INFO,		ACPI_ERROR((AE_INFO,
	"Illegal I/O port address/length above 64K: 0x%p/%X",		"Illegal I/O port address/length above 64K: 0x%p/%X",
	ACPI_CAST_PTR(void, address), byte_width));		ACPI_CAST_PTR(void, address), byte_width));
	return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);		return_ACPI_STATUS(AE_LIMIT);
	}		}

	/* Exit if requested address is not within the protected port table */		/* Exit if requested address is not within the protected port table */
	@@ -178,11 +179,12 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
	/* Port illegality may depend on the _OSI calls made by the BIOS */		/* Port illegality may depend on the _OSI calls made by the BIOS */

	if (acpi_gbl_osi_data >= port_info->osi_dependency) {		if (acpi_gbl_osi_data >= port_info->osi_dependency) {
	ACPI_ERROR((AE_INFO,		ACPI_DEBUG_PRINT((ACPI_DB_IO,
	"Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)",		"Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)",
	ACPI_CAST_PTR(void, address),		ACPI_CAST_PTR(void, address),
	byte_width, port_info->name,		byte_width, port_info->name,
	port_info->start, port_info->end));		port_info->start,
			port_info->end));

	return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);		return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);
	}		}
	@@ -206,7 +208,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
	* Value Where value is placed		* Value Where value is placed
	* Width Number of bits		* Width Number of bits
	*		*
	* RETURN: Value read from port		* RETURN: Status and value read from port
	*		*
	* DESCRIPTION: Read data from an I/O port or register. This is a front-end		* DESCRIPTION: Read data from an I/O port or register. This is a front-end
	* to acpi_os_read_port that performs validation on both the port		* to acpi_os_read_port that performs validation on both the port
	@@ -217,16 +219,45 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
	acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)		acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
	{		{
	acpi_status status;		acpi_status status;
			u32 one_byte;
			u32 i;

			/* Validate the entire request and perform the I/O */

	status = acpi_hw_validate_io_request(address, width);		status = acpi_hw_validate_io_request(address, width);
	if (ACPI_FAILURE(status)) {		if (ACPI_SUCCESS(status)) {
			status = acpi_os_read_port(address, value, width);
	return status;		return status;
	}		}

	status = acpi_os_read_port(address, value, width);		if (status != AE_AML_ILLEGAL_ADDRESS) {
			return status;
			}

			/*
			* There has been a protection violation within the request. Fall
			* back to byte granularity port I/O and ignore the failing bytes.
			* This provides Windows compatibility.
			*/
			for (i = 0, *value = 0; i < width; i += 8) {

			/* Validate and read one byte */

			if (acpi_hw_validate_io_request(address, 8) == AE_OK) {
			status = acpi_os_read_port(address, &one_byte, 8);
			if (ACPI_FAILURE(status)) {
	return status;		return status;
	}		}

			*value \|= (one_byte << i);
			}

			address++;
			}

			return AE_OK;
			}

	/******************************************************************************		/******************************************************************************
	*		*
	* FUNCTION: acpi_hw_write_port		* FUNCTION: acpi_hw_write_port
	@@ -235,7 +266,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
	* Value Value to write		* Value Value to write
	* Width Number of bits		* Width Number of bits
	*		*
	* RETURN: None		* RETURN: Status
	*		*
	* DESCRIPTION: Write data to an I/O port or register. This is a front-end		* DESCRIPTION: Write data to an I/O port or register. This is a front-end
	* to acpi_os_write_port that performs validation on both the port		* to acpi_os_write_port that performs validation on both the port
	@@ -246,12 +277,39 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
	acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width)		acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width)
	{		{
	acpi_status status;		acpi_status status;
			u32 i;

			/* Validate the entire request and perform the I/O */

	status = acpi_hw_validate_io_request(address, width);		status = acpi_hw_validate_io_request(address, width);
	if (ACPI_FAILURE(status)) {		if (ACPI_SUCCESS(status)) {
			status = acpi_os_write_port(address, value, width);
	return status;		return status;
	}		}

	status = acpi_os_write_port(address, value, width);		if (status != AE_AML_ILLEGAL_ADDRESS) {
			return status;
			}

			/*
			* There has been a protection violation within the request. Fall
			* back to byte granularity port I/O and ignore the failing bytes.
			* This provides Windows compatibility.
			*/
			for (i = 0; i < width; i += 8) {

			/* Validate and write one byte */

			if (acpi_hw_validate_io_request(address, 8) == AE_OK) {
			status =
			acpi_os_write_port(address, (value >> i) & 0xFF, 8);
			if (ACPI_FAILURE(status)) {
	return status;		return status;
	}		}
			}

			address++;
			}

			return AE_OK;
			}

Admin message