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

Commit e44e20ff authored by Len Brown's avatar Len Brown
Browse files

Pull pnpacpi into release branch

parents 3145012c 1c6e7d0a

drivers/pnp/pnpacpi/rsparser.c

+88 −111
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma) 


static void

pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,

	u32 io, u32 len)

	u64 io, u64 len)

{

	int i = 0;

	while (!(res->port_resource[i].flags & IORESOURCE_UNSET) &&
@@ -156,6 +156,27 @@ pnpacpi_parse_allocated_memresource(struct pnp_resource_table * res, 
	}

}



static void

pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,

	struct acpi_resource *res)

{

	struct acpi_resource_address64 addr, *p = &addr;

	acpi_status status;



	status = acpi_resource_to_address64(res, p);

	if (!ACPI_SUCCESS(status)) {

		pnp_warn("PnPACPI: failed to convert resource type %d",

			res->type);

		return;

	}



	if (p->resource_type == ACPI_MEMORY_RANGE)

		pnpacpi_parse_allocated_memresource(res_table,

				p->minimum, p->address_length);

	else if (p->resource_type == ACPI_IO_RANGE)

		pnpacpi_parse_allocated_ioresource(res_table,

				p->minimum, p->address_length);

}



static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,

	void *data)
@@ -221,19 +242,9 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
				res->data.fixed_memory32.address_length);

		break;

	case ACPI_RESOURCE_TYPE_ADDRESS16:

		pnpacpi_parse_allocated_memresource(res_table,

				res->data.address16.minimum,

				res->data.address16.address_length);

		break;

	case ACPI_RESOURCE_TYPE_ADDRESS32:

		pnpacpi_parse_allocated_memresource(res_table,

				res->data.address32.minimum,

				res->data.address32.address_length);

		break;

	case ACPI_RESOURCE_TYPE_ADDRESS64:

		pnpacpi_parse_allocated_memresource(res_table,

		res->data.address64.minimum,

		res->data.address64.address_length);

		pnpacpi_parse_allocated_address_space(res_table, res);

		break;



	case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
@@ -636,13 +647,8 @@ acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle, 
	return status;

}



/*

 * Set resource

 */

static acpi_status pnpacpi_count_resources(struct acpi_resource *res,

	void *data)

static int pnpacpi_supported_resource(struct acpi_resource *res)

{

	int *res_cnt = (int *)data;

	switch (res->type) {

	case ACPI_RESOURCE_TYPE_IRQ:

	case ACPI_RESOURCE_TYPE_DMA:
@@ -655,43 +661,32 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res, 
	case ACPI_RESOURCE_TYPE_ADDRESS32:

	case ACPI_RESOURCE_TYPE_ADDRESS64:

	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:

		(*res_cnt) ++;

	case ACPI_RESOURCE_TYPE_START_DEPENDENT:

	case ACPI_RESOURCE_TYPE_END_DEPENDENT:

	case ACPI_RESOURCE_TYPE_VENDOR:

	case ACPI_RESOURCE_TYPE_END_TAG:

	case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:

	default:

		return AE_OK;

		return 1;

	}

	return AE_OK;

	return 0;

}



static acpi_status pnpacpi_type_resources(struct acpi_resource *res,

/*

 * Set resource

 */

static acpi_status pnpacpi_count_resources(struct acpi_resource *res,

	void *data)

{

	int *res_cnt = (int *)data;



	if (pnpacpi_supported_resource(res))

		(*res_cnt)++;

	return AE_OK;

}



static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)

