From d013801daa509ce266eaba32aaa5264e76611bc7 Mon Sep 17 00:00:00 2001
From: Zide Chen <zide.chen@intel.com>
Date: Mon, 10 May 2021 11:22:48 -0700
Subject: [PATCH] config-tools: NVMX_ENABLED defaults to 'n' in all scenario
 config files

By default nested virtualization is disabled.

Tracked-On: #5923
Signed-off-by: Zide Chen <zide.chen@intel.com>
---
 misc/config_tools/data/adl-rvp/industry.xml                | 1 +
 misc/config_tools/data/apl-mrb/hybrid.xml                  | 1 +
 misc/config_tools/data/apl-mrb/industry.xml                | 1 +
 misc/config_tools/data/apl-mrb/logical_partition.xml       | 1 +
 misc/config_tools/data/apl-mrb/sdc.xml                     | 1 +
 misc/config_tools/data/apl-up2-n3350/logical_partition.xml | 1 +
 misc/config_tools/data/apl-up2/hybrid.xml                  | 1 +
 misc/config_tools/data/apl-up2/industry.xml                | 1 +
 misc/config_tools/data/apl-up2/logical_partition.xml       | 1 +
 misc/config_tools/data/apl-up2/sdc.xml                     | 1 +
 misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml           | 1 +
 misc/config_tools/data/cfl-k700-i7/industry.xml            | 1 +
 misc/config_tools/data/ehl-crb-b/fusa_partition.xml        | 1 +
 misc/config_tools/data/ehl-crb-b/hybrid.xml                | 1 +
 misc/config_tools/data/ehl-crb-b/hybrid_rt.xml             | 1 +
 misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml        | 1 +
 misc/config_tools/data/ehl-crb-b/industry.xml              | 1 +
 misc/config_tools/data/ehl-crb-b/logical_partition.xml     | 1 +
 misc/config_tools/data/ehl-crb-b/sdc.xml                   | 1 +
 misc/config_tools/data/generic_board/hybrid.xml            | 1 +
 misc/config_tools/data/generic_board/hybrid_rt.xml         | 1 +
 misc/config_tools/data/generic_board/industry.xml          | 1 +
 misc/config_tools/data/generic_board/logical_partition.xml | 1 +
 misc/config_tools/data/nuc6cayh/hybrid.xml                 | 1 +
 misc/config_tools/data/nuc6cayh/industry.xml               | 1 +
 misc/config_tools/data/nuc6cayh/logical_partition.xml      | 1 +
 misc/config_tools/data/nuc6cayh/sdc.xml                    | 1 +
 misc/config_tools/data/nuc7i7dnb/hybrid.xml                | 1 +
 misc/config_tools/data/nuc7i7dnb/industry.xml              | 1 +
 misc/config_tools/data/nuc7i7dnb/logical_partition.xml     | 1 +
 misc/config_tools/data/nuc7i7dnb/sdc.xml                   | 1 +
 misc/config_tools/data/qemu/sdc.xml                        | 1 +
 misc/config_tools/data/tgl-rvp/hybrid.xml                  | 1 +
 misc/config_tools/data/tgl-rvp/hybrid_rt.xml               | 1 +
 misc/config_tools/data/tgl-rvp/industry.xml                | 1 +
 misc/config_tools/data/tgl-rvp/logical_partition.xml       | 1 +
 misc/config_tools/data/tgl-rvp/sdc.xml                     | 1 +
 misc/config_tools/data/whl-ipc-i5/hybrid.xml               | 1 +
 misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml            | 1 +
 misc/config_tools/data/whl-ipc-i5/industry.xml             | 1 +
 misc/config_tools/data/whl-ipc-i5/logical_partition.xml    | 1 +
 misc/config_tools/data/whl-ipc-i5/sdc.xml                  | 1 +
 misc/config_tools/data/whl-ipc-i7/hybrid.xml               | 1 +
 misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml            | 1 +
 misc/config_tools/data/whl-ipc-i7/industry.xml             | 1 +
 misc/config_tools/data/whl-ipc-i7/logical_partition.xml    | 1 +
 misc/config_tools/data/whl-ipc-i7/sdc.xml                  | 1 +
 47 files changed, 47 insertions(+)

