From 8ccf59a94778fb54cc08368fb58a42b64d9489f6 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 7 May 2018 14:28:53 -0700 Subject: acpi: device: Walk up the tree to find identifier Instead of just checking the immediate parent for an device name, walk up the tree to check if any parent can identify the device. This allows devices to be nested more than one level deep and still have them identified in one place by the SOC. Change-Id: I9938fc20a839db91ff25e91bba08baa7421e3cd4 Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/26172 Reviewed-by: Furquan Shaikh Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/x86/acpi_device.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/arch/x86/acpi_device.c') diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c index c8d313e037..df2226d340 100644 --- a/src/arch/x86/acpi_device.c +++ b/src/arch/x86/acpi_device.c @@ -55,6 +55,9 @@ static void acpi_device_fill_len(void *ptr) /* Locate and return the ACPI name for this device */ const char *acpi_device_name(struct device *dev) { + struct device *pdev = dev; + const char *name; + if (!dev) return NULL; @@ -62,9 +65,16 @@ const char *acpi_device_name(struct device *dev) if (dev->ops->acpi_name) return dev->ops->acpi_name(dev); - /* Check parent device in case it has a global handler */ - if (dev->bus && dev->bus->dev->ops->acpi_name) - return dev->bus->dev->ops->acpi_name(dev); + /* Walk up the tree to find if any parent can identify this device */ + while (pdev->bus) { + if (pdev->path.type == DEVICE_PATH_ROOT) + break; + if (pdev->bus->dev->ops && pdev->bus->dev->ops->acpi_name) + name = pdev->bus->dev->ops->acpi_name(dev); + if (name) + return name; + pdev = pdev->bus->dev; + } return NULL; } -- cgit v1.2.3