diff --git a/misc/acrn-config/xmls/board-xmls/apl-mrb.xml b/misc/acrn-config/xmls/board-xmls/apl-mrb.xml
index 305b35ed0..41f55df3c 100644
--- a/misc/acrn-config/xmls/board-xmls/apl-mrb.xml
+++ b/misc/acrn-config/xmls/board-xmls/apl-mrb.xml
@@ -196,59 +196,31 @@
#define DRHD_COUNT 2U
- #define DRHD0_DEV_CNT 1U
- #define DRHD0_SEGMENT 0U
- #define DRHD0_FLAGS 0U
+
+ #define DRHD0_DEV_CNT 0x1U
+ #define DRHD0_SEGMENT 0x0U
+ #define DRHD0_FLAGS 0x0U
#define DRHD0_REG_BASE 0xFED64000UL
#define DRHD0_IGNORE true
+ #define DRHD0_DEVSCOPE0_TYPE 0x1U
+ #define DRHD0_DEVSCOPE0_ID 0x0U
#define DRHD0_DEVSCOPE0_BUS 0x0U
#define DRHD0_DEVSCOPE0_PATH 0x10U
- #define DRHD0_DEVSCOPE1_BUS 0x0U
- #define DRHD0_DEVSCOPE1_PATH 0x0U
- #define DRHD0_DEVSCOPE2_BUS 0x0U
- #define DRHD0_DEVSCOPE2_PATH 0x0U
- #define DRHD0_DEVSCOPE3_BUS 0x0U
- #define DRHD0_DEVSCOPE3_PATH 0x0U
- #define DRHD1_DEV_CNT 2U
- #define DRHD1_SEGMENT 0U
- #define DRHD1_FLAGS 1U
+
+ #define DRHD1_DEV_CNT 0x2U
+ #define DRHD1_SEGMENT 0x0U
+ #define DRHD1_FLAGS 0x1U
#define DRHD1_REG_BASE 0xFED65000UL
#define DRHD1_IGNORE false
+ #define DRHD1_DEVSCOPE0_TYPE 0x3U
+ #define DRHD1_DEVSCOPE0_ID 0x8U
#define DRHD1_DEVSCOPE0_BUS 0xfaU
#define DRHD1_DEVSCOPE0_PATH 0xf8U
+ #define DRHD1_DEVSCOPE1_TYPE 0x4U
+ #define DRHD1_DEVSCOPE1_ID 0x0U
#define DRHD1_DEVSCOPE1_BUS 0x0U
#define DRHD1_DEVSCOPE1_PATH 0xffU
- #define DRHD1_DEVSCOPE2_BUS 0x0U
- #define DRHD1_DEVSCOPE2_PATH 0x0U
- #define DRHD1_DEVSCOPE3_BUS 0x0U
- #define DRHD1_DEVSCOPE3_PATH 0x0U
- #define DRHD1_IOAPIC_ID 8U
- #define DRHD2_DEV_CNT 0U
- #define DRHD2_SEGMENT 0U
- #define DRHD2_FLAGS 0U
- #define DRHD2_REG_BASE 0x00UL
- #define DRHD2_IGNORE false
- #define DRHD2_DEVSCOPE0_BUS 0x0U
- #define DRHD2_DEVSCOPE0_PATH 0x0U
- #define DRHD2_DEVSCOPE1_BUS 0x0U
- #define DRHD2_DEVSCOPE1_PATH 0x0U
- #define DRHD2_DEVSCOPE2_BUS 0x0U
- #define DRHD2_DEVSCOPE2_PATH 0x0U
- #define DRHD2_DEVSCOPE3_BUS 0x0U
- #define DRHD2_DEVSCOPE3_PATH 0x0U
- #define DRHD3_DEV_CNT 0U
- #define DRHD3_SEGMENT 0U
- #define DRHD3_FLAGS 0U
- #define DRHD3_REG_BASE 0x00UL
- #define DRHD3_IGNORE false
- #define DRHD3_DEVSCOPE0_BUS 0x0U
- #define DRHD3_DEVSCOPE0_PATH 0x0U
- #define DRHD3_DEVSCOPE1_BUS 0x0U
- #define DRHD3_DEVSCOPE1_PATH 0x0U
- #define DRHD3_DEVSCOPE2_BUS 0x0U
- #define DRHD3_DEVSCOPE2_PATH 0x0U
- #define DRHD3_DEVSCOPE3_BUS 0x0U
- #define DRHD3_DEVSCOPE3_PATH 0x0U
+
diff --git a/misc/acrn-config/xmls/board-xmls/apl-up2-n3350.xml b/misc/acrn-config/xmls/board-xmls/apl-up2-n3350.xml
index 720be080c..924cc6ae9 100644
--- a/misc/acrn-config/xmls/board-xmls/apl-up2-n3350.xml
+++ b/misc/acrn-config/xmls/board-xmls/apl-up2-n3350.xml
@@ -182,59 +182,31 @@
#define DRHD_COUNT 2U
- #define DRHD0_DEV_CNT 1U
- #define DRHD0_SEGMENT 0U
- #define DRHD0_FLAGS 0U
+
+ #define DRHD0_DEV_CNT 0x1U
+ #define DRHD0_SEGMENT 0x0U
+ #define DRHD0_FLAGS 0x0U
#define DRHD0_REG_BASE 0xFED64000UL
#define DRHD0_IGNORE true
+ #define DRHD0_DEVSCOPE0_TYPE 0x1U
+ #define DRHD0_DEVSCOPE0_ID 0x0U
#define DRHD0_DEVSCOPE0_BUS 0x0U
#define DRHD0_DEVSCOPE0_PATH 0x10U
- #define DRHD0_DEVSCOPE1_BUS 0x0U
- #define DRHD0_DEVSCOPE1_PATH 0x0U
- #define DRHD0_DEVSCOPE2_BUS 0x0U
- #define DRHD0_DEVSCOPE2_PATH 0x0U
- #define DRHD0_DEVSCOPE3_BUS 0x0U
- #define DRHD0_DEVSCOPE3_PATH 0x0U
- #define DRHD1_DEV_CNT 2U
- #define DRHD1_SEGMENT 0U
- #define DRHD1_FLAGS 1U
+
+ #define DRHD1_DEV_CNT 0x2U
+ #define DRHD1_SEGMENT 0x0U
+ #define DRHD1_FLAGS 0x1U
#define DRHD1_REG_BASE 0xFED65000UL
#define DRHD1_IGNORE false
+ #define DRHD1_DEVSCOPE0_TYPE 0x3U
+ #define DRHD1_DEVSCOPE0_ID 0x1U
#define DRHD1_DEVSCOPE0_BUS 0xfaU
#define DRHD1_DEVSCOPE0_PATH 0xf8U
+ #define DRHD1_DEVSCOPE1_TYPE 0x4U
+ #define DRHD1_DEVSCOPE1_ID 0x0U
#define DRHD1_DEVSCOPE1_BUS 0x0U
#define DRHD1_DEVSCOPE1_PATH 0xffU
- #define DRHD1_DEVSCOPE2_BUS 0x0U
- #define DRHD1_DEVSCOPE2_PATH 0x0U
- #define DRHD1_DEVSCOPE3_BUS 0x0U
- #define DRHD1_DEVSCOPE3_PATH 0x0U
- #define DRHD1_IOAPIC_ID 1U
- #define DRHD2_DEV_CNT 0U
- #define DRHD2_SEGMENT 0U
- #define DRHD2_FLAGS 0U
- #define DRHD2_REG_BASE 0x00UL
- #define DRHD2_IGNORE false
- #define DRHD2_DEVSCOPE0_BUS 0x0U
- #define DRHD2_DEVSCOPE0_PATH 0x0U
- #define DRHD2_DEVSCOPE1_BUS 0x0U
- #define DRHD2_DEVSCOPE1_PATH 0x0U
- #define DRHD2_DEVSCOPE2_BUS 0x0U
- #define DRHD2_DEVSCOPE2_PATH 0x0U
- #define DRHD2_DEVSCOPE3_BUS 0x0U
- #define DRHD2_DEVSCOPE3_PATH 0x0U
- #define DRHD3_DEV_CNT 0U
- #define DRHD3_SEGMENT 0U
- #define DRHD3_FLAGS 0U
- #define DRHD3_REG_BASE 0x00UL
- #define DRHD3_IGNORE false
- #define DRHD3_DEVSCOPE0_BUS 0x0U
- #define DRHD3_DEVSCOPE0_PATH 0x0U
- #define DRHD3_DEVSCOPE1_BUS 0x0U
- #define DRHD3_DEVSCOPE1_PATH 0x0U
- #define DRHD3_DEVSCOPE2_BUS 0x0U
- #define DRHD3_DEVSCOPE2_PATH 0x0U
- #define DRHD3_DEVSCOPE3_BUS 0x0U
- #define DRHD3_DEVSCOPE3_PATH 0x0U
+
diff --git a/misc/acrn-config/xmls/board-xmls/apl-up2.xml b/misc/acrn-config/xmls/board-xmls/apl-up2.xml
index f4587f03a..964b355ba 100644
--- a/misc/acrn-config/xmls/board-xmls/apl-up2.xml
+++ b/misc/acrn-config/xmls/board-xmls/apl-up2.xml
@@ -182,59 +182,31 @@
#define DRHD_COUNT 2U
- #define DRHD0_DEV_CNT 1U
- #define DRHD0_SEGMENT 0U
- #define DRHD0_FLAGS 0U
+
+ #define DRHD0_DEV_CNT 0x1U
+ #define DRHD0_SEGMENT 0x0U
+ #define DRHD0_FLAGS 0x0U
#define DRHD0_REG_BASE 0xFED64000UL
#define DRHD0_IGNORE true
+ #define DRHD0_DEVSCOPE0_TYPE 0x1U
+ #define DRHD0_DEVSCOPE0_ID 0x0U
#define DRHD0_DEVSCOPE0_BUS 0x0U
#define DRHD0_DEVSCOPE0_PATH 0x10U
- #define DRHD0_DEVSCOPE1_BUS 0x0U
- #define DRHD0_DEVSCOPE1_PATH 0x0U
- #define DRHD0_DEVSCOPE2_BUS 0x0U
- #define DRHD0_DEVSCOPE2_PATH 0x0U
- #define DRHD0_DEVSCOPE3_BUS 0x0U
- #define DRHD0_DEVSCOPE3_PATH 0x0U
- #define DRHD1_DEV_CNT 2U
- #define DRHD1_SEGMENT 0U
- #define DRHD1_FLAGS 1U
+
+ #define DRHD1_DEV_CNT 0x2U
+ #define DRHD1_SEGMENT 0x0U
+ #define DRHD1_FLAGS 0x1U
#define DRHD1_REG_BASE 0xFED65000UL
#define DRHD1_IGNORE false
+ #define DRHD1_DEVSCOPE0_TYPE 0x3U
+ #define DRHD1_DEVSCOPE0_ID 0x1U
#define DRHD1_DEVSCOPE0_BUS 0xfaU
#define DRHD1_DEVSCOPE0_PATH 0xf8U
+ #define DRHD1_DEVSCOPE1_TYPE 0x4U
+ #define DRHD1_DEVSCOPE1_ID 0x0U
#define DRHD1_DEVSCOPE1_BUS 0x0U
#define DRHD1_DEVSCOPE1_PATH 0xffU
- #define DRHD1_DEVSCOPE2_BUS 0x0U
- #define DRHD1_DEVSCOPE2_PATH 0x0U
- #define DRHD1_DEVSCOPE3_BUS 0x0U
- #define DRHD1_DEVSCOPE3_PATH 0x0U
- #define DRHD1_IOAPIC_ID 1U
- #define DRHD2_DEV_CNT 0U
- #define DRHD2_SEGMENT 0U
- #define DRHD2_FLAGS 0U
- #define DRHD2_REG_BASE 0x00UL
- #define DRHD2_IGNORE false
- #define DRHD2_DEVSCOPE0_BUS 0x0U
- #define DRHD2_DEVSCOPE0_PATH 0x0U
- #define DRHD2_DEVSCOPE1_BUS 0x0U
- #define DRHD2_DEVSCOPE1_PATH 0x0U
- #define DRHD2_DEVSCOPE2_BUS 0x0U
- #define DRHD2_DEVSCOPE2_PATH 0x0U
- #define DRHD2_DEVSCOPE3_BUS 0x0U
- #define DRHD2_DEVSCOPE3_PATH 0x0U
- #define DRHD3_DEV_CNT 0U
- #define DRHD3_SEGMENT 0U
- #define DRHD3_FLAGS 0U
- #define DRHD3_REG_BASE 0x00UL
- #define DRHD3_IGNORE false
- #define DRHD3_DEVSCOPE0_BUS 0x0U
- #define DRHD3_DEVSCOPE0_PATH 0x0U
- #define DRHD3_DEVSCOPE1_BUS 0x0U
- #define DRHD3_DEVSCOPE1_PATH 0x0U
- #define DRHD3_DEVSCOPE2_BUS 0x0U
- #define DRHD3_DEVSCOPE2_PATH 0x0U
- #define DRHD3_DEVSCOPE3_BUS 0x0U
- #define DRHD3_DEVSCOPE3_PATH 0x0U
+
diff --git a/misc/acrn-config/xmls/board-xmls/nuc6cayh.xml b/misc/acrn-config/xmls/board-xmls/nuc6cayh.xml
index 4442ff62c..978f58842 100644
--- a/misc/acrn-config/xmls/board-xmls/nuc6cayh.xml
+++ b/misc/acrn-config/xmls/board-xmls/nuc6cayh.xml
@@ -134,59 +134,31 @@
#define DRHD_COUNT 2U
- #define DRHD0_DEV_CNT 1U
- #define DRHD0_SEGMENT 0U
- #define DRHD0_FLAGS 0U
+
+ #define DRHD0_DEV_CNT 0x1U
+ #define DRHD0_SEGMENT 0x0U
+ #define DRHD0_FLAGS 0x0U
#define DRHD0_REG_BASE 0xFED64000UL
#define DRHD0_IGNORE true
+ #define DRHD0_DEVSCOPE0_TYPE 0x1U
+ #define DRHD0_DEVSCOPE0_ID 0x0U
#define DRHD0_DEVSCOPE0_BUS 0x0U
#define DRHD0_DEVSCOPE0_PATH 0x10U
- #define DRHD0_DEVSCOPE1_BUS 0x0U
- #define DRHD0_DEVSCOPE1_PATH 0x0U
- #define DRHD0_DEVSCOPE2_BUS 0x0U
- #define DRHD0_DEVSCOPE2_PATH 0x0U
- #define DRHD0_DEVSCOPE3_BUS 0x0U
- #define DRHD0_DEVSCOPE3_PATH 0x0U
- #define DRHD1_DEV_CNT 2U
- #define DRHD1_SEGMENT 0U
- #define DRHD1_FLAGS 1U
+
+ #define DRHD1_DEV_CNT 0x2U
+ #define DRHD1_SEGMENT 0x0U
+ #define DRHD1_FLAGS 0x1U
#define DRHD1_REG_BASE 0xFED65000UL
#define DRHD1_IGNORE false
+ #define DRHD1_DEVSCOPE0_TYPE 0x3U
+ #define DRHD1_DEVSCOPE0_ID 0x1U
#define DRHD1_DEVSCOPE0_BUS 0xfaU
#define DRHD1_DEVSCOPE0_PATH 0xf8U
+ #define DRHD1_DEVSCOPE1_TYPE 0x4U
+ #define DRHD1_DEVSCOPE1_ID 0x0U
#define DRHD1_DEVSCOPE1_BUS 0x0U
#define DRHD1_DEVSCOPE1_PATH 0xffU
- #define DRHD1_DEVSCOPE2_BUS 0x0U
- #define DRHD1_DEVSCOPE2_PATH 0x0U
- #define DRHD1_DEVSCOPE3_BUS 0x0U
- #define DRHD1_DEVSCOPE3_PATH 0x0U
- #define DRHD1_IOAPIC_ID 1U
- #define DRHD2_DEV_CNT 0U
- #define DRHD2_SEGMENT 0U
- #define DRHD2_FLAGS 0U
- #define DRHD2_REG_BASE 0x00UL
- #define DRHD2_IGNORE false
- #define DRHD2_DEVSCOPE0_BUS 0x0U
- #define DRHD2_DEVSCOPE0_PATH 0x0U
- #define DRHD2_DEVSCOPE1_BUS 0x0U
- #define DRHD2_DEVSCOPE1_PATH 0x0U
- #define DRHD2_DEVSCOPE2_BUS 0x0U
- #define DRHD2_DEVSCOPE2_PATH 0x0U
- #define DRHD2_DEVSCOPE3_BUS 0x0U
- #define DRHD2_DEVSCOPE3_PATH 0x0U
- #define DRHD3_DEV_CNT 0U
- #define DRHD3_SEGMENT 0U
- #define DRHD3_FLAGS 0U
- #define DRHD3_REG_BASE 0x00UL
- #define DRHD3_IGNORE false
- #define DRHD3_DEVSCOPE0_BUS 0x0U
- #define DRHD3_DEVSCOPE0_PATH 0x0U
- #define DRHD3_DEVSCOPE1_BUS 0x0U
- #define DRHD3_DEVSCOPE1_PATH 0x0U
- #define DRHD3_DEVSCOPE2_BUS 0x0U
- #define DRHD3_DEVSCOPE2_PATH 0x0U
- #define DRHD3_DEVSCOPE3_BUS 0x0U
- #define DRHD3_DEVSCOPE3_PATH 0x0U
+
diff --git a/misc/acrn-config/xmls/board-xmls/nuc7i7dnb.xml b/misc/acrn-config/xmls/board-xmls/nuc7i7dnb.xml
index 066d1c93d..f2694c577 100644
--- a/misc/acrn-config/xmls/board-xmls/nuc7i7dnb.xml
+++ b/misc/acrn-config/xmls/board-xmls/nuc7i7dnb.xml
@@ -41,7 +41,7 @@
00:1d.0 PCI bridge: Intel Corporation Sunrise Point-LP PCI Express Root Port #9 (rev f1)
00:1f.0 ISA bridge: Intel Corporation Device 9d4e (rev 21)
00:1f.2 Memory controller: Intel Corporation Sunrise Point-LP PMC (rev 21)
- Region 0: Memory at df244000 (32-bit, non-prefetchable) [size=16K]
+ Region 0: Memory at df244000 (32-bit, non-prefetchable) [disabled] [size=16K]
00:1f.3 Audio device: Intel Corporation Sunrise Point-LP HD Audio (rev 21)
Region 0: Memory at df240000 (64-bit, non-prefetchable) [size=16K]
Region 4: Memory at df220000 (64-bit, non-prefetchable) [size=64K]
@@ -78,8 +78,8 @@
- #define WAKE_VECTOR_32 0x7FA22F8CUL
- #define WAKE_VECTOR_64 0x7FA22F98UL
+ #define WAKE_VECTOR_32 0x8AA09F8CUL
+ #define WAKE_VECTOR_64 0x8AA09F98UL
@@ -125,59 +125,31 @@
#define DRHD_COUNT 2U
- #define DRHD0_DEV_CNT 1U
- #define DRHD0_SEGMENT 0U
- #define DRHD0_FLAGS 0U
+
+ #define DRHD0_DEV_CNT 0x1U
+ #define DRHD0_SEGMENT 0x0U
+ #define DRHD0_FLAGS 0x0U
#define DRHD0_REG_BASE 0xFED90000UL
#define DRHD0_IGNORE true
+ #define DRHD0_DEVSCOPE0_TYPE 0x1U
+ #define DRHD0_DEVSCOPE0_ID 0x0U
#define DRHD0_DEVSCOPE0_BUS 0x0U
#define DRHD0_DEVSCOPE0_PATH 0x10U
- #define DRHD0_DEVSCOPE1_BUS 0x0U
- #define DRHD0_DEVSCOPE1_PATH 0x0U
- #define DRHD0_DEVSCOPE2_BUS 0x0U
- #define DRHD0_DEVSCOPE2_PATH 0x0U
- #define DRHD0_DEVSCOPE3_BUS 0x0U
- #define DRHD0_DEVSCOPE3_PATH 0x0U
- #define DRHD1_DEV_CNT 2U
- #define DRHD1_SEGMENT 0U
- #define DRHD1_FLAGS 1U
+
+ #define DRHD1_DEV_CNT 0x2U
+ #define DRHD1_SEGMENT 0x0U
+ #define DRHD1_FLAGS 0x1U
#define DRHD1_REG_BASE 0xFED91000UL
#define DRHD1_IGNORE false
+ #define DRHD1_DEVSCOPE0_TYPE 0x3U
+ #define DRHD1_DEVSCOPE0_ID 0x2U
#define DRHD1_DEVSCOPE0_BUS 0xf0U
#define DRHD1_DEVSCOPE0_PATH 0xf8U
+ #define DRHD1_DEVSCOPE1_TYPE 0x4U
+ #define DRHD1_DEVSCOPE1_ID 0x0U
#define DRHD1_DEVSCOPE1_BUS 0x0U
#define DRHD1_DEVSCOPE1_PATH 0xf8U
- #define DRHD1_DEVSCOPE2_BUS 0x0U
- #define DRHD1_DEVSCOPE2_PATH 0x0U
- #define DRHD1_DEVSCOPE3_BUS 0x0U
- #define DRHD1_DEVSCOPE3_PATH 0x0U
- #define DRHD1_IOAPIC_ID 2U
- #define DRHD2_DEV_CNT 0U
- #define DRHD2_SEGMENT 0U
- #define DRHD2_FLAGS 0U
- #define DRHD2_REG_BASE 0x00UL
- #define DRHD2_IGNORE false
- #define DRHD2_DEVSCOPE0_BUS 0x0U
- #define DRHD2_DEVSCOPE0_PATH 0x0U
- #define DRHD2_DEVSCOPE1_BUS 0x0U
- #define DRHD2_DEVSCOPE1_PATH 0x0U
- #define DRHD2_DEVSCOPE2_BUS 0x0U
- #define DRHD2_DEVSCOPE2_PATH 0x0U
- #define DRHD2_DEVSCOPE3_BUS 0x0U
- #define DRHD2_DEVSCOPE3_PATH 0x0U
- #define DRHD3_DEV_CNT 0U
- #define DRHD3_SEGMENT 0U
- #define DRHD3_FLAGS 0U
- #define DRHD3_REG_BASE 0x00UL
- #define DRHD3_IGNORE false
- #define DRHD3_DEVSCOPE0_BUS 0x0U
- #define DRHD3_DEVSCOPE0_PATH 0x0U
- #define DRHD3_DEVSCOPE1_BUS 0x0U
- #define DRHD3_DEVSCOPE1_PATH 0x0U
- #define DRHD3_DEVSCOPE2_BUS 0x0U
- #define DRHD3_DEVSCOPE2_PATH 0x0U
- #define DRHD3_DEVSCOPE3_BUS 0x0U
- #define DRHD3_DEVSCOPE3_PATH 0x0U
+
@@ -216,18 +188,18 @@
00001000-00057fff : System RAM
- 00059000-0009efff : System RAM
+ 00059000-0009dfff : System RAM
00100000-3fffffff : System RAM
- 40400000-764b8fff : System RAM
- 764bb000-7f0f3fff : System RAM
- 7ffff000-7fffffff : System RAM
- 88000000-883fffff : System RAM
- 100000000-2707fffff : System RAM
+ 40400000-7da93fff : System RAM
+ 7da96000-8a0dafff : System RAM
+ 8afff000-8affffff : System RAM
+ 100000000-26dffffff : System RAM
- /dev/nvme0n1p3: TYPE="ext4"
/dev/sda3: TYPE="ext4"
+ /dev/nvme0n1p3: TYPE="ext4"
+ /dev/nvme0n1p4: TYPE="ext4"
@@ -240,7 +212,7 @@
- 7898864 kB
+ 8033848 kB