RE: [PATCH] PNPACPI: proper handling ACPI IO/Memory resources

[Zhang, Rui]

Julian, Markus and Paul,

Can you please check if this patch fixes the problem for you or not?

Thanks,
rui

> -----Original Message-----
> From: Zhang, Rui
> Sent: Tuesday, March 11, 2014 10:40 PM
> To: linux-acpi@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Cc: Wysocki, Rafael J; jwollrath@xxxxxx; markus@xxxxxxxxxxxxxxx;
> pebolle@xxxxxxxxxx; Zhang, Rui
> Subject: [PATCH] PNPACPI: proper handling ACPI IO/Memory resources
> Importance: High
> 
> Before commit b355cee88e3b1a193f0e9a81db810f6f83ad728b,
> if acpi_dev_resource_memory()/acpi_dev_resource_io() returns false, it
> means the the resource is not a memeory/IO resource.
> 
> But after commit b355cee88e3b1a193f0e9a81db810f6f83ad728b,
> if the memory/IO resource is invalid (the length of the resource is
> zero),
> acpi_dev_resource_memory()/acpi_dev_resource_io() returns false as well.
> 
> This breaks pnpacpi_allocated_resource(), because the current code
> would recognize the invalid memory/io resource as unknown resource type.
> Thus users will get warning messages on machines with zero length ACPI
> memeory/IO resources.
> 
> This patch fixes the problem by invoking acpi_dev_resource_memory()/
> acpi_dev_resource_io() for ACPI memory/IO resources only.
> 
> Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
> ---
>  drivers/pnp/pnpacpi/rsparser.c |   15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/pnp/pnpacpi/rsparser.c
> b/drivers/pnp/pnpacpi/rsparser.c index 167f3d0..66977eb 100644
> --- a/drivers/pnp/pnpacpi/rsparser.c
> +++ b/drivers/pnp/pnpacpi/rsparser.c
> @@ -183,9 +183,7 @@ static acpi_status
> pnpacpi_allocated_resource(struct acpi_resource *res,
>  	struct resource r = {0};
>  	int i, flags;
> 
> -	if (acpi_dev_resource_memory(res, &r)
> -	    || acpi_dev_resource_io(res, &r)
> -	    || acpi_dev_resource_address_space(res, &r)
> +	if (acpi_dev_resource_address_space(res, &r)
>  	    || acpi_dev_resource_ext_address_space(res, &r)) {
>  		pnp_add_resource(dev, &r);
>  		return AE_OK;
> @@ -217,6 +215,17 @@ static acpi_status
> pnpacpi_allocated_resource(struct acpi_resource *res,
>  	}
> 
>  	switch (res->type) {
> +	case ACPI_RESOURCE_TYPE_MEMORY24:
> +	case ACPI_RESOURCE_TYPE_MEMORY32:
> +	case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
> +		if (acpi_dev_resource_memory(res, &r))
> +			pnp_add_resource(dev, &r);
> +		break;
> +	case ACPI_RESOURCE_TYPE_IO:
> +	case ACPI_RESOURCE_TYPE_FIXED_IO:
> +		if (acpi_dev_resource_io(res, &r))
> +			pnp_add_resource(dev, &r);
> +		break;
>  	case ACPI_RESOURCE_TYPE_DMA:
>  		dma = &res->data.dma;
>  		if (dma->channel_count > 0 && dma->channels[0] != (u8) -1)
> --
> 1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/