rpms/kernel/devel linux-2.6-acpi-clear-fadt_cstate-control.patch, NONE, 1.1 kernel-2.6.spec, 1.3133, 1.3134

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-acpi-clear-fadt_cstate-control.patch 
Log Message:
* Fri May 04 2007 Dave Jones <davej at redhat.com>
- ACPI: Fix 2.6.21 boot regression on P4/HT


linux-2.6-acpi-clear-fadt_cstate-control.patch:

--- NEW FILE linux-2.6-acpi-clear-fadt_cstate-control.patch ---
From:	Len Brown <lenb at kernel.org>
To:	stable at kernel.org
Subject: [2.6.21.stable PATCH] ACPI: Fix 2.6.21 boot regression on P4/HT
Date:	Sat, 28 Apr 2007 20:37:26 -0400
Cc:	linux-acpi at vger.kernel.org, linux-kernel at vger.kernel.org

Up through 2.6.20 we cleared the FADT.CSTATE_CONTROL field
for FADT versions before r3, because it made no sense
for that reserved field to be set for pre-ACPI 2.0 systems.

It turns out that not clearing this field exposes
Linux to SMM BIOS failures, so do the same in 2.6.21.

http://bugzilla.kernel.org/show_bug.cgi?id=8346

Signed-off-by: Len Brown <len.brown at intel.com>
---
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index 807c711..d341491 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -347,6 +347,20 @@ static void acpi_tb_convert_fadt(void)
 		acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
 
 	}
+	/*
+	 * _CST object and C States change notification start with
+	 * ACPI 2.0 (FADT r3).  Although the field should be Reserved
+	 * and 0 before then, some pre-r3 FADT set this field and
+	 * it results in SMM-related boot failures.  For them, clear it.
+	 */
+	if ((acpi_gbl_FADT.header.revision < 3) &&
+		(acpi_gbl_FADT.cst_control != 0)) {
+			ACPI_WARNING((AE_INFO,
+				"Ignoring BIOS FADT r%u C-state control",
+				acpi_gbl_FADT.header.revision));
+		 	acpi_gbl_FADT.cst_control = 0;
+	}
+
 }
 
 /******************************************************************************
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3133
retrieving revision 1.3134
diff -u -r1.3133 -r1.3134
--- kernel-2.6.spec	4 May 2007 04:02:24 -0000	1.3133
+++ kernel-2.6.spec	4 May 2007 04:04:28 -0000	1.3134
@@ -610,6 +610,7 @@
 Patch2404: linux-2.6-timer-tick-broadcast.patch
 
 # ACPI bits
+Patch2500: linux-2.6-acpi-clear-fadt_cstate-control.patch
 
 # Add the new firewire stack. Diff between the v2.6.20 tag and commit
 # a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
@@ -1364,6 +1365,8 @@
 %patch2404 -p1
 
 # ACPI patches
+# ACPI: Fix 2.6.21 boot regression on P4/HT
+%patch2500 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -2336,6 +2339,9 @@
 %endif
 
 %changelog
+* Fri May 04 2007 Dave Jones <davej at redhat.com>
+- ACPI: Fix 2.6.21 boot regression on P4/HT
+
 * Thu May 03 2007 Dave Jones <davej at redhat.com>
 - libata-sff: Undo bug introduced with pci_iomap changes