]> xenbits.xensource.com Git - legacy/linux-2.6.18-xen.git/commitdiff
dom0: Enable C3 without bm control only for CST based C3
authorKeir Fraser <keir.fraser@citrix.com>
Sat, 13 Dec 2008 16:00:43 +0000 (16:00 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Sat, 13 Dec 2008 16:00:43 +0000 (16:00 +0000)
commit ed3110efb538d7acbf635095c1382118f7414f75
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Tue Jul 31 12:04:31 2007 -0700

    ACPI: fix "Time Problems with 2.6.23-rc1-gf695baf2"

    Enable C3 without bm control only for CST based C3.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/processor_idle.c

index 46841a1476461db653876529921e503f2a80b5e2..8c042f5b1089f56cd299649f9017756ec8ad388b 100644 (file)
@@ -857,11 +857,17 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
        }
 
        if (pr->flags.bm_check) {
-               /* bus mastering control is necessary */
                if (!pr->flags.bm_control) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "C3 support requires bus mastering control\n"));
-                       return;
+                       if (pr->flags.has_cst != 1) {
+                               /* bus mastering control is necessary */
+                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                       "C3 support requires BM control\n"));
+                               return;
+                       } else {
+                               /* Here we enter C3 without bus mastering */
+                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                       "C3 support without BM control\n"));
+                       }
                }
        } else {
                /*