mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 08:42:10 +00:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git
This commit is contained in:
commit
912d751faf
@ -442,9 +442,9 @@ static __init int hmat_parse_locality(union acpi_subtable_headers *header,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
pr_info("Locality: Flags:%02x Type:%s Initiator Domains:%u Target Domains:%u Base:%lld\n",
|
||||
hmat_loc->flags, hmat_data_type(type), ipds, tpds,
|
||||
hmat_loc->entry_base_unit);
|
||||
pr_debug("Locality: Flags:%02x Type:%s Initiator Domains:%u Target Domains:%u Base:%lld\n",
|
||||
hmat_loc->flags, hmat_data_type(type), ipds, tpds,
|
||||
hmat_loc->entry_base_unit);
|
||||
|
||||
inits = (u32 *)(hmat_loc + 1);
|
||||
targs = inits + ipds;
|
||||
@ -455,9 +455,9 @@ static __init int hmat_parse_locality(union acpi_subtable_headers *header,
|
||||
value = hmat_normalize(entries[init * tpds + targ],
|
||||
hmat_loc->entry_base_unit,
|
||||
type);
|
||||
pr_info(" Initiator-Target[%u-%u]:%u%s\n",
|
||||
inits[init], targs[targ], value,
|
||||
hmat_data_type_suffix(type));
|
||||
pr_debug(" Initiator-Target[%u-%u]:%u%s\n",
|
||||
inits[init], targs[targ], value,
|
||||
hmat_data_type_suffix(type));
|
||||
|
||||
hmat_update_target(targs[targ], inits[init],
|
||||
mem_hier, type, value);
|
||||
@ -485,9 +485,9 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header,
|
||||
}
|
||||
|
||||
attrs = cache->cache_attributes;
|
||||
pr_info("Cache: Domain:%u Size:%llu Attrs:%08x SMBIOS Handles:%d\n",
|
||||
cache->memory_PD, cache->cache_size, attrs,
|
||||
cache->number_of_SMBIOShandles);
|
||||
pr_debug("Cache: Domain:%u Size:%llu Attrs:%08x SMBIOS Handles:%d\n",
|
||||
cache->memory_PD, cache->cache_size, attrs,
|
||||
cache->number_of_SMBIOShandles);
|
||||
|
||||
target = find_mem_target(cache->memory_PD);
|
||||
if (!target)
|
||||
@ -546,9 +546,9 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
|
||||
}
|
||||
|
||||
if (hmat_revision == 1)
|
||||
pr_info("Memory (%#llx length %#llx) Flags:%04x Processor Domain:%u Memory Domain:%u\n",
|
||||
p->reserved3, p->reserved4, p->flags, p->processor_PD,
|
||||
p->memory_PD);
|
||||
pr_debug("Memory (%#llx length %#llx) Flags:%04x Processor Domain:%u Memory Domain:%u\n",
|
||||
p->reserved3, p->reserved4, p->flags, p->processor_PD,
|
||||
p->memory_PD);
|
||||
else
|
||||
pr_info("Memory Flags:%04x Processor Domain:%u Memory Domain:%u\n",
|
||||
p->flags, p->processor_PD, p->memory_PD);
|
||||
|
Loading…
Reference in New Issue
Block a user