From e137e59310d41364081aa34752d8fdff5dba0cca Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Tue, 3 Nov 2020 18:15:03 +0800 Subject: [PATCH] acrn-config: remove PSRAM_PASSTHROUGH_PRE_RTVM in PSRAM config remove PSRAM_PASSTHROUGH_PRE_RTVM config which is not used in PSRAM config. Tracked-On: #5418 Signed-off-by: Shuang Zheng --- misc/acrn-config/acpi_gen/asl_gen.py | 3 +-- misc/acrn-config/hv_config/board_defconfig.py | 2 -- misc/acrn-config/hv_config/hv_item.py | 6 ------ misc/acrn-config/library/hv_cfg_lib.py | 7 ------- misc/acrn-config/scenario_config/scenario_cfg_gen.py | 1 - misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml | 1 - misc/vm_configs/xmls/config-xmls/template/HV.xml | 1 - misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml | 2 +- 8 files changed, 2 insertions(+), 21 deletions(-) diff --git a/misc/acrn-config/acpi_gen/asl_gen.py b/misc/acrn-config/acpi_gen/asl_gen.py index 4ad665ef5..27f99235b 100644 --- a/misc/acrn-config/acpi_gen/asl_gen.py +++ b/misc/acrn-config/acpi_gen/asl_gen.py @@ -461,8 +461,7 @@ def main(args): PASSTHROUGH_PTCT = False PRELAUNCHED_RTVM_ID = None try: - if scenario_root.find('hv/FEATURES/PSRAM/PSRAM_ENABLED').text.strip() == 'y' \ - and scenario_root.find('hv/FEATURES/PSRAM/PSRAM_PASSTHROUGH_PRE_RTVM').text.strip() == 'y': + if scenario_root.find('hv/FEATURES/PSRAM/PSRAM_ENABLED').text.strip() == 'y': PASSTHROUGH_PTCT = True for vm in scenario_root.findall('vm'): vm_id = vm.attrib['id'] diff --git a/misc/acrn-config/hv_config/board_defconfig.py b/misc/acrn-config/hv_config/board_defconfig.py index 6c628c88b..f879f20d3 100644 --- a/misc/acrn-config/hv_config/board_defconfig.py +++ b/misc/acrn-config/hv_config/board_defconfig.py @@ -179,8 +179,6 @@ def get_features(hv_info, config): print("CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED={}".format(hv_info.features.mce_on_psc_workaround_disabled), file=config) if hv_info.features.psram_enabled in ['y', 'n']: print("CONFIG_PSRAM_ENABLED={}".format(hv_info.features.psram_enabled), file=config) - if hv_info.features.psram_enabled in ['y', 'n']: - print("CONFIG_PSRAM_PRE_RTVM_ENABLED={}".format(hv_info.features.psram_passthrough_pre_rtvm), file=config) def get_capacities(hv_info, config): diff --git a/misc/acrn-config/hv_config/hv_item.py b/misc/acrn-config/hv_config/hv_item.py index d9452f81d..11e6c9866 100644 --- a/misc/acrn-config/hv_config/hv_item.py +++ b/misc/acrn-config/hv_config/hv_item.py @@ -110,7 +110,6 @@ class Features: self.l1d_flush_vmentry_enabled = '' self.mce_on_psc_workaround_disabled = '' self.psram_enabled = '' - self.psram_passthrough_pre_rtvm = '' def get_info(self): self.multiboot2 = common.get_hv_item_tag(self.hv_file, "FEATURES", "MULTIBOOT2") @@ -126,7 +125,6 @@ class Features: self.mce_on_psc_workaround_disabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "MCE_ON_PSC_DISABLED") self.iommu_enforce_snp = common.get_hv_item_tag(self.hv_file, "FEATURES", "IOMMU_ENFORCE_SNP") self.psram_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "PSRAM", "PSRAM_ENABLED") - self.psram_passthrough_pre_rtvm = common.get_hv_item_tag(self.hv_file, "FEATURES", "PSRAM", "PSRAM_PASSTHROUGH_PRE_RTVM") def check_item(self): hv_cfg_lib.ny_support_check(self.multiboot2, "FEATURES", "MULTIBOOT2") @@ -142,11 +140,7 @@ class Features: hv_cfg_lib.ny_support_check(self.mce_on_psc_workaround_disabled, "FEATURES", "MCE_ON_PSC_DISABLED") hv_cfg_lib.ny_support_check(self.iommu_enforce_snp, "FEATURES", "IOMMU_ENFORCE_SNP") # hv_cfg_lib.ny_support_check(self.psram_enabled, "FEATURES", "PSRAM", "PSRAM_ENABLED") - # hv_cfg_lib.ny_support_check(self.psram_passthrough_pre_rtvm, - # "FEATURES", "PSRAM", "PSRAM_PASSTHROUGH_PRE_RTVM") hv_cfg_lib.hv_psram_check(self.psram_enabled, self.cdp_enabled, "FEATURES", "PSRAM", "PSRAM_ENABLED") - hv_cfg_lib.hv_psram_passthrough_pre_rtvm_check(self.psram_passthrough_pre_rtvm, self.psram_enabled, - "FEATURES", "PSRAM", "PSRAM_PASSTHROUGH_PRE_RTVM") class Memory: diff --git a/misc/acrn-config/library/hv_cfg_lib.py b/misc/acrn-config/library/hv_cfg_lib.py index 0c031c710..e692218fc 100644 --- a/misc/acrn-config/library/hv_cfg_lib.py +++ b/misc/acrn-config/library/hv_cfg_lib.py @@ -238,10 +238,3 @@ def hv_psram_check(psram_enabled, cpd_enabled, feature, tag, leaf): if psram_enabled == 'y' and cpd_enabled == 'y': ERR_LIST[key] = "PSRAM_ENABLED should not be y when CDP_ENABLED is y." return - - -def hv_psram_passthrough_pre_rtvm_check(psram_passthrough_pre_rtvm, psram_enabled, feature, tag, leaf): - key = 'hv,{},{},{}'.format(feature, tag, leaf) - if psram_enabled == 'n' and psram_passthrough_pre_rtvm == 'y': - ERR_LIST[key] = "{} should not be y when {} is n.".format(leaf, tag) - return diff --git a/misc/acrn-config/scenario_config/scenario_cfg_gen.py b/misc/acrn-config/scenario_config/scenario_cfg_gen.py index 955e7fd0f..8c7e50c24 100755 --- a/misc/acrn-config/scenario_config/scenario_cfg_gen.py +++ b/misc/acrn-config/scenario_config/scenario_cfg_gen.py @@ -85,7 +85,6 @@ def get_scenario_item_values(board_info, scenario_info): scenario_item_values["hv,FEATURES,IOMMU_ENFORCE_SNP"] = hv_cfg_lib.N_Y scenario_item_values["hv,FEATURES,IVSHMEM,IVSHMEM_ENABLED"] = hv_cfg_lib.N_Y scenario_item_values["hv,FEATURES,PSRAM,PSRAM_ENABLED"] = hv_cfg_lib.N_Y - scenario_item_values["hv,FEATURES,PSRAM,PSRAM_PASSTHROUGH_PRE_RTVM"] = hv_cfg_lib.N_Y scenario_cfg_lib.ERR_LIST.update(hv_cfg_lib.ERR_LIST) return scenario_item_values diff --git a/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml index e87ba146a..8371ba243 100644 --- a/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml +++ b/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml @@ -31,7 +31,6 @@ n - n diff --git a/misc/vm_configs/xmls/config-xmls/template/HV.xml b/misc/vm_configs/xmls/config-xmls/template/HV.xml index 983dea68e..f92b7991d 100644 --- a/misc/vm_configs/xmls/config-xmls/template/HV.xml +++ b/misc/vm_configs/xmls/config-xmls/template/HV.xml @@ -31,7 +31,6 @@ n - n diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml index 2b6c67741..b110241cf 100644 --- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml +++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml @@ -29,7 +29,7 @@ y - y +