Skip to content

Commit

Permalink
ACPI: Set length even for TYPE_END_TAG acpi resource
Browse files Browse the repository at this point in the history
Found with a network device in QEMU/KVM guest not working anymore.

Bisected to commit c13085e
    ACPICA: Resource Mgr: Prevent infinite loops in resource walks

That commit will check acpi_resource length strictly which causes
acpi_set_current_resources to return failure and IRQ for PCI
devices is not set properly.

Set length for all those TYPE_END_TAG acpi_resources.

[rjw: Changelog]
Bisected-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Yinghai Lu authored and Rafael J. Wysocki committed Mar 24, 2013
1 parent eccc534 commit f084dbb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/acpi/pci_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)

}
resource->end.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->end.length = sizeof(struct acpi_resource);

/* Attempt to set the resource */
status = acpi_set_current_resources(link->device->handle, &buffer);
Expand Down
3 changes: 2 additions & 1 deletion drivers/platform/x86/sony-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -4121,7 +4121,7 @@ static int sony_pic_enable(struct acpi_device *device,
resource->res3.data.irq.sharable = ACPI_SHARED;

resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG;

resource->res4.length = sizeof(struct acpi_resource);
}
/* setup Type 2/3 resources */
else {
Expand All @@ -4140,6 +4140,7 @@ static int sony_pic_enable(struct acpi_device *device,
resource->res2.data.irq.sharable = ACPI_SHARED;

resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->res3.length = sizeof(struct acpi_resource);
}

/* Attempt to set the resource */
Expand Down
1 change: 1 addition & 0 deletions drivers/pnp/pnpacpi/rsparser.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
}
/* resource will pointer the end resource now */
resource->type = ACPI_RESOURCE_TYPE_END_TAG;
resource->length = sizeof(struct acpi_resource);

return 0;
}
Expand Down

0 comments on commit f084dbb

Please sign in to comment.