diff --git a/misc/config_tools/data/adl-rvp/industry.xml b/misc/config_tools/data/adl-rvp/industry.xml
index 87500ca72..e196db554 100755
--- a/misc/config_tools/data/adl-rvp/industry.xml
+++ b/misc/config_tools/data/adl-rvp/industry.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-mrb/hybrid.xml b/misc/config_tools/data/apl-mrb/hybrid.xml
index 1f58de9c2..44593ce0d 100644
--- a/misc/config_tools/data/apl-mrb/hybrid.xml
+++ b/misc/config_tools/data/apl-mrb/hybrid.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-mrb/industry.xml b/misc/config_tools/data/apl-mrb/industry.xml
index cdc8a04da..0838320fb 100644
--- a/misc/config_tools/data/apl-mrb/industry.xml
+++ b/misc/config_tools/data/apl-mrb/industry.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-mrb/logical_partition.xml b/misc/config_tools/data/apl-mrb/logical_partition.xml
index a2c4731fc..5d20691fe 100644
--- a/misc/config_tools/data/apl-mrb/logical_partition.xml
+++ b/misc/config_tools/data/apl-mrb/logical_partition.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-mrb/sdc.xml b/misc/config_tools/data/apl-mrb/sdc.xml
index b065f57f9..48e3bdf8a 100644
--- a/misc/config_tools/data/apl-mrb/sdc.xml
+++ b/misc/config_tools/data/apl-mrb/sdc.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-up2-n3350/logical_partition.xml b/misc/config_tools/data/apl-up2-n3350/logical_partition.xml
index 4205c08d8..ec986508d 100644
--- a/misc/config_tools/data/apl-up2-n3350/logical_partition.xml
+++ b/misc/config_tools/data/apl-up2-n3350/logical_partition.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-up2/hybrid.xml b/misc/config_tools/data/apl-up2/hybrid.xml
index 18cd735d9..d275d254b 100644
--- a/misc/config_tools/data/apl-up2/hybrid.xml
+++ b/misc/config_tools/data/apl-up2/hybrid.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-up2/industry.xml b/misc/config_tools/data/apl-up2/industry.xml
index 44cf643e1..04b26dd83 100644
--- a/misc/config_tools/data/apl-up2/industry.xml
+++ b/misc/config_tools/data/apl-up2/industry.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-up2/logical_partition.xml b/misc/config_tools/data/apl-up2/logical_partition.xml
index 7f5e89166..1725d3994 100644
--- a/misc/config_tools/data/apl-up2/logical_partition.xml
+++ b/misc/config_tools/data/apl-up2/logical_partition.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/apl-up2/sdc.xml b/misc/config_tools/data/apl-up2/sdc.xml
index 405bed01e..1dc194740 100644
--- a/misc/config_tools/data/apl-up2/sdc.xml
+++ b/misc/config_tools/data/apl-up2/sdc.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index be4d24d84..f0be8ec09 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/cfl-k700-i7/industry.xml b/misc/config_tools/data/cfl-k700-i7/industry.xml
index 537c38fd4..b88d9afeb 100644
--- a/misc/config_tools/data/cfl-k700-i7/industry.xml
+++ b/misc/config_tools/data/cfl-k700-i7/industry.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
index c2c5f414c..76c35bcc3 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index 6d7e501b6..62f43fb56 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index 04506fba4..6a059b59b 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index 7fdc8e0ca..c8216c404 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml
index 040f94a77..9386d74b6 100644
--- a/misc/config_tools/data/ehl-crb-b/industry.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/logical_partition.xml b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
index 968a850f3..8b6f2a9fb 100644
--- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml
index f3cf1c33c..40f5b3847 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc.xml
@@ -35,6 +35,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 9aa142b00..81851783d 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -36,6 +36,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <MBA_DELAY>0</MBA_DELAY>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index e8b89a940..a06da9cd8 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -36,6 +36,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <MBA_DELAY>0</MBA_DELAY>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml
index 8130836ef..bb7d92775 100644
--- a/misc/config_tools/data/generic_board/industry.xml
+++ b/misc/config_tools/data/generic_board/industry.xml
@@ -36,6 +36,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <MBA_DELAY>0</MBA_DELAY>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml
index 4006ebdfa..70504bd86 100644
--- a/misc/config_tools/data/generic_board/logical_partition.xml
+++ b/misc/config_tools/data/generic_board/logical_partition.xml
@@ -36,6 +36,7 @@
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <MBA_DELAY>0</MBA_DELAY>
             </RDT>
