Local change: Remove warnings from vendor files.

Approved by:	njl
MFC after:	1 week

3 files changed, 54 insertions, 62 deletions

diff --git a/sys/contrib/dev/acpica/hwregs.c b/sys/contrib/dev/acpica/hwregs.c
index 613884e92eae..bdd9bab8c0a4 100644
--- a/sys/contrib/dev/acpica/hwregs.c
+++ b/sys/contrib/dev/acpica/hwregs.c
@@ -3,7 +3,7 @@
  *
  * Module Name: hwregs - Read/write access functions for the various ACPI
  *                       control and status registers.
- *              $Revision: 156 $
+ *              $Revision: 162 $
  *
  ******************************************************************************/
 
@@ -135,6 +135,7 @@
  * RETURN:      none
  *
  * DESCRIPTION: Clears all fixed and general purpose status bits
+ *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
  *
  ******************************************************************************/
 
@@ -182,7 +183,7 @@ AcpiHwClearAcpiStatus (
 
     /* Clear the GPE Bits in all GPE registers in all GPE blocks */
 
-    Status = AcpiEvWalkGpeList (AcpiHwClearGpeBlock);
+    Status = AcpiEvWalkGpeList (AcpiHwClearGpeBlock, ACPI_ISR);
 
 UnlockAndExit:
     if (Flags & ACPI_MTX_LOCK)
@@ -337,8 +338,8 @@ AcpiHwGetBitRegisterInfo (
  *              ReturnValue     - Value that was read from the register
  *              Flags           - Lock the hardware or not
  *
- * RETURN:      Value is read from specified Register.  Value returned is
- *              normalized to bit0 (is shifted all the way right)
+ * RETURN:      Status and the value read from specified Register.  Value
+ *              returned is normalized to bit0 (is shifted all the way right)
  *
  * DESCRIPTION: ACPI BitRegister read function.
  *
@@ -375,6 +376,8 @@ AcpiGetRegister (
         }
     }
 
+    /* Read from the register */
+
     Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK,
                     BitRegInfo->ParentRegister, &RegisterValue);
 
@@ -406,10 +409,10 @@ AcpiGetRegister (
  *
  * PARAMETERS:  RegisterId      - ID of ACPI BitRegister to access
  *              Value           - (only used on write) value to write to the
- *                                Register, NOT pre-normalized to the bit pos.
+ *                                Register, NOT pre-normalized to the bit pos
  *              Flags           - Lock the hardware or not
  *
- * RETURN:      None
+ * RETURN:      Status
  *
  * DESCRIPTION: ACPI Bit Register write function.
  *
@@ -562,10 +565,11 @@ UnlockAndExit:
  *
  * FUNCTION:    AcpiHwRegisterRead
  *
- * PARAMETERS:  UseLock                - Mutex hw access.
- *              RegisterId             - RegisterID + Offset.
+ * PARAMETERS:  UseLock             - Mutex hw access
+ *              RegisterId          - RegisterID + Offset
+ *              ReturnValue         - Value that was read from the register
  *
- * RETURN:      Value read or written.
+ * RETURN:      Status and the value read.
  *
  * DESCRIPTION: Acpi register read function.  Registers are read at the
  *              given offset.
@@ -681,10 +685,11 @@ UnlockAndExit:
  *
  * FUNCTION:    AcpiHwRegisterWrite
  *
- * PARAMETERS:  UseLock                - Mutex hw access.
- *              RegisterId             - RegisterID + Offset.
+ * PARAMETERS:  UseLock             - Mutex hw access
+ *              RegisterId          - RegisterID + Offset
+ *              Value               - The value to write
  *
- * RETURN:      Value read or written.
+ * RETURN:      Status
  *
  * DESCRIPTION: Acpi register Write function.  Registers are written at the
  *              given offset.
@@ -807,11 +812,11 @@ UnlockAndExit:
  *
  * PARAMETERS:  Width               - 8, 16, or 32
  *              Value               - Where the value is returned
- *              Register            - GAS register structure
+ *              Reg                 - GAS register structure
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Read from either memory, IO, or PCI config space.
+ * DESCRIPTION: Read from either memory or IO space.
  *
  ******************************************************************************/
 
@@ -821,8 +826,7 @@ AcpiHwLowLevelRead (
     UINT32                  *Value,
     ACPI_GENERIC_ADDRESS    *Reg)
 {
-    ACPI_PCI_ID             PciId;
-    UINT16                  PciRegister;
+    UINT64                  Address;
     ACPI_STATUS             Status;
 
 
@@ -834,43 +838,37 @@ AcpiHwLowLevelRead (
      * a non-zero address within. However, don't return an error
      * because the PM1A/B code must not fail if B isn't present.
      */
-    if ((!Reg) ||
-        (!ACPI_VALID_ADDRESS (Reg->Address)))
+    if (!Reg)
+    {
+        return (AE_OK);
+    }
+
+    /* Get a local copy of the address.  Handles possible alignment issues */
+
+    ACPI_MOVE_64_TO_64 (&Address, &Reg->Address);
+    if (!ACPI_VALID_ADDRESS (Address))
     {
         return (AE_OK);
     }
     *Value = 0;
 
     /*
-     * Three address spaces supported:
-     * Memory, IO, or PCI_Config.
+     * Two address spaces supported: Memory or IO.
+     * PCI_Config is not supported here because the GAS struct is insufficient
      */
     switch (Reg->AddressSpaceId)
     {
     case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
         Status = AcpiOsReadMemory (
-                    (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Reg->Address),
+                    (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Address),
                     Value, Width);
         break;
 
 
     case ACPI_ADR_SPACE_SYSTEM_IO:
 
-        Status = AcpiOsReadPort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Reg->Address),
-                    Value, Width);
-        break;
-
-
-    case ACPI_ADR_SPACE_PCI_CONFIG:
-
-        PciId.Segment  = 0;
-        PciId.Bus      = 0;
-        PciId.Device   = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (Reg->Address));
-        PciId.Function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (Reg->Address));
-        PciRegister    = (UINT16) ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address));
-
-        Status = AcpiOsReadPciConfiguration  (&PciId, PciRegister,
+        Status = AcpiOsReadPort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Address),
                     Value, Width);
         break;
 
