Re: [PATCH] check xpm2_control_block while setting bm_control

[Venki Pallipadi <venkatesh.pallipadi@intel.com>]

On Fri, Jun 08, 2007 at 03:09:47PM -0700, Pallipadi, Venkatesh wrote:
> 
> 
> Ooops. Sent the wrong/old version of the patch.
> Len - Please do not apply this I will send a new one.
> 
> Thanks,
> Venki 
> 
Below is the proper patch I wanted to send earlier.
Thanks,
Venki



Check both pm2_control_block and cpm2_control_block for bm_control. It should
be better to do this with checking of address from consolidated
fadt_info_table[]. But, that will need some changes in acpica tables.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

Index: linux-2.6.22-rc-mm/drivers/acpi/processor_core.c
===================================================================
--- linux-2.6.22-rc-mm.orig/drivers/acpi/processor_core.c	2007-06-07 11:33:00.000000000 -0700
+++ linux-2.6.22-rc-mm/drivers/acpi/processor_core.c	2007-06-08 14:26:32.000000000 -0700
@@ -524,8 +524,15 @@
 	/*
 	 * Check to see if we have bus mastering arbitration control.  This
 	 * is required for proper C3 usage (to maintain cache coherency).
+	 * Check both pm2_control_block and xpm2_control_block
 	 */
-	if (acpi_gbl_FADT.pm2_control_block && acpi_gbl_FADT.pm2_control_length) {
+	if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+	     acpi_gbl_FADT.xpm2_control_block.space_id ==
+						 ACPI_ADR_SPACE_SYSTEM_IO &&
+	     acpi_gbl_FADT.xpm2_control_block.address &&
+	     acpi_gbl_FADT.xpm2_control_block.bit_width) ||
+	    (acpi_gbl_FADT.pm2_control_block &&
+	     acpi_gbl_FADT.pm2_control_length)) {
 		pr->flags.bm_control = 1;
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 				  "Bus mastering arbitration control present\n"));