ACPICA: Resources: Provide common part for struct acpi_resource_address structures.

struct acpi_resource_address and struct acpi_resource_extended_address64 share substracts
just at different offsets. To unify the parsing functions, OSPMs like Linux
need a new ACPI_ADDRESS64_ATTRIBUTE as their substructs, so they can
extract the shared data.

This patch also synchronizes the structure changes to the Linux kernel.
The usages are searched by matching the following keywords:
1. acpi_resource_address
2. acpi_resource_extended_address
3. ACPI_RESOURCE_TYPE_ADDRESS
4. ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS
And we found and fixed the usages in the following files:
 arch/ia64/kernel/acpi-ext.c
 arch/ia64/pci/pci.c
 arch/x86/pci/acpi.c
 arch/x86/pci/mmconfig-shared.c
 drivers/xen/xen-acpi-memhotplug.c
 drivers/acpi/acpi_memhotplug.c
 drivers/acpi/pci_root.c
 drivers/acpi/resource.c
 drivers/char/hpet.c
 drivers/pnp/pnpacpi/rsparser.c
 drivers/hv/vmbus_drv.c

Build tests are passed with defconfig/allnoconfig/allyesconfig and
defconfig+CONFIG_ACPI=n.

Original-by: Thomas Gleixner <tglx@linutronix.de>
Original-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index 8b9318d311a0..bd09bf74f187 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -69,10 +69,10 @@ static acpi_status find_csr_space(struct acpi_resource *resource, void *data)
         status = acpi_resource_to_address64(resource, &addr);
         if (ACPI_SUCCESS(status) &&
             addr.resource_type == ACPI_MEMORY_RANGE &&
-            addr.address_length &&
+            addr.address.address_length &&
             addr.producer_consumer == ACPI_CONSUMER) {
-                space->base = addr.minimum;
-                space->length = addr.address_length;
+                space->base = addr.address.minimum;
+                space->length = addr.address.address_length;
                 return AE_CTRL_TERMINATE;
         }
         return AE_OK;           /* keep looking */
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 291a582777cf..46920aaa7e9e 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -188,12 +188,12 @@ static u64 add_io_space(struct pci_root_info *info,
 
         name = (char *)(iospace + 1);
 
-        min = addr->minimum;
-        max = min + addr->address_length - 1;
+        min = addr->address.minimum;
+        max = min + addr->address.address_length - 1;
         if (addr->info.io.translation_type == ACPI_SPARSE_TRANSLATION)
                 sparse = 1;
 
-        space_nr = new_space(addr->translation_offset, sparse);
+        space_nr = new_space(addr->address.translation_offset, sparse);
         if (space_nr == ~0)
                 goto free_resource;
 
@@ -247,7 +247,7 @@ static acpi_status resource_to_window(struct acpi_resource *resource,
         if (ACPI_SUCCESS(status) &&
             (addr->resource_type == ACPI_MEMORY_RANGE ||
              addr->resource_type == ACPI_IO_RANGE) &&
-            addr->address_length &&
+            addr->address.address_length &&
             addr->producer_consumer == ACPI_PRODUCER)
                 return AE_OK;
 
@@ -284,7 +284,7 @@ static acpi_status add_window(struct acpi_resource *res, void *data)
         if (addr.resource_type == ACPI_MEMORY_RANGE) {
                 flags = IORESOURCE_MEM;
                 root = &iomem_resource;
-                offset = addr.translation_offset;
+                offset = addr.address.translation_offset;
         } else if (addr.resource_type == ACPI_IO_RANGE) {
                 flags = IORESOURCE_IO;
                 root = &ioport_resource;
@@ -297,8 +297,8 @@ static acpi_status add_window(struct acpi_resource *res, void *data)
         resource = &info->res[info->res_num];
         resource->name = info->name;
         resource->flags = flags;
-        resource->start = addr.minimum + offset;
-        resource->end = resource->start + addr.address_length - 1;
+        resource->start = addr.address.minimum + offset;
+        resource->end = resource->start + addr.address.address_length - 1;
         info->res_offset[info->res_num] = offset;
 
         if (insert_resource(root, resource)) {