diff options
Diffstat (limited to 'source/components/utilities/utxfinit.c')
| -rw-r--r-- | source/components/utilities/utxfinit.c | 47 | 
1 files changed, 12 insertions, 35 deletions
diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c index a8ea3fdf49f4..2a518bc82d99 100644 --- a/source/components/utilities/utxfinit.c +++ b/source/components/utilities/utxfinit.c @@ -168,25 +168,6 @@ AcpiEnableSubsystem (       */      AcpiGbl_EarlyInitialization = FALSE; -    /* -     * Install the default operation region handlers. These are the -     * handlers that are defined by the ACPI specification to be -     * "always accessible" -- namely, SystemMemory, SystemIO, and -     * PCI_Config. This also means that no _REG methods need to be -     * run for these address spaces. We need to have these handlers -     * installed before any AML code can be executed, especially any -     * module-level code (11/2015). -     */ -    if (!AcpiGbl_GroupModuleLevelCode) -    { -        Status = AcpiEvInstallRegionHandlers (); -        if (ACPI_FAILURE (Status)) -        { -            ACPI_EXCEPTION ((AE_INFO, Status, "During Region initialization")); -            return_ACPI_STATUS (Status); -        } -    } -  #if (!ACPI_REDUCED_HARDWARE)      /* Enable ACPI mode */ @@ -315,27 +296,23 @@ AcpiInitializeObjects (      if (AcpiGbl_GroupModuleLevelCode)      {          AcpiNsExecModuleCodeList (); -    } -    /* -     * Initialize the objects that remain uninitialized. This runs the -     * executable AML that may be part of the declaration of these objects: -     * OperationRegions, BufferFields, Buffers, and Packages. -     */ -    if (!(Flags & ACPI_NO_OBJECT_INIT)) -    { -        ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, -            "[Init] Completing Initialization of ACPI Objects\n")); - -        Status = AcpiNsInitializeObjects (); -        if (ACPI_FAILURE (Status)) +        /* +         * Initialize the objects that remain uninitialized. This +         * runs the executable AML that may be part of the +         * declaration of these objects: +         * OperationRegions, BufferFields, Buffers, and Packages. +         */ +        if (!(Flags & ACPI_NO_OBJECT_INIT))          { -            return_ACPI_STATUS (Status); +            Status = AcpiNsInitializeObjects (); +            if (ACPI_FAILURE (Status)) +            { +                return_ACPI_STATUS (Status); +            }          }      } -    AcpiGbl_NamespaceInitialized = TRUE; -      /*       * Initialize all device/region objects in the namespace. This runs       * the device _STA and _INI methods and region _REG methods.  | 
