提交 baf1584b 编写于 作者: A Alison Schofield 提交者: Yang Yingliang

acpi/hmat: Update acpi_hmat_type enum with ACPI_HMAT_TYPE_PROXIMITY

mainline inclusion
from mainline-v5.2-rc1
commit 57f5cf6e
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V
CVE: NA

--------------------------------

ACPI 6.3 changed the subtable "Memory Subsystem Address Range Structure"
to "Memory Proximity Domain Attributes Structure".

Updating and renaming of the structure was included in commit:
ACPICA: ACPI 6.3: HMAT updates (9a8d961f)

Rename the enum type to match the subtable and structure naming.
Signed-off-by: NAlison Schofield <alison.schofield@intel.com>
Acked-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 38bc892a
...@@ -411,7 +411,7 @@ static int __init hmat_parse_subtable(union acpi_subtable_headers *header, ...@@ -411,7 +411,7 @@ static int __init hmat_parse_subtable(union acpi_subtable_headers *header,
return -EINVAL; return -EINVAL;
switch (hdr->type) { switch (hdr->type) {
case ACPI_HMAT_TYPE_ADDRESS_RANGE: case ACPI_HMAT_TYPE_PROXIMITY:
return hmat_parse_proximity_domain(header, end); return hmat_parse_proximity_domain(header, end);
case ACPI_HMAT_TYPE_LOCALITY: case ACPI_HMAT_TYPE_LOCALITY:
return hmat_parse_locality(header, end); return hmat_parse_locality(header, end);
...@@ -649,7 +649,7 @@ static __init int hmat_init(void) ...@@ -649,7 +649,7 @@ static __init int hmat_init(void)
goto out_put; goto out_put;
} }
for (i = ACPI_HMAT_TYPE_ADDRESS_RANGE; i < ACPI_HMAT_TYPE_RESERVED; i++) { for (i = ACPI_HMAT_TYPE_PROXIMITY; i < ACPI_HMAT_TYPE_RESERVED; i++) {
if (acpi_table_parse_entries(ACPI_SIG_HMAT, if (acpi_table_parse_entries(ACPI_SIG_HMAT,
sizeof(struct acpi_table_hmat), i, sizeof(struct acpi_table_hmat), i,
hmat_parse_subtable, 0) < 0) { hmat_parse_subtable, 0) < 0) {
......
...@@ -1390,7 +1390,7 @@ struct acpi_table_hmat { ...@@ -1390,7 +1390,7 @@ struct acpi_table_hmat {
/* Values for HMAT structure types */ /* Values for HMAT structure types */
enum acpi_hmat_type { enum acpi_hmat_type {
ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subystem address range */ ACPI_HMAT_TYPE_PROXIMITY = 0, /* Memory proximity domain attributes */
ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */ ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */
ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */ ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */
ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */ ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册