From b6c0558b60513235a206a3b7aebeca95366572d6 Mon Sep 17 00:00:00 2001 From: Vijay Dhanraj Date: Fri, 28 Feb 2020 16:54:54 -0800 Subject: [PATCH] HV: Update existing board.c files for RDT MBA This patch updates board.c files for RDT MBA on existing platforms. Also, fixes setting RDT flag in WHL config file. Tracked-On: #3725 Signed-off-by: Vijay Dhanraj Acked-by: Eddie Dong --- hypervisor/arch/x86/configs/apl-mrb/board.c | 1 + hypervisor/arch/x86/configs/apl-up2/board.c | 1 + hypervisor/arch/x86/configs/dnv-cb2/board.c | 1 + hypervisor/arch/x86/configs/generic/board.c | 1 + hypervisor/arch/x86/configs/icl-rvp/board.c | 1 + hypervisor/arch/x86/configs/nuc6cayh/board.c | 1 + hypervisor/arch/x86/configs/nuc7i7dnb/board.c | 1 + hypervisor/arch/x86/configs/whl-ipc-i5.config | 2 +- hypervisor/arch/x86/configs/whl-ipc-i5/board.c | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hypervisor/arch/x86/configs/apl-mrb/board.c b/hypervisor/arch/x86/configs/apl-mrb/board.c index 70c937298..f8d343fab 100644 --- a/hypervisor/arch/x86/configs/apl-mrb/board.c +++ b/hypervisor/arch/x86/configs/apl-mrb/board.c @@ -18,6 +18,7 @@ struct dmar_info plat_dmar_info; #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/apl-up2/board.c b/hypervisor/arch/x86/configs/apl-up2/board.c index 8ab72dbe7..0bed8032d 100644 --- a/hypervisor/arch/x86/configs/apl-up2/board.c +++ b/hypervisor/arch/x86/configs/apl-up2/board.c @@ -36,6 +36,7 @@ struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM] = { .msr_index = MSR_IA32_L2_MASK_BASE + 3U, }, }; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/dnv-cb2/board.c b/hypervisor/arch/x86/configs/dnv-cb2/board.c index c877990a8..65fa4cbfc 100644 --- a/hypervisor/arch/x86/configs/dnv-cb2/board.c +++ b/hypervisor/arch/x86/configs/dnv-cb2/board.c @@ -18,6 +18,7 @@ struct dmar_info plat_dmar_info; #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/generic/board.c b/hypervisor/arch/x86/configs/generic/board.c index c877990a8..65fa4cbfc 100644 --- a/hypervisor/arch/x86/configs/generic/board.c +++ b/hypervisor/arch/x86/configs/generic/board.c @@ -18,6 +18,7 @@ struct dmar_info plat_dmar_info; #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/icl-rvp/board.c b/hypervisor/arch/x86/configs/icl-rvp/board.c index c877990a8..65fa4cbfc 100644 --- a/hypervisor/arch/x86/configs/icl-rvp/board.c +++ b/hypervisor/arch/x86/configs/icl-rvp/board.c @@ -18,6 +18,7 @@ struct dmar_info plat_dmar_info; #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/nuc6cayh/board.c b/hypervisor/arch/x86/configs/nuc6cayh/board.c index c877990a8..65fa4cbfc 100644 --- a/hypervisor/arch/x86/configs/nuc6cayh/board.c +++ b/hypervisor/arch/x86/configs/nuc6cayh/board.c @@ -18,6 +18,7 @@ struct dmar_info plat_dmar_info; #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/nuc7i7dnb/board.c b/hypervisor/arch/x86/configs/nuc7i7dnb/board.c index c7ef59918..e68bbacc6 100644 --- a/hypervisor/arch/x86/configs/nuc7i7dnb/board.c +++ b/hypervisor/arch/x86/configs/nuc7i7dnb/board.c @@ -59,6 +59,7 @@ struct dmar_info plat_dmar_info = { #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif const struct cpu_state_table board_cpu_state_tbl; diff --git a/hypervisor/arch/x86/configs/whl-ipc-i5.config b/hypervisor/arch/x86/configs/whl-ipc-i5.config index 6ae1d68f0..77266588b 100644 --- a/hypervisor/arch/x86/configs/whl-ipc-i5.config +++ b/hypervisor/arch/x86/configs/whl-ipc-i5.config @@ -7,4 +7,4 @@ CONFIG_SERIAL_LEGACY=y CONFIG_SERIAL_PIO_BASE=0x3F8 CONFIG_HV_RAM_START=0x11000000 CONFIG_HV_RAM_SIZE=0x7800000 -CONFIG_RDT_ENABLED +CONFIG_RDT_ENABLED=n diff --git a/hypervisor/arch/x86/configs/whl-ipc-i5/board.c b/hypervisor/arch/x86/configs/whl-ipc-i5/board.c index 7c9afae7a..92c4f5651 100644 --- a/hypervisor/arch/x86/configs/whl-ipc-i5/board.c +++ b/hypervisor/arch/x86/configs/whl-ipc-i5/board.c @@ -72,6 +72,7 @@ struct dmar_info plat_dmar_info = { #ifdef CONFIG_RDT_ENABLED struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM]; struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM]; +struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM]; #endif static const struct cpu_cx_data board_cpu_cx[3] = {