@@ -883,7 +881,7 @@ AcpiHwLowLevelRead (
 
     ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
             *Value, Width,
-            ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Reg->Address)),
+            ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Address)),
             AcpiUtGetRegionName (Reg->AddressSpaceId)));
 
     return (Status);
@@ -896,11 +894,11 @@ AcpiHwLowLevelRead (
  *
  * PARAMETERS:  Width               - 8, 16, or 32
  *              Value               - To be written
- *              Register            - GAS register structure
+ *              Reg                 - GAS register structure
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Write to either memory, IO, or PCI config space.
+ * DESCRIPTION: Write to either memory or IO space.
  *
  ******************************************************************************/
 
@@ -910,8 +908,7 @@ AcpiHwLowLevelWrite (
     UINT32                  Value,
     ACPI_GENERIC_ADDRESS    *Reg)
 {
-    ACPI_PCI_ID             PciId;
-    UINT16                  PciRegister;
+    UINT64                  Address;
     ACPI_STATUS             Status;
 
 
@@ -923,46 +920,40 @@ AcpiHwLowLevelWrite (
      * a non-zero address within. However, don't return an error
      * because the PM1A/B code must not fail if B isn't present.
      */
-    if ((!Reg) ||
-        (!ACPI_VALID_ADDRESS (Reg->Address)))
+    if (!Reg)
+    {
+        return (AE_OK);
+    }
+
+    /* Get a local copy of the address.  Handles possible alignment issues */
+
+    ACPI_MOVE_64_TO_64 (&Address, &Reg->Address);
+    if (!ACPI_VALID_ADDRESS (Address))
     {
         return (AE_OK);
     }
 
     /*
-     * Three address spaces supported:
-     * Memory, IO, or PCI_Config.
+     * Two address spaces supported: Memory or IO.
+     * PCI_Config is not supported here because the GAS struct is insufficient
      */
     switch (Reg->AddressSpaceId)
     {
     case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
         Status = AcpiOsWriteMemory (
-                    (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Reg->Address),
+                    (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Address),
                     Value, Width);
         break;
 
 
     case ACPI_ADR_SPACE_SYSTEM_IO:
 
-        Status = AcpiOsWritePort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Reg->Address),
+        Status = AcpiOsWritePort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Address),
                     Value, Width);
         break;
 
 
-    case ACPI_ADR_SPACE_PCI_CONFIG:
-
-        PciId.Segment  = 0;
-        PciId.Bus      = 0;
-        PciId.Device   = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (Reg->Address));
-        PciId.Function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (Reg->Address));
-        PciRegister    = (UINT16) ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address));
-
-        Status = AcpiOsWritePciConfiguration (&PciId, PciRegister,
-                    (ACPI_INTEGER) Value, Width);
-        break;
-
-
     default:
         ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
             "Unsupported address space: %X\n", Reg->AddressSpaceId));
@@ -971,7 +962,7 @@ AcpiHwLowLevelWrite (
 
     ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
             Value, Width,
-            ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Reg->Address)),
+            ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Address)),
             AcpiUtGetRegionName (Reg->AddressSpaceId)));
 
     return (Status);
diff --git a/sys/contrib/dev/acpica/uteval.c b/sys/contrib/dev/acpica/uteval.c
index 7269927028d8..5d765c4de18a 100644
--- a/sys/contrib/dev/acpica/uteval.c
+++ b/sys/contrib/dev/acpica/uteval.c
@@ -771,7 +771,7 @@ AcpiUtExecute_Sxds (
             {
                 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                     "%s on Device %4.4s, %s\n",
-                    (char *) (uintptr_t)AcpiGbl_HighestDstateNames[i],
+                    (char *) (uintptr_t) AcpiGbl_HighestDstateNames[i],
                     AcpiUtGetNodeName (DeviceNode),
                     AcpiFormatException (Status)));
 
diff --git a/sys/contrib/dev/acpica/utglobal.c b/sys/contrib/dev/acpica/utglobal.c
index f1b183e539fa..027a77404279 100644
--- a/sys/contrib/dev/acpica/utglobal.c
+++ b/sys/contrib/dev/acpica/utglobal.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: utglobal - Global variables for the ACPI subsystem
- *              $Revision: 201 $
+ *              $Revision: 202 $
  *
  *****************************************************************************/
 
@@ -947,6 +947,7 @@ AcpiUtInitGlobals (
 
     AcpiGbl_SystemNotify.Handler        = NULL;
     AcpiGbl_DeviceNotify.Handler        = NULL;
+    AcpiGbl_ExceptionHandler            = NULL;
     AcpiGbl_InitHandler                 = NULL;
 
     /* Global "typed" ACPI table pointers */