ACPI / LPSS: don't crash if a device has no MMIO resources
PATCH 1/1 ACPI / LPSS: don't crash if a device has no MMIO resources
Intel LPSS devices that are enumerated from ACPI have both MMIO and IRQ resources returned in their _CRS method. However, Apple Macbook Air with Haswell has LPSS devices enumerated from PCI bus instead and _CRS method returns only an interrupt number (but the device has _HID set that causes the scan handler to match it).
The current ACPI / LPSS code sets pdata->dev_desc only when MMIO resource is found for the device and in case of Macbook Air it is never found. That leads to a NULL pointer dereference in register_device_clock().
Correct this by always setting the pdata->dev_desc.
--- drivers/acpi/acpi_lpss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/acpi/acpi_lpss.c +2 -1
@@ -257,12 +257,13 @@ static int acpi_lpss_create_device(struct acpi_device *adev, pdata->mmio_size =resource_size (&rentry->res); pdata->mmio_base =ioremap (rentry->res.start, pdata->mmio_size); - pdata->dev_desc = dev_desc;break ; }acpi_dev_free_resource_list (&resource_list); + pdata->dev_desc = dev_desc; +if (dev_desc->clk_required) { ret =register_device_clock (adev, pdata);if (ret) {
Signature · 1 line
1.8.4.rc3
Rafael J. Wysocki
AppliedQuoted 10 lines · Mika Westerberg
Intel LPSS devices that are enumerated from ACPI have both MMIO and IRQ resources returned in their
_CRSmethod. However, Apple Macbook Air with Haswell has LPSS devices enumerated from PCI bus instead and_CRSmethod returns only an interrupt number (but the device has_HIDset that causes the scan handler to match it).The current ACPI / LPSS code sets
pdata->dev_desconly when MMIO resource is found for the device and in case of Macbook Air it is never found. That leads to a NULL pointer dereference inregister_device_clock().
Quoted 5 lines
Correct this by always setting the
pdata->dev_desc.Reported-and-tested-by Imre Kaloz <[email protected]>Signed-off-by Mika Westerberg <[email protected]>Cc [email protected] # 3.10+
Queued up for 3.12, thanks for taking care of this Mika!
Quoted 24 lines
--- drivers/acpi/acpi_lpss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/acpi/acpi_lpss.c +2
-1@@ -257,12 +257,13 @@ static int acpi_lpss_create_device(struct acpi_device *adev, pdata->mmio_size =resource_size (&rentry->res); pdata->mmio_base =ioremap (rentry->res.start, pdata->mmio_size); - pdata->dev_desc = dev_desc;break ; }acpi_dev_free_resource_list (&resource_list); + pdata->dev_desc = dev_desc; +if (dev_desc->clk_required) { ret =register_device_clock (adev, pdata);if (ret) {
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.