{

	struct acpi_resource **resource = (struct acpi_resource **)data;

	switch (res->type) {

	case ACPI_RESOURCE_TYPE_IRQ:

	case ACPI_RESOURCE_TYPE_DMA:

	case ACPI_RESOURCE_TYPE_IO:

	case ACPI_RESOURCE_TYPE_FIXED_IO:

	case ACPI_RESOURCE_TYPE_MEMORY24:

	case ACPI_RESOURCE_TYPE_MEMORY32:

	case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:

	case ACPI_RESOURCE_TYPE_ADDRESS16:

	case ACPI_RESOURCE_TYPE_ADDRESS32:

	case ACPI_RESOURCE_TYPE_ADDRESS64:

	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:



	if (pnpacpi_supported_resource(res)) {

		(*resource)->type = res->type;

		(*resource)->length = sizeof(struct acpi_resource);

		(*resource)++;

	case ACPI_RESOURCE_TYPE_START_DEPENDENT:

	case ACPI_RESOURCE_TYPE_END_DEPENDENT:

	case ACPI_RESOURCE_TYPE_VENDOR:

	case ACPI_RESOURCE_TYPE_END_TAG:

	case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:

	default:

		return AE_OK;

	}



	return AE_OK;
@@ -736,10 +731,7 @@ static void pnpacpi_encode_irq(struct acpi_resource *resource, 
{

	int triggering, polarity;



	decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,

		&polarity);

	resource->type = ACPI_RESOURCE_TYPE_IRQ;

	resource->length = sizeof(struct acpi_resource);

	decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);

	resource->data.irq.triggering = triggering;

	resource->data.irq.polarity = polarity;

	if (triggering == ACPI_EDGE_SENSITIVE)
@@ -755,10 +747,7 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource, 
{

	int triggering, polarity;



	decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,

		&polarity);

	resource->type = ACPI_RESOURCE_TYPE_EXTENDED_IRQ;

	resource->length = sizeof(struct acpi_resource);

	decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);

	resource->data.extended_irq.producer_consumer = ACPI_CONSUMER;

	resource->data.extended_irq.triggering = triggering;

	resource->data.extended_irq.polarity = polarity;
@@ -773,8 +762,6 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource, 
static void pnpacpi_encode_dma(struct acpi_resource *resource,

	struct resource *p)

{

	resource->type = ACPI_RESOURCE_TYPE_DMA;

	resource->length = sizeof(struct acpi_resource);

	/* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */

	if (p->flags & IORESOURCE_DMA_COMPATIBLE)

		resource->data.dma.type = ACPI_COMPATIBILITY;
@@ -798,8 +785,6 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource, 
static void pnpacpi_encode_io(struct acpi_resource *resource,

	struct resource *p)

{

	resource->type = ACPI_RESOURCE_TYPE_IO;

	resource->length = sizeof(struct acpi_resource);

	/* Note: pnp_assign_port will copy pnp_port->flags into p->flags */

	resource->data.io.io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR)?

		ACPI_DECODE_16 : ACPI_DECODE_10;
@@ -812,8 +797,6 @@ static void pnpacpi_encode_io(struct acpi_resource *resource, 
static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,

	struct resource *p)

{

	resource->type = ACPI_RESOURCE_TYPE_FIXED_IO;

	resource->length = sizeof(struct acpi_resource);

	resource->data.fixed_io.address = p->start;

	resource->data.fixed_io.address_length = p->end - p->start + 1;

}
@@ -821,8 +804,6 @@ static void pnpacpi_encode_fixed_io(struct acpi_resource *resource, 
static void pnpacpi_encode_mem24(struct acpi_resource *resource,

	struct resource *p)

{

	resource->type = ACPI_RESOURCE_TYPE_MEMORY24;

	resource->length = sizeof(struct acpi_resource);

	/* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */

	resource->data.memory24.write_protect =

		(p->flags & IORESOURCE_MEM_WRITEABLE) ?
@@ -836,8 +817,6 @@ static void pnpacpi_encode_mem24(struct acpi_resource *resource, 
static void pnpacpi_encode_mem32(struct acpi_resource *resource,

	struct resource *p)

{

	resource->type = ACPI_RESOURCE_TYPE_MEMORY32;

	resource->length = sizeof(struct acpi_resource);

	resource->data.memory32.write_protect =

		(p->flags & IORESOURCE_MEM_WRITEABLE) ?

		ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
@@ -850,8 +829,6 @@ static void pnpacpi_encode_mem32(struct acpi_resource *resource, 
static void pnpacpi_encode_fixed_mem32(struct acpi_resource *resource,

	struct resource *p)

{

	resource->type = ACPI_RESOURCE_TYPE_FIXED_MEMORY32;

	resource->length = sizeof(struct acpi_resource);

	resource->data.fixed_memory32.write_protect =

		(p->flags & IORESOURCE_MEM_WRITEABLE) ?

		ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;