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

Commit 89935315 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

PNP / ACPI: proper handling of ACPI IO/Memory resource parsing failures 



Before commit b355cee8 (ACPI / resources: ignore invalid ACPI
device resources), 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 b355cee8, those functions return false if the
given memory/IO resource entry is invalid (the length of the resource
is zero).

This breaks pnpacpi_allocated_resource(), because it now recognizes
the invalid memory/io resources as resources of unknown type.  Thus
users see confusing warning messages on machines with zero length
ACPI memory/IO resources.

Fix the problem by rearranging pnpacpi_allocated_resource() so that
it calls acpi_dev_resource_memory() for memory type and IO type
resources only, respectively.

Fixes: b355cee8 (ACPI / resources: ignore invalid ACPI device resources)
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reported-and-tested-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
Reported-and-tested-by: default avatarJulian Wollrath <jwollrath@web.de>
Reported-and-tested-by: default avatarPaul Bolle <pebolle@tiscali.nl>
[rjw: Changelog]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent fa389e22

drivers/pnp/pnpacpi/rsparser.c

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