diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/device_const.c | 2 | ||||
| -rw-r--r-- | src/device/device_util.c | 8 | ||||
| -rw-r--r-- | src/include/device/path.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/include/soc/chip_common.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/spr/ioat.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/device/device_const.c b/src/device/device_const.c index fc76304994..9f3443e94c 100644 --- a/src/device/device_const.c +++ b/src/device/device_const.c @@ -118,7 +118,7 @@ static int path_eq(const struct device_path *path1, 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 22dc5f7499..3514de7cd5 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -109,7 +109,7 @@ u32 dev_path_encode(const struct device *dev) 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 @@ const char *dev_path(const struct device *dev) 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 @@ unsigned int dev_get_domain_id(const struct device *dev) 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 f8c43901c5..d8ef88033b 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -53,7 +53,7 @@ enum device_path_type { } 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 4731bec2d7..ed278a3cd2 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 @@ static inline void init_xeon_domain_path(struct device_path *path, int socket, .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 8b9921a5df..fcc3a20e2d 100644 --- a/src/soc/intel/xeon_sp/spr/ioat.c +++ b/src/soc/intel/xeon_sp/spr/ioat.c @@ -44,7 +44,7 @@ static struct device *const create_ioat_domain(const union xeon_domain_path dp, 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); |