From e37f85745346b3a79aa37dd2a149ca3ec17a5d77 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Sat, 25 Jul 2020 16:22:59 +0800 Subject: [PATCH] acrn-config: fix build issue for TGL/EHL There is some macro defined in misc_cfg.h while CAT/MBA enabled. include the missing header to solve build issue. Tracked-On: #5092 Signed-off-by: Wei Liu Acked-by: Victor Sun --- misc/acrn-config/board_config/board_c.py | 1 + misc/acrn-config/board_config/misc_cfg_h.py | 4 ++-- misc/acrn-config/scenario_config/vm_configurations_h.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/misc/acrn-config/board_config/board_c.py b/misc/acrn-config/board_config/board_c.py index 88501aa27..b2a2a0b0d 100644 --- a/misc/acrn-config/board_config/board_c.py +++ b/misc/acrn-config/board_config/board_c.py @@ -19,6 +19,7 @@ INCLUDE_HEADER = """ #include #include #include +#include """ MSR_IA32_L2_MASK_BASE = 0x00000D10 diff --git a/misc/acrn-config/board_config/misc_cfg_h.py b/misc/acrn-config/board_config/misc_cfg_h.py index ee3283383..7a1f3c1c3 100644 --- a/misc/acrn-config/board_config/misc_cfg_h.py +++ b/misc/acrn-config/board_config/misc_cfg_h.py @@ -231,12 +231,12 @@ def generate_file(config): mba_delay_list = common.get_hv_item_tag(common.SCENARIO_INFO_FILE, "FEATURES", "RDT", "MBA_DELAY") idx = 0 for mba_delay_mask in mba_delay_list: - print("#define MBA_MASK_{}\t{}U".format(idx, mba_delay_mask), file=config) + print("#define MBA_MASK_{}\t\t\t{}U".format(idx, mba_delay_mask), file=config) idx += 1 idx = 0 for cat_mask in cat_mask_list: - print("#define CLOS_MASK_{}\t{}U".format(idx, cat_mask), file=config) + print("#define CLOS_MASK_{}\t\t\t{}U".format(idx, cat_mask), file=config) idx += 1 print("", file=config) diff --git a/misc/acrn-config/scenario_config/vm_configurations_h.py b/misc/acrn-config/scenario_config/vm_configurations_h.py index b0b830d76..091d3953f 100644 --- a/misc/acrn-config/scenario_config/vm_configurations_h.py +++ b/misc/acrn-config/scenario_config/vm_configurations_h.py @@ -49,7 +49,7 @@ def clos_config_output(scenario_items, i, config): if board_cfg_lib.is_rdt_supported() and hv_info.features.rdt_enabled == 'y': clos_config = vm_info.get_clos_bitmap(i) - print("#define VM{0}_VCPU_CLOS\t\t{1}".format(i, clos_config['clos_map']), file=config) + print("#define VM{0}_VCPU_CLOS\t\t\t{1}".format(i, clos_config['clos_map']), file=config) def scenario_vm_num(scenario_items, config):