Commit a45de93e authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Original-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e044d8f9

arch/ia64/kernel/acpi-ext.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

arch/ia64/pci/pci.c

+7 −7
Original line number Diff line number Diff line
@@ -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)) {

arch/x86/pci/acpi.c

+13 −13
Original line number Diff line number Diff line
@@ -231,23 +231,23 @@ static acpi_status resource_to_addr(struct acpi_resource *resource, 
	case ACPI_RESOURCE_TYPE_MEMORY24:

		memory24 = &resource->data.memory24;

		addr->resource_type = ACPI_MEMORY_RANGE;

		addr->minimum = memory24->minimum;

		addr->address_length = memory24->address_length;

		addr->maximum = addr->minimum + addr->address_length - 1;

		addr->address.minimum = memory24->minimum;

		addr->address.address_length = memory24->address_length;

		addr->address.maximum = addr->address.minimum + addr->address.address_length - 1;

		return AE_OK;

	case ACPI_RESOURCE_TYPE_MEMORY32:

		memory32 = &resource->data.memory32;

		addr->resource_type = ACPI_MEMORY_RANGE;

		addr->minimum = memory32->minimum;

		addr->address_length = memory32->address_length;

		addr->maximum = addr->minimum + addr->address_length - 1;

		addr->address.minimum = memory32->minimum;

		addr->address.address_length = memory32->address_length;

		addr->address.maximum = addr->address.minimum + addr->address.address_length - 1;

		return AE_OK;

	case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:

		fixed_memory32 = &resource->data.fixed_memory32;

		addr->resource_type = ACPI_MEMORY_RANGE;

		addr->minimum = fixed_memory32->address;

		addr->address_length = fixed_memory32->address_length;

		addr->maximum = addr->minimum + addr->address_length - 1;

		addr->address.minimum = fixed_memory32->address;

		addr->address.address_length = fixed_memory32->address_length;

		addr->address.maximum = addr->address.minimum + addr->address.address_length - 1;

		return AE_OK;

	case ACPI_RESOURCE_TYPE_ADDRESS16:

	case ACPI_RESOURCE_TYPE_ADDRESS32:
@@ -256,7 +256,7 @@ static acpi_status resource_to_addr(struct acpi_resource *resource, 
		if (ACPI_SUCCESS(status) &&

		    (addr->resource_type == ACPI_MEMORY_RANGE ||

		    addr->resource_type == ACPI_IO_RANGE) &&

		    addr->address_length > 0) {

		    addr->address.address_length > 0) {

			return AE_OK;

		}

		break;
@@ -298,8 +298,8 @@ static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data) 
	} else

		return AE_OK;



	start = addr.minimum + addr.translation_offset;

	orig_end = end = addr.maximum + addr.translation_offset;

	start = addr.address.minimum + addr.address.translation_offset;

	orig_end = end = addr.address.maximum + addr.address.translation_offset;



	/* Exclude non-addressable range or non-addressable portion of range */

	end = min(end, (u64)iomem_resource.end);
@@ -320,7 +320,7 @@ static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data) 
	res->flags = flags;

	res->start = start;

	res->end = end;

	info->res_offset[info->res_num] = addr.translation_offset;

	info->res_offset[info->res_num] = addr.address.translation_offset;

	info->res_num++;



	if (!pci_use_crs)

arch/x86/pci/mmconfig-shared.c

+3 −3
Original line number Diff line number Diff line
@@ -397,12 +397,12 @@ static acpi_status check_mcfg_resource(struct acpi_resource *res, void *data) 


	status = acpi_resource_to_address64(res, &address);

	if (ACPI_FAILURE(status) ||

	   (address.address_length <= 0) ||

	   (address.address.address_length <= 0) ||

	   (address.resource_type != ACPI_MEMORY_RANGE))

		return AE_OK;



	if ((mcfg_res->start >= address.minimum) &&

	    (mcfg_res->end < (address.minimum + address.address_length))) {

	if ((mcfg_res->start >= address.address.minimum) &&

	    (mcfg_res->end < (address.address.minimum + address.address.address_length))) {

		mcfg_res->flags = 1;

		return AE_CTRL_TERMINATE;

	}

drivers/acpi/acpi_memhotplug.c

+4 −4
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context) 
		/* Can we combine the resource range information? */

		if ((info->caching == address64.info.mem.caching) &&

		    (info->write_protect == address64.info.mem.write_protect) &&

		    (info->start_addr + info->length == address64.minimum)) {

			info->length += address64.address_length;

		    (info->start_addr + info->length == address64.address.minimum)) {

			info->length += address64.address.address_length;

			return AE_OK;

		}

	}
@@ -114,8 +114,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context) 
	INIT_LIST_HEAD(&new->list);

	new->caching = address64.info.mem.caching;

	new->write_protect = address64.info.mem.write_protect;

	new->start_addr = address64.minimum;

	new->length = address64.address_length;

	new->start_addr = address64.address.minimum;

	new->length = address64.address.address_length;

	list_add_tail(&new->list, &mem_device->res_list);



	return AE_OK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE