Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90e97820 authored by Jiang Liu's avatar Jiang Liu Committed by Rafael J. Wysocki
Browse files

resources: Move struct resource_list_entry from ACPI into resource core 



Currently ACPI, PCI and pnp all implement the same resource list
management with different data structure. We need to transfer from
one data structure into another when passing resources from one
subsystem into another subsystem. So move struct resource_list_entry
from ACPI into resource core and rename it as resource_entry,
then it could be reused by different subystems and avoid the data
structure conversion.

Introduce dedicated header file resource_ext.h instead of embedding
it into ioport.h to avoid header file inclusion order issues.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 62d1141f

drivers/acpi/acpi_lpss.c

+4 −4
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
{

	struct lpss_device_desc *dev_desc;

	struct lpss_private_data *pdata;

	struct resource_list_entry *rentry;

	struct resource_entry *rentry;

	struct list_head resource_list;

	struct platform_device *pdev;

	int ret;
@@ -333,12 +333,12 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
		goto err_out;



	list_for_each_entry(rentry, &resource_list, node)

		if (resource_type(&rentry->res) == IORESOURCE_MEM) {

		if (resource_type(rentry->res) == IORESOURCE_MEM) {

			if (dev_desc->prv_size_override)

				pdata->mmio_size = dev_desc->prv_size_override;

			else

				pdata->mmio_size = resource_size(&rentry->res);

			pdata->mmio_base = ioremap(rentry->res.start,

				pdata->mmio_size = resource_size(rentry->res);

			pdata->mmio_base = ioremap(rentry->res->start,

						   pdata->mmio_size);

			break;

		}

drivers/acpi/acpi_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	struct platform_device *pdev = NULL;

	struct acpi_device *acpi_parent;

	struct platform_device_info pdevinfo;

	struct resource_list_entry *rentry;

	struct resource_entry *rentry;

	struct list_head resource_list;

	struct resource *resources = NULL;

	int count;
@@ -71,7 +71,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
		}

		count = 0;

		list_for_each_entry(rentry, &resource_list, node)

			resources[count++] = rentry->res;

			resources[count++] = *rentry->res;



		acpi_dev_free_resource_list(&resource_list);

	}

drivers/acpi/resource.c

+6 −11
Original line number Diff line number Diff line
@@ -444,12 +444,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_resource_interrupt); 
 */

void acpi_dev_free_resource_list(struct list_head *list)

{

	struct resource_list_entry *rentry, *re;



	list_for_each_entry_safe(rentry, re, list, node) {

		list_del(&rentry->node);

		kfree(rentry);

	}

	resource_list_free(list);

}

EXPORT_SYMBOL_GPL(acpi_dev_free_resource_list);
@@ -464,16 +459,16 @@ struct res_proc_context { 
static acpi_status acpi_dev_new_resource_entry(struct resource_win *win,

					       struct res_proc_context *c)

{

	struct resource_list_entry *rentry;

	struct resource_entry *rentry;



	rentry = kmalloc(sizeof(*rentry), GFP_KERNEL);

	rentry = resource_list_create_entry(NULL, 0);

	if (!rentry) {

		c->error = -ENOMEM;

		return AE_NO_MEMORY;

	}

	rentry->res = win->res;

	*rentry->res = win->res;

	rentry->offset = win->offset;

	list_add_tail(&rentry->node, c->list);

	resource_list_add_tail(rentry, c->list);

	c->count++;

	return AE_OK;

}
@@ -534,7 +529,7 @@ static acpi_status acpi_dev_process_resource(struct acpi_resource *ares, 
 * returned as the final error code.

 *

 * The resultant struct resource objects are put on the list pointed to by

 * @list, that must be empty initially, as members of struct resource_list_entry

 * @list, that must be empty initially, as members of struct resource_entry

 * objects.  Callers of this routine should use %acpi_dev_free_resource_list() to

 * free that list.

 *

drivers/dma/acpi-dma.c

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp, 
{

	const struct acpi_csrt_shared_info *si;

	struct list_head resource_list;

	struct resource_list_entry *rentry;

	struct resource_entry *rentry;

	resource_size_t mem = 0, irq = 0;

	int ret;
@@ -56,10 +56,10 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp, 
		return 0;



	list_for_each_entry(rentry, &resource_list, node) {

		if (resource_type(&rentry->res) == IORESOURCE_MEM)

			mem = rentry->res.start;

		else if (resource_type(&rentry->res) == IORESOURCE_IRQ)

			irq = rentry->res.start;

		if (resource_type(rentry->res) == IORESOURCE_MEM)

			mem = rentry->res->start;

		else if (resource_type(rentry->res) == IORESOURCE_IRQ)

			irq = rentry->res->start;

	}



	acpi_dev_free_resource_list(&resource_list);

include/linux/acpi.h

+1 −11
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <linux/errno.h>

#include <linux/ioport.h>	/* for struct resource */

#include <linux/resource_ext.h>

#include <linux/device.h>

#include <linux/property.h>
@@ -285,11 +286,6 @@ extern int pnpacpi_disabled; 


#define PXM_INVAL	(-1)



struct resource_win {

	struct resource res;

	resource_size_t offset;

};



bool acpi_dev_resource_memory(struct acpi_resource *ares, struct resource *res);

bool acpi_dev_resource_io(struct acpi_resource *ares, struct resource *res);

bool acpi_dev_resource_address_space(struct acpi_resource *ares,
@@ -300,12 +296,6 @@ unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable); 
bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,

				 struct resource *res);



struct resource_list_entry {

	struct list_head node;

	struct resource res;

	resource_size_t offset;

};



void acpi_dev_free_resource_list(struct list_head *list);

int acpi_dev_get_resources(struct acpi_device *adev, struct list_head *list,

			   int (*preproc)(struct acpi_resource *, void *),