Revert "AcpiGetObjectInfo: Add support for ACPI 5.0 _SUB method."

This reverts commit 8e7a8753827660c3dd1f571f3185610402b756f0.

The _SUB method was found to be problematic for this interface
because some implementations use control methods. Therefore,
it is being removed.

Operations cannot be used because this interface is called
during the device discovery scan and the region handlers are
not fully installed at that time.

Conflicts:
	source/components/debugger/dbdisply.c
	source/components/namespace/nsxfname.c
	source/components/utilities/utids.c
	source/include/acnames.h
	source/include/actypes.h
	source/tools/acpinames/anstubs.c

5 files changed, 24 insertions, 141 deletions

diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c
index e167a6e98..ffdfd143d 100644
--- a/source/components/debugger/dbdisply.c
+++ b/source/components/debugger/dbdisply.c
@@ -728,7 +728,7 @@ AcpiDbDisplayCallingTree (
  *
  * FUNCTION:    AcpiDbDisplayObjectType
  *
- * PARAMETERS:  Name            - User entered NS node handle or name
+ * PARAMETERS:  ObjectArg       - User entered NS node handle
  *
  * RETURN:      None
  *
@@ -738,21 +738,17 @@ AcpiDbDisplayCallingTree (
 
 void
 AcpiDbDisplayObjectType (
-    char                    *Name)
+    char                    *ObjectArg)
 {
-    ACPI_NAMESPACE_NODE     *Node;
+    ACPI_HANDLE             Handle;
     ACPI_DEVICE_INFO        *Info;
     ACPI_STATUS             Status;
     UINT32                  i;
 
 
-    Node = AcpiDbConvertToNode (Name);
-    if (!Node)
-    {
-        return;
-    }
+    Handle = ACPI_TO_POINTER (strtoul (ObjectArg, NULL, 16));
 
-    Status = AcpiGetObjectInfo (ACPI_CAST_PTR (ACPI_HANDLE, Node), &Info);
+    Status = AcpiGetObjectInfo (Handle, &Info);
     if (ACPI_FAILURE (Status))
     {
         AcpiOsPrintf ("Could not get object info, %s\n",
@@ -760,25 +756,18 @@ AcpiDbDisplayObjectType (
         return;
     }
 
-    if (Info->Valid & ACPI_VALID_ADR)
-    {
-        AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n",
-            ACPI_FORMAT_UINT64 (Info->Address),
-            Info->CurrentStatus, Info->Flags);
-    }
-    if (Info->Valid & ACPI_VALID_SXDS)
-    {
-        AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n",
-            Info->HighestDstates[0], Info->HighestDstates[1],
-            Info->HighestDstates[2], Info->HighestDstates[3]);
-    }
-    if (Info->Valid & ACPI_VALID_SXWS)
-    {
-        AcpiOsPrintf ("S0W-%2.2X S1W-%2.2X S2W-%2.2X S3W-%2.2X S4W-%2.2X\n",
-            Info->LowestDstates[0], Info->LowestDstates[1],
-            Info->LowestDstates[2], Info->LowestDstates[3],
-            Info->LowestDstates[4]);
-    }
+    AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n",
+        ACPI_FORMAT_UINT64 (Info->Address),
+        Info->CurrentStatus, Info->Flags);
+
+    AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n",
+        Info->HighestDstates[0], Info->HighestDstates[1],
+        Info->HighestDstates[2], Info->HighestDstates[3]);
+
+    AcpiOsPrintf ("S0W-%2.2X S1W-%2.2X S2W-%2.2X S3W-%2.2X S4W-%2.2X\n",
+        Info->LowestDstates[0], Info->LowestDstates[1],
+        Info->LowestDstates[2], Info->LowestDstates[3],
+        Info->LowestDstates[4]);
 
     if (Info->Valid & ACPI_VALID_HID)
     {
@@ -790,11 +779,6 @@ AcpiDbDisplayObjectType (
         AcpiOsPrintf ("UID: %s\n", Info->UniqueId.String);
     }
 
-    if (Info->Valid & ACPI_VALID_SUB)
-    {
-        AcpiOsPrintf ("SUB: %s\n", Info->SubsystemId.String);
-    }
-
     if (Info->Valid & ACPI_VALID_CID)
     {
         for (i = 0; i < Info->CompatibleIdList.Count; i++)
diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c
index 574f3dc5a..7251aeed8 100644
--- a/source/components/namespace/nsxfname.c
+++ b/source/components/namespace/nsxfname.c
@@ -337,7 +337,6 @@ AcpiNsCopyDeviceId (
     ACPI_PNP_DEVICE_ID      *Source,
     char                    *StringArea)
 {
-
     /* Create the destination PNP_DEVICE_ID */
 
     Dest->String = StringArea;
@@ -363,8 +362,8 @@ AcpiNsCopyDeviceId (
  *              namespace node and possibly by running several standard
  *              control methods (Such as in the case of a device.)
  *
- * For Device and Processor objects, run the Device _HID, _UID, _CID, _SUB,
- * _CLS, _STA, _ADR, _SxW, and _SxD methods.
+ * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA,
+ * _CLS, _ADR, _SxW, and _SxD methods.
  *
  * Note: Allocates the return buffer, must be freed by the caller.
  *
@@ -380,7 +379,6 @@ AcpiGetObjectInfo (
     ACPI_PNP_DEVICE_ID_LIST *CidList = NULL;
     ACPI_PNP_DEVICE_ID      *Hid = NULL;
     ACPI_PNP_DEVICE_ID      *Uid = NULL;
-    ACPI_PNP_DEVICE_ID      *Sub = NULL;
     ACPI_PNP_DEVICE_ID      *Cls = NULL;
     char                    *NextIdString;
     ACPI_OBJECT_TYPE        Type;
@@ -434,7 +432,7 @@ AcpiGetObjectInfo (
     {
         /*
          * Get extra info for ACPI Device/Processor objects only:
-         * Run the Device _HID, _UID, _SUB, _CID, and _CLS methods.
+         * Run the Device _HID, _UID, _CLS, and _CID methods.
          *
          * Note: none of these methods are required, so they may or may
          * not be present for this device. The Info->Valid bitfield is used
@@ -459,15 +457,6 @@ AcpiGetObjectInfo (
             Valid |= ACPI_VALID_UID;
         }
 
-        /* Execute the Device._SUB method */
-
-        Status = AcpiUtExecute_SUB (Node, &Sub);
-        if (ACPI_SUCCESS (Status))
-        {
-            InfoSize += Sub->Length;
-            Valid |= ACPI_VALID_SUB;
-        }
-
         /* Execute the Device._CID method */
 
         Status = AcpiUtExecute_CID (Node, &CidList);
@@ -570,9 +559,8 @@ AcpiGetObjectInfo (
     }
 
     /*
-     * Copy the HID, UID, SUB, and CIDs to the return buffer.
-     * The variable-length strings are copied to the reserved area
-     * at the end of the buffer.
+     * Copy the HID, UID, and CIDs to the return buffer. The variable-length
+     * strings are copied to the reserved area at the end of the buffer.
      *
      * For HID and CID, check if the ID is a PCI Root Bridge.
      */
@@ -593,12 +581,6 @@ AcpiGetObjectInfo (
             Uid, NextIdString);
     }
 
-    if (Sub)
-    {
-        NextIdString = AcpiNsCopyDeviceId (&Info->SubsystemId,
-            Sub, NextIdString);
-    }
-
     if (CidList)
     {
         Info->CompatibleIdList.Count = CidList->Count;
@@ -645,10 +627,6 @@ Cleanup:
     {
         ACPI_FREE (Uid);
     }
-    if (Sub)
-    {
-        ACPI_FREE (Sub);
-    }
     if (CidList)
     {
         ACPI_FREE (CidList);
diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c
index 26895b2f4..6d9a59fd5 100644
--- a/source/components/utilities/utids.c
+++ b/source/components/utilities/utids.c
@@ -212,78 +212,6 @@ Cleanup:
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiUtExecute_SUB
- *
- * PARAMETERS:  DeviceNode          - Node for the device
- *              ReturnId            - Where the _SUB is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Executes the _SUB control method that returns the subsystem
- *              ID of the device. The _SUB value is always a string containing
- *              either a valid PNP or ACPI ID.
- *
- *              NOTE: Internal function, no parameter validation
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiUtExecute_SUB (
-    ACPI_NAMESPACE_NODE     *DeviceNode,
-    ACPI_PNP_DEVICE_ID      **ReturnId)
-{
-    ACPI_OPERAND_OBJECT     *ObjDesc;
-    ACPI_PNP_DEVICE_ID      *Sub;
-    UINT32                  Length;
-    ACPI_STATUS             Status;
-
-
-    ACPI_FUNCTION_TRACE (UtExecute_SUB);
-
-
-    Status = AcpiUtEvaluateObject (DeviceNode, METHOD_NAME__SUB,
-        ACPI_BTYPE_STRING, &ObjDesc);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    /* Get the size of the String to be returned, includes null terminator */
-
-    Length = ObjDesc->String.Length + 1;
-
-    /* Allocate a buffer for the SUB */
-
-    Sub = ACPI_ALLOCATE_ZEROED (
-        sizeof (ACPI_PNP_DEVICE_ID) + (ACPI_SIZE) Length);
-    if (!Sub)
-    {
-        Status = AE_NO_MEMORY;
-        goto Cleanup;
-    }
-
-    /* Area for the string starts after PNP_DEVICE_ID struct */
-
-    Sub->String = ACPI_ADD_PTR (char, Sub, sizeof (ACPI_PNP_DEVICE_ID));
-
-    /* Simply copy existing string */
-
-    strcpy (Sub->String, ObjDesc->String.Pointer);
-    Sub->Length = Length;
-    *ReturnId = Sub;
-
-
-Cleanup:
-
-    /* On exit, we must delete the return object */
-
-    AcpiUtRemoveReference (ObjDesc);
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
  * FUNCTION:    AcpiUtExecute_UID
  *
  * PARAMETERS:  DeviceNode          - Node for the device
diff --git a/source/include/actypes.h b/source/include/actypes.h
index e9e765d64..09a2d8245 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -1304,7 +1304,7 @@ UINT32 (*ACPI_INTERFACE_HANDLER) (
 #define ACPI_PCICLS_STRING_SIZE         7   /* Includes null terminator */
 
 
-/* Structures used for device/processor HID, UID, CID, and SUB */
+/* Structures used for device/processor HID, UID, CID */
 
 typedef struct acpi_pnp_device_id
 {
@@ -1339,7 +1339,6 @@ typedef struct acpi_device_info
     UINT64                          Address;            /* _ADR value */
     ACPI_PNP_DEVICE_ID              HardwareId;         /* _HID value */
     ACPI_PNP_DEVICE_ID              UniqueId;           /* _UID value */
-    ACPI_PNP_DEVICE_ID              SubsystemId;        /* _SUB value */
     ACPI_PNP_DEVICE_ID              ClassCode;          /* _CLS value */
     ACPI_PNP_DEVICE_ID_LIST         CompatibleIdList;   /* _CID list <must be last> */
 
@@ -1355,13 +1354,12 @@ typedef struct acpi_device_info
 #define ACPI_VALID_ADR                  0x0002
 #define ACPI_VALID_HID                  0x0004
 #define ACPI_VALID_UID                  0x0008
-#define ACPI_VALID_SUB                  0x0010
 #define ACPI_VALID_CID                  0x0020
 #define ACPI_VALID_CLS                  0x0040
 #define ACPI_VALID_SXDS                 0x0100
 #define ACPI_VALID_SXWS                 0x0200
 
-/* Flags for _STA return value (CurrentStatus above) */
+/* Flags for _STA method */
 
 #define ACPI_STA_DEVICE_PRESENT         0x01
 #define ACPI_STA_DEVICE_ENABLED         0x02
diff --git a/source/include/acutils.h b/source/include/acutils.h
index ac3bd8bef..c85ab838f 100644
--- a/source/include/acutils.h
+++ b/source/include/acutils.h
@@ -569,11 +569,6 @@ AcpiUtExecute_UID (
     ACPI_PNP_DEVICE_ID      **ReturnId);
 
 ACPI_STATUS
-AcpiUtExecute_SUB (
-    ACPI_NAMESPACE_NODE     *DeviceNode,
-    ACPI_PNP_DEVICE_ID      **ReturnId);
-
-ACPI_STATUS
 AcpiUtExecute_CID (
     ACPI_NAMESPACE_NODE     *DeviceNode,
     ACPI_PNP_DEVICE_ID_LIST **ReturnCidList);