+            <NVMX_ENABLED>n</NVMX_ENABLED>
             <HYPERV_ENABLED>y</HYPERV_ENABLED>
             <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
             <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc6cayh/hybrid.xml b/misc/config_tools/data/nuc6cayh/hybrid.xml
index a400a3a5b..6d06905e5 100644
--- a/misc/config_tools/data/nuc6cayh/hybrid.xml
+++ b/misc/config_tools/data/nuc6cayh/hybrid.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc6cayh/industry.xml b/misc/config_tools/data/nuc6cayh/industry.xml
index 1acf6ee0d..cf81a2a24 100644
--- a/misc/config_tools/data/nuc6cayh/industry.xml
+++ b/misc/config_tools/data/nuc6cayh/industry.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
 	</RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc6cayh/logical_partition.xml b/misc/config_tools/data/nuc6cayh/logical_partition.xml
index 3e1b61f0a..b940d4ad0 100644
--- a/misc/config_tools/data/nuc6cayh/logical_partition.xml
+++ b/misc/config_tools/data/nuc6cayh/logical_partition.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc6cayh/sdc.xml b/misc/config_tools/data/nuc6cayh/sdc.xml
index e6e4ec3d7..fcb54a253 100644
--- a/misc/config_tools/data/nuc6cayh/sdc.xml
+++ b/misc/config_tools/data/nuc6cayh/sdc.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index 4ac540f28..b4160a429 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc7i7dnb/industry.xml b/misc/config_tools/data/nuc7i7dnb/industry.xml
index e59ffd51f..ed39d218e 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
index 7a39010bf..2c97e4085 100644
--- a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
+++ b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc.xml b/misc/config_tools/data/nuc7i7dnb/sdc.xml
index 66ed28020..53e1d149f 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml
index 541353565..e5bbe897d 100644
--- a/misc/config_tools/data/qemu/sdc.xml
+++ b/misc/config_tools/data/qemu/sdc.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index eb2ea114f..0faa5cd13 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index 74b7827e7..d3d731434 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>y</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index 5707860ac..069b70f98 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -18,6 +18,7 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>y</CDP_ENABLED>
       </RDT>
+      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/tgl-rvp/logical_partition.xml b/misc/config_tools/data/tgl-rvp/logical_partition.xml
index ae519608e..c8003aeab 100644
--- a/misc/config_tools/data/tgl-rvp/logical_partition.xml
+++ b/misc/config_tools/data/tgl-rvp/logical_partition.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/tgl-rvp/sdc.xml b/misc/config_tools/data/tgl-rvp/sdc.xml
index 76d608d2f..799ea2342 100644
--- a/misc/config_tools/data/tgl-rvp/sdc.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 52468f344..89a0d0d50 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
index 7467e871a..020480970 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i5/industry.xml b/misc/config_tools/data/whl-ipc-i5/industry.xml
index e7dd9c653..be94abb0f 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
index e0c961623..7127fd3e6 100644
--- a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 184243b28..93d188881 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index 801d2c790..bdc1e1694 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
index b2829ade5..78a39fb76 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i7/industry.xml b/misc/config_tools/data/whl-ipc-i7/industry.xml
index 736de3040..f5e35a4ad 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
index 6481022b3..49f05e2ba 100644
--- a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
@@ -20,6 +20,7 @@
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc.xml b/misc/config_tools/data/whl-ipc-i7/sdc.xml
index a58fb43ba..69db00df9 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc.xml
@@ -24,6 +24,7 @@
             <CLOS_MASK>0xff</CLOS_MASK>
             <CLOS_MASK>0xff</CLOS_MASK>
         </RDT>
+        <NVMX_ENABLED>n</NVMX_ENABLED>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
         <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>