From 101685de0c1a61f8940d007abcacfa5cc4291791 Mon Sep 17 00:00:00 2001 From: Shuo Liu Date: Thu, 18 Apr 2024 00:44:42 +0800 Subject: [PATCH] device_util: Handle domain device in dev_get_domain When the input device pointer pointing to a domain device, dev_get_domain returns the input device itself. TEST=Build and boot on intel/archercity CRB Change-Id: I3a278a8f573de95406ee256fba17767def4ad75d Signed-off-by: Shuo Liu Reviewed-on: https://review.coreboot.org/c/coreboot/+/81957 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/device/device_util.c | 2 +- src/soc/intel/xeon_sp/chip_common.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/device/device_util.c b/src/device/device_util.c index 5e353c2734..7dcf081820 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -252,9 +252,9 @@ const struct device *dev_get_domain(const struct device *dev) { /* Walk up the tree up to the domain */ while (dev && dev->upstream && !is_root_device(dev)) { - dev = dev->upstream->dev; if (dev->path.type == DEVICE_PATH_DOMAIN) return dev; + dev = dev->upstream->dev; } return NULL; diff --git a/src/soc/intel/xeon_sp/chip_common.c b/src/soc/intel/xeon_sp/chip_common.c index d8e7d143b0..d0eab02972 100644 --- a/src/soc/intel/xeon_sp/chip_common.c +++ b/src/soc/intel/xeon_sp/chip_common.c @@ -136,11 +136,7 @@ int iio_pci_domain_socket_from_dev(const struct device *dev) const struct device *domain; union xeon_domain_path dn; - if (dev->path.type == DEVICE_PATH_DOMAIN) - domain = dev; - else - domain = dev_get_domain(dev); - + domain = dev_get_domain(dev); if (!domain) return -1; @@ -162,11 +158,7 @@ int iio_pci_domain_stack_from_dev(const struct device *dev) const struct device *domain; union xeon_domain_path dn; - if (dev->path.type == DEVICE_PATH_DOMAIN) - domain = dev; - else - domain = dev_get_domain(dev); - + domain = dev_get_domain(dev); if (!domain) return -1;