From 8ee161daab28a8c9bcd19418d968bb95fc47a190 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sun, 3 Mar 2019 12:49:56 +0100 Subject: arch/x86/acpi: Remove obsolete acpi_gen_regaddr resv field Since ACPI v2.c, this field is access_size. Currently, coreboot is using ACPI v3,so we can drop '.resv' field. Change-Id: I7b3b930861669bb05cdc8e81f6502476a0568fe0 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/31701 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/cpu/amd/family_10h-family_15h/powernow_acpi.c | 4 ++-- src/cpu/intel/common/common_init.c | 8 ++------ src/cpu/intel/model_2065x/model_2065x_init.c | 12 ++++++------ src/cpu/intel/model_206ax/model_206ax_init.c | 12 ++++++------ 4 files changed, 16 insertions(+), 20 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c index 2ce472215f..15b655028c 100644 --- a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c +++ b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c @@ -114,7 +114,7 @@ static void write_cstates_for_core(int coreID) cstate.resource.bit_offset = 0; cstate.resource.addrl = rdmsr(MSR_CSTATE_ADDRESS).lo + 1; cstate.resource.addrh = 0; - cstate.resource.resv = 1; + cstate.resource.access_size = 1; } else { cstate.ctype = 2; cstate.latency = 75; @@ -124,7 +124,7 @@ static void write_cstates_for_core(int coreID) cstate.resource.bit_offset = 0; cstate.resource.addrl = rdmsr(MSR_CSTATE_ADDRESS).lo; cstate.resource.addrh = 0; - cstate.resource.resv = 1; + cstate.resource.access_size = 1; } acpigen_write_CST_package(&cstate, cstate_count); diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c index 321c56cf3f..a568ea14e5 100644 --- a/src/cpu/intel/common/common_init.c +++ b/src/cpu/intel/common/common_init.c @@ -113,9 +113,7 @@ void cpu_init_cppc_config(struct cppc_config *config, u32 version) .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = 8, .bit_offset = 0, - { - .access_size = 4 - }, + .access_size = 4, .addrl = 0, .addrh = 0, }; @@ -123,9 +121,7 @@ void cpu_init_cppc_config(struct cppc_config *config, u32 version) .space_id = ACPI_ADDRESS_SPACE_MEMORY, .bit_width = 0, .bit_offset = 0, - { - .resv = 0 - }, + .access_size = 0, .addrl = 0, .addrh = 0, }; diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index 240bf50737..fd34229688 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -49,7 +49,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 2: C1E */ @@ -60,7 +60,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 3: C3 */ @@ -71,7 +71,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 4: C6 */ @@ -82,7 +82,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 5: C7 */ @@ -93,7 +93,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 6: C7S */ @@ -104,7 +104,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { 0 } diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index 33ad1e79ae..e7462088a9 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -53,7 +53,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 2: C1E */ @@ -64,7 +64,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 3: C3 */ @@ -75,7 +75,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 4: C6 */ @@ -86,7 +86,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 5: C7 */ @@ -97,7 +97,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { /* 6: C7S */ @@ -108,7 +108,7 @@ static acpi_cstate_t cstate_map[] = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, - .resv = ACPI_FFIXEDHW_FLAG_HW_COORD, + .access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, } }, { 0 } -- cgit v1.2.3