From 8badd8cfed744c254520808890d7351b88e1b9c4 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Wed, 31 Jul 2024 12:02:06 +0100 Subject: [PATCH 11/32] x86: Fix missing fields for EMR support There are two missing fields in the s_emr_config array causing build issues with modern versions of gcc. Fix this. Fixes: d3fcffc6a9cc ("x86: Add initial support for EMR") Signed-off-by: Colin Ian King --- x86/skl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x86/skl.c b/x86/skl.c index 17cfbcc..a80a868 100644 --- a/x86/skl.c +++ b/x86/skl.c @@ -64,11 +64,11 @@ static plat_event_config_t s_spr_config[PERF_COUNT_NUM] = { }; static plat_event_config_t s_emr_config[PERF_COUNT_NUM] = { - { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.core" }, - { PERF_TYPE_RAW, 0x012A, 0x53, 0x730000001, "off_core_response_0" }, - { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.ref" }, - { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, "instr_retired.any" }, - { PERF_TYPE_RAW, 0x012B, 0x53, 0x104000001, "off_core_response_1" } + { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, 0, 0, "cpu_clk_unhalted.core" }, + { PERF_TYPE_RAW, 0x012A, 0x53, 0x730000001, 0, 0, "off_core_response_0" }, + { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, 0, 0, "cpu_clk_unhalted.ref" }, + { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, 0, 0, "instr_retired.any" }, + { PERF_TYPE_RAW, 0x012B, 0x53, 0x104000001, 0, 0, "off_core_response_1" } }; static plat_event_config_t s_skl_ll = { -- 2.41.0