Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83677?usp=email )
(
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: device/path: rename domain path struct element to 'domain_id' ......................................................................
device/path: rename domain path struct element to 'domain_id'
Rename the 'domain' element of the 'domain_path' struct to 'domain_id' to clarify that this element is the domain ID.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Suggested-by: Martin Roth gaumless@gmail.com Change-Id: I3995deb83a669699434f0073aed0e12b688bf6e7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83677 Reviewed-by: Matt DeVillier matt.devillier@amd.corp-partner.google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Menzel paulepanter@mailbox.org Reviewed-by: Shuo Liu shuo.liu@intel.com --- M src/device/device_const.c M src/device/device_util.c M src/include/device/path.h M src/soc/intel/xeon_sp/include/soc/chip_common.h M src/soc/intel/xeon_sp/spr/ioat.c M util/sconfig/main.c 6 files changed, 9 insertions(+), 9 deletions(-)
Approvals: Paul Menzel: Looks good to me, but someone else must approve Shuo Liu: Looks good to me, but someone else must approve build bot (Jenkins): Verified Matt DeVillier: Looks good to me, approved
diff --git a/src/device/device_const.c b/src/device/device_const.c index fc76304..9f3443e 100644 --- a/src/device/device_const.c +++ b/src/device/device_const.c @@ -118,7 +118,7 @@ equal = (path1->apic.apic_id == path2->apic.apic_id); break; case DEVICE_PATH_DOMAIN: - equal = (path1->domain.domain == path2->domain.domain); + equal = (path1->domain.domain_id == path2->domain.domain_id); break; case DEVICE_PATH_CPU_CLUSTER: equal = (path1->cpu_cluster.cluster diff --git a/src/device/device_util.c b/src/device/device_util.c index 22dc5f7..3514de7 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -109,7 +109,7 @@ ret |= dev->path.apic.apic_id; break; case DEVICE_PATH_DOMAIN: - ret |= dev->path.domain.domain; + ret |= dev->path.domain.domain_id; break; case DEVICE_PATH_CPU_CLUSTER: ret |= dev->path.cpu_cluster.cluster; @@ -193,7 +193,7 @@ break; case DEVICE_PATH_DOMAIN: snprintf(buffer, sizeof(buffer), "DOMAIN: %08x", - dev->path.domain.domain); + dev->path.domain.domain_id); break; case DEVICE_PATH_CPU_CLUSTER: snprintf(buffer, sizeof(buffer), "CPU_CLUSTER: %01x", @@ -273,12 +273,12 @@ return 0; }
- return domain_dev->path.domain.domain; + return domain_dev->path.domain.domain_id; }
bool is_domain0(const struct device *dev) { - return dev && dev->path.type == DEVICE_PATH_DOMAIN && dev->path.domain.domain == 0; + return dev && dev->path.type == DEVICE_PATH_DOMAIN && dev->path.domain.domain_id == 0; }
bool is_dev_on_domain0(const struct device *dev) diff --git a/src/include/device/path.h b/src/include/device/path.h index f8c4390..d8ef880 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -53,7 +53,7 @@ }
struct domain_path { - unsigned int domain; + unsigned int domain_id; };
struct pci_path { diff --git a/src/soc/intel/xeon_sp/include/soc/chip_common.h b/src/soc/intel/xeon_sp/include/soc/chip_common.h index 4731bec..ed278a3 100644 --- a/src/soc/intel/xeon_sp/include/soc/chip_common.h +++ b/src/soc/intel/xeon_sp/include/soc/chip_common.h @@ -30,7 +30,7 @@ .bus = bus, }; path->type = DEVICE_PATH_DOMAIN; - path->domain.domain = dp.domain_path; + path->domain.domain_id = dp.domain_path; };
/* diff --git a/src/soc/intel/xeon_sp/spr/ioat.c b/src/soc/intel/xeon_sp/spr/ioat.c index 8b9921a..fcc3a20 100644 --- a/src/soc/intel/xeon_sp/spr/ioat.c +++ b/src/soc/intel/xeon_sp/spr/ioat.c @@ -44,7 +44,7 @@ struct device_path path = { .type = DEVICE_PATH_DOMAIN, .domain = { - .domain = new_path.domain_path, + .domain_id = new_path.domain_path, }, }; struct device *const domain = alloc_find_dev(upstream, &path); diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 9acd592..acab06a 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -859,7 +859,7 @@ break;
case DOMAIN: - new_d->path = ".type=DEVICE_PATH_DOMAIN,{.domain={ .domain = 0x%x }}"; + new_d->path = ".type=DEVICE_PATH_DOMAIN,{.domain={ .domain_id = 0x%x }}"; break;
case GENERIC: