ACPICA: Sanity check global lock bits before ACPI mode is enabled
Thomas Renninger
PATCH 1/1 ACPICA: Sanity check global lock bits before ACPI mode is enabled
Be careful, not even compile tested!
Reason for moving AcpiTbInitializeFacs:
Doing the sanity check shortly after enabling ACPI mode may more often show:
if (AcpiGbl_FACS.GlobalLock & 0x1) {
ACPI_INFO ((AE_INFO, "Global lock acquired by BIOS before"
" ACPI mode got enabled"));Because it's expected that BIOS may do quite some HW accesses when acpi got enabled (assumption).
--- source/components/tables/tbutils.c | 21 +++++++++++++++++++-- source/components/utilities/utxface.c | 23 ++++++++++++----------- 2 files changed, 31 insertions(+), 13 deletions(-)
source/components/tables/tbutils.c +19 -2
@@ -159,10 +159,27 @@ AcpiTbInitializeFacs ( {ACPI_STATUS Status; - Status =AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS ,ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER , &AcpiGbl_FACS)); -return (Status); + +if (ACPI_FAILURE (Status)) +return (Status); + +/* +* Do some sanity checks on the Global Lock: A value of 0x1 is +* possible but could be a hint for a hard to debug issue. +* A value of 0x3 must not happen, but we try to handle it gracefully. +*/ +if (AcpiGbl_FACS.GlobalLock &0x1 ) { +ACPI_INFO ((AE_INFO ,"Global lock acquired by BIOS before" +" ACPI mode got enabled" )); +if (AcpiGbl_FACS.GlobalLock &0x3 ) { +ACPI_ERROR ((AE_INFO ,"Found stale global lock pending bits" )); + AcpiGbl_FACS.GlobalLock &= ~0x3 ; + } + } + +return (AE_OK ); }
source/components/utilities/utxface.c +12 -11
@@ -193,6 +193,18 @@ AcpiInitializeSubsystem (return_ACPI_STATUS (Status); } +/* +* Obtain a permanent mapping for the FACS. This is required for the +* Global Lock and the Firmware Waking Vector +*/ + Status =AcpiTbInitializeFacs (); +if (ACPI_FAILURE (Status)) + { +ACPI_WARNING ((AE_INFO ,"Could not map the FACS table" )); +return_ACPI_STATUS (Status); + } + +/* Initialize the global OSI interfaces list with the static names */ Status =AcpiUtInitializeInterfaces ();
@@ -251,17 +263,6 @@ AcpiEnableSubsystem ( }/* -* Obtain a permanent mapping for the FACS. This is required for the -* Global Lock and the Firmware Waking Vector -*/ - Status =AcpiTbInitializeFacs (); -if (ACPI_FAILURE (Status)) - { -ACPI_WARNING ((AE_INFO ,"Could not map the FACS table" )); -return_ACPI_STATUS (Status); - } - -/* * Install the default OpRegion handlers. These are installed unless * other handlers have already been installed via the * InstallAddressSpaceHandler interface.
Signature · 1 line
1.6.3
Rafael J. Wysocki
Quoted 1 line · Thomas Renninger
Be careful, not even compile tested!
Appears reasonable from a quick look.
Quoted 94 lines
Reason for moving AcpiTbInitializeFacs:
Doing the sanity check shortly after enabling ACPI mode may more often show:if (AcpiGbl_FACS.GlobalLock & 0x1) { ACPI_INFO ((AE_INFO, "Global lock acquired by BIOS before" " ACPI mode got enabled"));Because it's expected that BIOS may do quite some HW accesses when acpi got enabled (assumption).
CC Lin Ming <ming.m.lin(a)intel.com>CC Len Brown <lenb(a)kernel.org>CC Rafael Wysocki <rjw(a)suse.com>CC devel(a)acpica.orgSigned-off-by Thomas Renninger <trenn(a)suse.de>--- source/components/tables/tbutils.c | 21 +++++++++++++++++++-- source/components/utilities/utxface.c | 23 ++++++++++++----------- 2 files changed, 31 insertions(+), 13 deletions(-)source/components/tables/tbutils.c +19
-2@@ -159,10 +159,27 @@ AcpiTbInitializeFacs ( {ACPI_STATUS Status; - Status =AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS ,ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER , &AcpiGbl_FACS)); -return (Status); + +if (ACPI_FAILURE (Status)) +return (Status); + +/* +* Do some sanity checks on the Global Lock: A value of 0x1 is +* possible but could be a hint for a hard to debug issue. +* A value of 0x3 must not happen, but we try to handle it gracefully. +*/ +if (AcpiGbl_FACS.GlobalLock &0x1 ) { +ACPI_INFO ((AE_INFO ,"Global lock acquired by BIOS before" +" ACPI mode got enabled" )); +if (AcpiGbl_FACS.GlobalLock &0x3 ) { +ACPI_ERROR ((AE_INFO ,"Found stale global lock pending bits" )); + AcpiGbl_FACS.GlobalLock &= ~0x3 ; + } + } + +return (AE_OK ); }source/components/utilities/utxface.c +12
-11@@ -193,6 +193,18 @@ AcpiInitializeSubsystem (return_ACPI_STATUS (Status); } +/* +* Obtain a permanent mapping for the FACS. This is required for the +* Global Lock and the Firmware Waking Vector +*/ + Status =AcpiTbInitializeFacs (); +if (ACPI_FAILURE (Status)) + { +ACPI_WARNING ((AE_INFO ,"Could not map the FACS table" )); +return_ACPI_STATUS (Status); + } + +/* Initialize the global OSI interfaces list with the static names */ Status =AcpiUtInitializeInterfaces ();@@ -251,17 +263,6 @@ AcpiEnableSubsystem ( }/* -* Obtain a permanent mapping for the FACS. This is required for the -* Global Lock and the Firmware Waking Vector -*/ - Status =AcpiTbInitializeFacs (); -if (ACPI_FAILURE (Status)) - { -ACPI_WARNING ((AE_INFO ,"Could not map the FACS table" )); -return_ACPI_STATUS (Status); - } - -/* * Install the default OpRegion handlers. These are installed unless * other handlers have already been installed via the * InstallAddressSpaceHandler interface.
Lin Ming
Quoted 1 line · Thomas Renninger
Be careful, not even compile tested!
Compile error,
- AcpiGbl_FACS.GlobalLock
+ AcpiGbl_FACS->GlobalLock
Thanks,
Lin Ming
Quoted 94 lines
Reason for moving AcpiTbInitializeFacs:
Doing the sanity check shortly after enabling ACPI mode may more often show:if (AcpiGbl_FACS.GlobalLock & 0x1) { ACPI_INFO ((AE_INFO, "Global lock acquired by BIOS before" " ACPI mode got enabled"));Because it's expected that BIOS may do quite some HW accesses when acpi got enabled (assumption).
CC Lin Ming <ming.m.lin(a)intel.com>CC Len Brown <lenb(a)kernel.org>CC Rafael Wysocki <rjw(a)suse.com>CC devel(a)acpica.orgSigned-off-by Thomas Renninger <trenn(a)suse.de>--- source/components/tables/tbutils.c | 21 +++++++++++++++++++-- source/components/utilities/utxface.c | 23 ++++++++++++----------- 2 files changed, 31 insertions(+), 13 deletions(-)source/components/tables/tbutils.c +19
-2@@ -159,10 +159,27 @@ AcpiTbInitializeFacs ( {ACPI_STATUS Status; - Status =AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS ,ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER , &AcpiGbl_FACS)); -return (Status); + +if (ACPI_FAILURE (Status)) +return (Status); + +/* +* Do some sanity checks on the Global Lock: A value of 0x1 is +* possible but could be a hint for a hard to debug issue. +* A value of 0x3 must not happen, but we try to handle it gracefully. +*/ +if (AcpiGbl_FACS.GlobalLock &0x1 ) { +ACPI_INFO ((AE_INFO ,"Global lock acquired by BIOS before" +" ACPI mode got enabled" )); +if (AcpiGbl_FACS.GlobalLock &0x3 ) { +ACPI_ERROR ((AE_INFO ,"Found stale global lock pending bits" )); + AcpiGbl_FACS.GlobalLock &= ~0x3 ; + } + } + +return (AE_OK ); }source/components/utilities/utxface.c +12
-11@@ -193,6 +193,18 @@ AcpiInitializeSubsystem (return_ACPI_STATUS (Status); } +/* +* Obtain a permanent mapping for the FACS. This is required for the +* Global Lock and the Firmware Waking Vector +*/ + Status =AcpiTbInitializeFacs (); +if (ACPI_FAILURE (Status)) + { +ACPI_WARNING ((AE_INFO ,"Could not map the FACS table" )); +return_ACPI_STATUS (Status); + } + +/* Initialize the global OSI interfaces list with the static names */ Status =AcpiUtInitializeInterfaces ();@@ -251,17 +263,6 @@ AcpiEnableSubsystem ( }/* -* Obtain a permanent mapping for the FACS. This is required for the -* Global Lock and the Firmware Waking Vector -*/ - Status =AcpiTbInitializeFacs (); -if (ACPI_FAILURE (Status)) - { -ACPI_WARNING ((AE_INFO ,"Could not map the FACS table" )); -return_ACPI_STATUS (Status); - } - -/* * Install the default OpRegion handlers. These are installed unless * other handlers have already been installed via the * InstallAddressSpaceHandler interface.