From 63d3a542856f617dee1f740e106f9f3892ad5f86 Mon Sep 17 00:00:00 2001 From: jackwhich Date: Tue, 21 Dec 2021 13:44:43 +0800 Subject: [PATCH] config_tool: update generic/nuc11/whl/cfl board xmls 1.Re-obtain generic/nuc11/whl/cfl board xmls according to 6987.patch. 2.Modify the corresponding scenario pci. 3.Add cfl-k700-i7 scenario (hybrid/partitioned) and launch xml files. Tracked-On: #6986 Signed-off-by: zhongzhenx.liu --- .../data/cfl-k700-i7/cfl-k700-i7.xml | 369 ++++++++---------- misc/config_tools/data/cfl-k700-i7/hybrid.xml | 249 ++++++++++++ .../cfl-k700-i7/hybrid_launch_2user_vm.xml | 96 +++++ .../data/cfl-k700-i7/hybrid_rt.xml | 2 +- .../data/cfl-k700-i7/partitioned.xml | 181 +++++++++ .../cfl-k700-i7/shared_launch_6user_vm.xml | 284 ++++++++++++++ .../data/generic_board/generic_board.xml | 91 +++-- .../data/nuc11tnbi5/nuc11tnbi5.xml | 91 +++-- .../hybrid_rt_launch_1user_vm_waag.xml | 4 +- .../data/whl-ipc-i5/partitioned.xml | 8 +- .../whl-ipc-i5/sdc_launch_1user_vm_laag.xml | 2 +- misc/config_tools/data/whl-ipc-i5/shared.xml | 2 +- .../shared_launch_1user_vm_waag.xml | 4 +- .../whl-ipc-i5/shared_launch_2user_vm.xml | 4 +- .../whl-ipc-i5/shared_launch_6user_vm.xml | 4 +- .../data/whl-ipc-i5/whl-ipc-i5.xml | 189 ++++----- 16 files changed, 1184 insertions(+), 396 deletions(-) create mode 100644 misc/config_tools/data/cfl-k700-i7/hybrid.xml create mode 100644 misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml create mode 100644 misc/config_tools/data/cfl-k700-i7/partitioned.xml create mode 100644 misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml diff --git a/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml b/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml index 3262a474f..f1cd1a3bd 100644 --- a/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml +++ b/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml @@ -13,46 +13,45 @@ Version: Type2 - Board Version - 00:00.0 Host bridge: Intel Corporation 8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S] (rev 0d) - 00:02.0 VGA compatible controller: Intel Corporation UHD Graphics 630 (Desktop 9 Series) (rev 02) + 00:00.0 Host bridge: Intel Corporation 8th/9th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S] (rev 0d) + 00:02.0 VGA compatible controller: Intel Corporation CoffeeLake-S GT2 [UHD Graphics 630] (rev 02) Region 0: Memory at a0000000 (64-bit, non-prefetchable) [size=16M] Region 2: Memory at 90000000 (64-bit, prefetchable) [size=256M] 00:08.0 System peripheral: Intel Corporation Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model - Region 0: Memory at a1938000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at a1838000 (64-bit, non-prefetchable) [size=4K] 00:12.0 Signal processing controller: Intel Corporation Cannon Lake PCH Thermal Controller (rev 10) - Region 0: Memory at a1939000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at a1839000 (64-bit, non-prefetchable) [size=4K] 00:14.0 USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10) - Region 0: Memory at a1920000 (64-bit, non-prefetchable) [size=64K] + Region 0: Memory at a1820000 (64-bit, non-prefetchable) [size=64K] 00:14.2 RAM memory: Intel Corporation Cannon Lake PCH Shared SRAM (rev 10) - Region 0: Memory at a1934000 (64-bit, non-prefetchable) [size=8K] - Region 2: Memory at a193a000 (64-bit, non-prefetchable) [size=4K] - 00:15.0 Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH Serial IO I2C Controller #0 (rev 10) - Region 0: Memory at 8f800000 (64-bit, non-prefetchable) [virtual] [size=4K] - 00:15.1 Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH Serial IO I2C Controller #1 (rev 10) - Region 0: Memory at 8f801000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at a1834000 (64-bit, non-prefetchable) [size=8K] + Region 2: Memory at a183a000 (64-bit, non-prefetchable) [size=4K] + 00:15.0 Serial bus controller: Intel Corporation Cannon Lake PCH Serial IO I2C Controller #0 (rev 10) + Region 0: Memory at 8f800000 (64-bit, non-prefetchable) [size=4K] + 00:15.1 Serial bus controller: Intel Corporation Cannon Lake PCH Serial IO I2C Controller #1 (rev 10) + Region 0: Memory at 8f801000 (64-bit, non-prefetchable) [size=4K] 00:17.0 SATA controller: Intel Corporation Cannon Lake PCH SATA AHCI Controller (rev 10) - Region 0: Memory at a1936000 (32-bit, non-prefetchable) [size=8K] - Region 1: Memory at a1942000 (32-bit, non-prefetchable) [size=256] - Region 5: Memory at a1941000 (32-bit, non-prefetchable) [size=2K] + Region 0: Memory at a1836000 (32-bit, non-prefetchable) [size=8K] + Region 1: Memory at a1842000 (32-bit, non-prefetchable) [size=256] + Region 5: Memory at a1841000 (32-bit, non-prefetchable) [size=2K] 00:1b.0 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #17 (rev f0) 00:1b.6 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #23 (rev f0) - 00:1c.0 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #3 (rev f0) - 00:1c.6 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #7 (rev f0) + 00:1c.0 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #7 (rev f0) 00:1c.7 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #8 (rev f0) 00:1e.0 Communication controller: Intel Corporation Cannon Lake PCH Serial IO UART Host Controller (rev 10) - Region 0: Memory at 8f802000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 8f802000 (64-bit, non-prefetchable) [size=4K] 00:1f.0 ISA bridge: Intel Corporation Cannon Point-LP LPC Controller (rev 10) 00:1f.3 Audio device: Intel Corporation Cannon Lake PCH cAVS (rev 10) - Region 0: Memory at a1930000 (64-bit, non-prefetchable) [size=16K] + Region 0: Memory at a1830000 (64-bit, non-prefetchable) [size=16K] Region 4: Memory at a1000000 (64-bit, non-prefetchable) [size=1M] 00:1f.4 SMBus: Intel Corporation Cannon Lake PCH SMBus Controller (rev 10) - Region 0: Memory at a193f000 (64-bit, non-prefetchable) [size=256] - 00:1f.5 Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH SPI Controller (rev 10) + Region 0: Memory at a183f000 (64-bit, non-prefetchable) [size=256] + 00:1f.5 Serial bus controller: Intel Corporation Cannon Lake PCH SPI Controller (rev 10) Region 0: Memory at fe010000 (32-bit, non-prefetchable) [size=4K] 00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev 10) - Region 0: Memory at a1900000 (32-bit, non-prefetchable) [size=128K] - 01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. Device 2263 (rev 03) - Region 0: Memory at a1800000 (64-bit, non-prefetchable) [size=16K] + Region 0: Memory at a1800000 (32-bit, non-prefetchable) [size=128K] + 01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. SM2263EN/SM2263XT SSD Controller (rev 03) + Region 0: Memory at a1700000 (64-bit, non-prefetchable) [size=16K] 02:00.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch 03:01.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch 03:02.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch @@ -60,23 +59,21 @@ 03:04.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch 03:05.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch 04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) - Region 0: Memory at a1700000 (32-bit, non-prefetchable) [size=512K] - Region 3: Memory at a1780000 (32-bit, non-prefetchable) [size=16K] - 05:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) Region 0: Memory at a1600000 (32-bit, non-prefetchable) [size=512K] Region 3: Memory at a1680000 (32-bit, non-prefetchable) [size=16K] - 06:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + 05:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) Region 0: Memory at a1500000 (32-bit, non-prefetchable) [size=512K] Region 3: Memory at a1580000 (32-bit, non-prefetchable) [size=16K] - 07:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + 06:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) Region 0: Memory at a1400000 (32-bit, non-prefetchable) [size=512K] Region 3: Memory at a1480000 (32-bit, non-prefetchable) [size=16K] - 09:00.0 Non-Volatile memory controller: Marvell Technology Group Ltd. Device 1160 (rev b0) - Region 0: Memory at a1300000 (64-bit, non-prefetchable) [size=16K] - 0a:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + 07:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + Region 0: Memory at a1300000 (32-bit, non-prefetchable) [size=512K] + Region 3: Memory at a1380000 (32-bit, non-prefetchable) [size=16K] + 09:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) Region 0: Memory at a1200000 (32-bit, non-prefetchable) [size=512K] Region 3: Memory at a1280000 (32-bit, non-prefetchable) [size=16K] - 0b:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + 0a:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) Region 0: Memory at a1100000 (32-bit, non-prefetchable) [size=512K] Region 3: Memory at a1180000 (32-bit, non-prefetchable) [size=16K] @@ -92,8 +89,7 @@ 00:17.0 0106: 8086:a352 (rev 10) 00:1b.0 0604: 8086:a340 (rev f0) 00:1b.6 0604: 8086:a32e (rev f0) - 00:1c.0 0604: 8086:a33a (rev f0) - 00:1c.6 0604: 8086:a33e (rev f0) + 00:1c.0 0604: 8086:a33e (rev f0) 00:1c.7 0604: 8086:a33f (rev f0) 00:1e.0 0780: 8086:a328 (rev 10) 00:1f.0 0601: 8086:a309 (rev 10) @@ -112,13 +108,12 @@ 05:00.0 0200: 8086:1533 (rev 03) 06:00.0 0200: 8086:1533 (rev 03) 07:00.0 0200: 8086:1533 (rev 03) - 09:00.0 0108: 1b4b:1160 (rev b0) + 09:00.0 0200: 8086:1533 (rev 03) 0a:00.0 0200: 8086:1533 (rev 03) - 0b:00.0 0200: 8086:1533 (rev 03) - #define WAKE_VECTOR_32 0x89B3000CUL - #define WAKE_VECTOR_64 0x89B30018UL + #define WAKE_VECTOR_32 0x8BB3000CUL + #define WAKE_VECTOR_64 0x8BB30018UL #define RESET_REGISTER_ADDRESS 0xB2UL @@ -189,10 +184,23 @@ "Intel(R) Core(TM) i7-9700TE CPU @ 1.80GHz" - {{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x00U, 0x00U}, /* C1 */ + {{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x01U, 0x00U}, /* C1 */ + {{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1816UL}, 0x02U, 0x97U, 0x00U}, /* C2 */ + {{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1819UL}, 0x03U, 0x40AU, 0x00U}, /* C3 */ - /* Px data is not available */ + {0x709UL, 0x00UL, 0x0AUL, 0x0AUL, 0x002600UL, 0x002600UL}, /* P0 */ + {0x708UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001200UL, 0x001200UL}, /* P1 */ + {0x6A4UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001100UL, 0x001100UL}, /* P2 */ + {0x640UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001000UL, 0x001000UL}, /* P3 */ + {0x5DCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000F00UL, 0x000F00UL}, /* P4 */ + {0x578UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000E00UL, 0x000E00UL}, /* P5 */ + {0x514UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000D00UL, 0x000D00UL}, /* P6 */ + {0x4B0UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000C00UL, 0x000C00UL}, /* P7 */ + {0x44CUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000B00UL, 0x000B00UL}, /* P8 */ + {0x3E8UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000A00UL, 0x000A00UL}, /* P9 */ + {0x384UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000900UL, 0x000900UL}, /* P10 */ + {0x320UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000800UL, 0x000800UL}, /* P11 */ /* PCI mmcfg base of MCFG */ @@ -209,96 +217,89 @@ 0009f000-000fffff : Reserved 000a0000-000bffff : PCI Bus 0000:00 000f0000-000fffff : System ROM - 00100000-6f170017 : System RAM - 6f170018-6f180057 : System RAM - 6f180058-76bdefff : System RAM - 76bdf000-76c91fff : Reserved - 76c92000-8738dfff : System RAM - 8738e000-8878dfff : Reserved - 8878e000-89b8dfff : ACPI Non-volatile Storage - 89b8e000-89c0dfff : ACPI Tables - 89c0e000-89c0efff : System RAM - 89c0f000-8f7fffff : Reserved - 8b800000-8f7fffff : Graphics Stolen Memory + 00100000-7117c017 : System RAM + 7117c018-7118c057 : System RAM + 7118c058-79067fff : System RAM + 79068000-7911afff : Reserved + 7911b000-8938dfff : System RAM + 8938e000-8a78dfff : Reserved + 8a78e000-8bb8dfff : ACPI Non-volatile Storage + 8bb8e000-8bc0dfff : ACPI Tables + 8bc0e000-8bc0efff : System RAM + 8bc0f000-8f7fffff : Reserved + 8d800000-8f7fffff : Graphics Stolen Memory 8f800000-dfffffff : PCI Bus 0000:00 8f800000-8f800fff : 0000:00:15.0 8f800000-8f8001ff : lpss_dev 8f800000-8f8001ff : i2c_designware.0 lpss_dev 8f800200-8f8002ff : lpss_priv 8f800800-8f800fff : idma64.0 - 8f800800-8f800fff : idma64.0 idma64.0 8f801000-8f801fff : 0000:00:15.1 8f801000-8f8011ff : lpss_dev 8f801000-8f8011ff : i2c_designware.1 lpss_dev 8f801200-8f8012ff : lpss_priv 8f801800-8f801fff : idma64.1 - 8f801800-8f801fff : idma64.1 idma64.1 8f802000-8f802fff : 0000:00:1e.0 8f802000-8f8021ff : lpss_dev - 8f802000-8f80201f : serial 8f802200-8f8022ff : lpss_priv 8f802800-8f802fff : idma64.2 - 8f802800-8f802fff : idma64.2 idma64.2 90000000-9fffffff : 0000:00:02.0 a0000000-a0ffffff : 0000:00:02.0 a1000000-a10fffff : 0000:00:1f.3 a1000000-a10fffff : Audio DSP - a1100000-a11fffff : PCI Bus 0000:0b - a1100000-a117ffff : 0000:0b:00.0 + a1100000-a11fffff : PCI Bus 0000:0a + a1100000-a117ffff : 0000:0a:00.0 a1100000-a117ffff : igb - a1180000-a1183fff : 0000:0b:00.0 + a1180000-a1183fff : 0000:0a:00.0 a1180000-a1183fff : igb - a1200000-a12fffff : PCI Bus 0000:0a - a1200000-a127ffff : 0000:0a:00.0 + a1200000-a12fffff : PCI Bus 0000:09 + a1200000-a127ffff : 0000:09:00.0 a1200000-a127ffff : igb - a1280000-a1283fff : 0000:0a:00.0 + a1280000-a1283fff : 0000:09:00.0 a1280000-a1283fff : igb - a1300000-a13fffff : PCI Bus 0000:09 - a1300000-a1303fff : 0000:09:00.0 - a1300000-a1303fff : nvme - a1400000-a17fffff : PCI Bus 0000:02 - a1400000-a17fffff : PCI Bus 0000:03 - a1400000-a14fffff : PCI Bus 0000:07 - a1400000-a147ffff : 0000:07:00.0 + a1300000-a16fffff : PCI Bus 0000:02 + a1300000-a16fffff : PCI Bus 0000:03 + a1300000-a13fffff : PCI Bus 0000:07 + a1300000-a137ffff : 0000:07:00.0 + a1300000-a137ffff : igb + a1380000-a1383fff : 0000:07:00.0 + a1380000-a1383fff : igb + a1400000-a14fffff : PCI Bus 0000:06 + a1400000-a147ffff : 0000:06:00.0 a1400000-a147ffff : igb - a1480000-a1483fff : 0000:07:00.0 + a1480000-a1483fff : 0000:06:00.0 a1480000-a1483fff : igb - a1500000-a15fffff : PCI Bus 0000:06 - a1500000-a157ffff : 0000:06:00.0 + a1500000-a15fffff : PCI Bus 0000:05 + a1500000-a157ffff : 0000:05:00.0 a1500000-a157ffff : igb - a1580000-a1583fff : 0000:06:00.0 + a1580000-a1583fff : 0000:05:00.0 a1580000-a1583fff : igb - a1600000-a16fffff : PCI Bus 0000:05 - a1600000-a167ffff : 0000:05:00.0 + a1600000-a16fffff : PCI Bus 0000:04 + a1600000-a167ffff : 0000:04:00.0 a1600000-a167ffff : igb - a1680000-a1683fff : 0000:05:00.0 + a1680000-a1683fff : 0000:04:00.0 a1680000-a1683fff : igb - a1700000-a17fffff : PCI Bus 0000:04 - a1700000-a177ffff : 0000:04:00.0 - a1700000-a177ffff : igb - a1780000-a1783fff : 0000:04:00.0 - a1780000-a1783fff : igb - a1800000-a18fffff : PCI Bus 0000:01 - a1800000-a1803fff : 0000:01:00.0 - a1800000-a1803fff : nvme - a1900000-a191ffff : 0000:00:1f.6 - a1900000-a191ffff : e1000e - a1920000-a192ffff : 0000:00:14.0 - a1920000-a192ffff : xhci-hcd - a1930000-a1933fff : 0000:00:1f.3 - a1930000-a1933fff : Audio DSP - a1934000-a1935fff : 0000:00:14.2 - a1936000-a1937fff : 0000:00:17.0 - a1936000-a1937fff : ahci - a1938000-a1938fff : 0000:00:08.0 - a1939000-a1939fff : 0000:00:12.0 - a1939000-a1939fff : Intel PCH thermal driver - a193a000-a193afff : 0000:00:14.2 - a193f000-a193f0ff : 0000:00:1f.4 - a1941000-a19417ff : 0000:00:17.0 - a1941000-a19417ff : ahci - a1942000-a19420ff : 0000:00:17.0 - a1942000-a19420ff : ahci + a1700000-a17fffff : PCI Bus 0000:01 + a1700000-a1703fff : 0000:01:00.0 + a1700000-a1703fff : nvme + a1800000-a181ffff : 0000:00:1f.6 + a1800000-a181ffff : e1000e + a1820000-a182ffff : 0000:00:14.0 + a1820000-a182ffff : xhci-hcd + a1830000-a1833fff : 0000:00:1f.3 + a1830000-a1833fff : Audio DSP + a1834000-a1835fff : 0000:00:14.2 + a1836000-a1837fff : 0000:00:17.0 + a1836000-a1837fff : ahci + a1838000-a1838fff : 0000:00:08.0 + a1839000-a1839fff : 0000:00:12.0 + a1839000-a1839fff : Intel PCH thermal driver + a183a000-a183afff : 0000:00:14.2 + a183f000-a183f0ff : 0000:00:1f.4 + a1841000-a18417ff : 0000:00:17.0 + a1841000-a18417ff : ahci + a1842000-a18420ff : 0000:00:17.0 + a1842000-a18420ff : ahci e0000000-efffffff : PCI MMCONFIG 0000 [bus 00-ff] e0000000-efffffff : Reserved e0000000-efffffff : pnp 00:08 @@ -332,34 +333,33 @@ fee00000-fee00fff : Reserved ff600000-ffffffff : Reserved 100000000-86c7fffff : System RAM - 24c000000-24ce025b6 : Kernel code - 24d000000-24d554fff : Kernel rodata - 24d600000-24d9658bf : Kernel data - 24dc2a000-24e1fffff : Kernel bss + 644e00000-645a010d6 : Kernel code + 645c00000-645f24fff : Kernel rodata + 646000000-6461a09bf : Kernel data + 6466b0000-6467fffff : Kernel bss 86c800000-86fffffff : RAM buffer - /dev/sda3: TYPE="ext4" - /dev/nvme1n1p2: TYPE="ext4" /dev/nvme0n1p3: TYPE="ext4" /dev/nvme0n1p4: TYPE="ext4" + /dev/sda2: TYPE="ext4" + /dev/sda3: TYPE="ext4" seri:/dev/ttyS0 type:portio base:0x3F8 irq:4 seri:/dev/ttyS1 type:portio base:0x2F8 irq:3 - seri:/dev/ttyS4 type:mmio base:0x8F802000 irq:20 bdf:"00:1e.0" 5, 6, 7, 10, 11, 12, 13, 15 - 32683232 kB + 32721136 kB 0, 1, 2, 3, 4, 5, 6, 7 - 32 + 16 @@ -942,10 +942,17 @@ - - + + + + +
0xfec00000
+ 0x0 + 120 + + \CHUB @@ -968,7 +975,7 @@ \_SB_ - + 0x8086 0x3e30 0x8086 @@ -1127,7 +1134,7 @@ 5b821a5c2f045f53425f504349305045473250454750085f41445200 - + 0x8086 0x3e98 0x8086 @@ -1237,7 +1244,7 @@ 0x7270 0x088000 - + 1 @@ -1251,7 +1258,7 @@ 0x7270 0x118000 - + 1 @@ -1278,7 +1285,7 @@ \_SB_.PCI0.XHC_ 5b821a5c2f035f53425f504349305848435f085f4144520c00001400 - + 8 @@ -1405,8 +1412,8 @@ 0x8086 0xa36f 0x050000 - - + + @@ -1437,10 +1444,10 @@ - \_SB_.PCI0.I2C0.UCMX - \_SB_.PCI0.I2C0.TPL1 \_SB_.PCI0.I2C0.TPD0 \_SB_.PCI0.I2C0.PA01 + \_SB_.PCI0.I2C0.TPL1 + \_SB_.PCI0.I2C0.UCMX \_SB_.PCI0.I2C0.PA01 MAX34407 @@ -1512,8 +1519,8 @@ - \_SB_.PCI0.I2C1.TPD0 \_SB_.PCI0.I2C1.TPL1 + \_SB_.PCI0.I2C1.TPD0 \_SB_.PCI0.I2C1.UCMX \_SB_.PCI0.I2C1.TPD0 @@ -1577,9 +1584,9 @@ - - - + + + 1 @@ -1656,7 +1663,7 @@ 0xa340 0x060400 - + 1 @@ -1670,14 +1677,14 @@ - + 0x126f 0x2263 0x126f 0x2263 0x010802 - + 8 @@ -1706,7 +1713,7 @@ 0x060400 - + 1 @@ -1725,7 +1732,7 @@ 0x2608 0x060400 - + @@ -1742,7 +1749,7 @@ 0x2608 0x060400 - + @@ -1761,8 +1768,8 @@ 0x020000 - - + + 1 @@ -1788,7 +1795,7 @@ 0x2608 0x060400 - + @@ -1807,8 +1814,8 @@ 0x020000 - - + + 1 @@ -1834,7 +1841,7 @@ 0x2608 0x060400 - + @@ -1853,8 +1860,8 @@ 0x020000 - - + + 1 @@ -1880,7 +1887,7 @@ 0x2608 0x060400 - + @@ -1899,8 +1906,8 @@ 0x020000 - - + + 1 @@ -1940,53 +1947,7 @@ - - 0x8086 - 0xa33a - 0x060400 - - - - - 1 - - - - - - - - - - - - 0x1b4b - 0x1160 - 0x1b4b - 0x1160 - 0x010802 - - - - - 1 - - - - - 32 - 1 - 0x10000000 - 1 - 0x0 - - - - - - - - + 0x8086 0xa33e 0x060400 @@ -2005,7 +1966,7 @@ - + 0x8086 0x1533 @@ -2055,7 +2016,7 @@ - + 0x8086 0x1533 @@ -2282,7 +2243,7 @@ 5b821a5c2f035f53425f5043493048444153085f4144520c03001f00 - + @@ -2343,7 +2304,7 @@ 5b821a5c2f035f53425f5043493053425553085f4144520c04001f00 - + 0x8086 @@ -2362,7 +2323,7 @@ \_SB_.PCI0.GLAN 5b821a5c2f035f53425f50434930474c414e085f4144520c06001f00 - + 1 @@ -2479,8 +2440,8 @@ - \_SB_.PCI0.PSDC \_SB_.PCI0.DSC1 + \_SB_.PCI0.PSDC \_SB_.PCI0.I2C2 @@ -2492,18 +2453,18 @@ - \_SB_.PCI0.I2C2.CAM0 - \_SB_.PCI0.I2C2.HDAC + \_SB_.PCI0.CLP0 + \_SB_.PCI0.I2C2.TPD0 \_SB_.PCI0.CLP2 \_SB_.PCI0.LNK0 + \_SB_.PCI0.I2C2.HDAC + \_SB_.PCI0.I2C2.TPL1 + \_SB_.PCI0.LNK3 + \_SB_.PCI0.I2C2.CAM0 + \_SB_.PCI0.CLP3 + \_SB_.PCI0.I2C2.UCMX \_SB_.PCI0.I2C2.PMIC \_SB_.PCI0.LNK1 - \_SB_.PCI0.CLP0 - \_SB_.PCI0.CLP3 - \_SB_.PCI0.LNK3 - \_SB_.PCI0.I2C2.TPL1 - \_SB_.PCI0.I2C2.UCMX - \_SB_.PCI0.I2C2.TPD0 \_SB_.PCI0.I2C2.CAM0 INT3471 @@ -2605,10 +2566,10 @@ + \_SB_.PCI0.I2C3.TPD0 \_SB_.PCI0.I2C3.UCMX \_SB_.PCI0.I2C3.TPL1 \_SB_.PCI0.CLP1 - \_SB_.PCI0.I2C3.TPD0 \_SB_.PCI0.LNK2 \_SB_.PCI0.I2C3.TPD0 diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid.xml b/misc/config_tools/data/cfl-k700-i7/hybrid.xml new file mode 100644 index 000000000..2fca0985e --- /dev/null +++ b/misc/config_tools/data/cfl-k700-i7/hybrid.xml @@ -0,0 +1,249 @@ + + + + n + /dev/ttyS0 + 5 + 5 + 3 + + + y + SCHED_BVT + y + y + n + n + + n + n + n + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + + n + y + n + y + n + n + + n + + + + + 0x2000 + 0x400000000 + + + 16 + 0x100 + 1 + 96 + 120 + 256 + + 16 + + + 0x00000010 + + + + SAFETY_VM + SAFETY_VM0 + + 0 + + + 3 + + + + 0 + + + 0 + 0 + + + 0x100000000 + 0x20000000 + 0x0 + 0x0 + + + Zephyr + KERNEL_ELF + Zephyr_ElfImage + + + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + n + n + + + + SERVICE_VM + ACRN_Service_VM + + 0 + + + 0 + 1 + 2 + + + 0 + 0 + 0 + + + 0 + + + ACRN Service OS + KERNEL_BZIMAGE + Linux_bzImage + + SERVICE_VM_OS_BOOTARGS + + + VUART_LEGACY_PIO + SERVICE_VM_COM1_BASE + SERVICE_VM_COM1_IRQ + + + VUART_LEGACY_PIO + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + /dev/nvme0n1p3 + rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 swiotlb=131072 + + + + + POST_STD_VM + POST_STD_VM1 + + 0 + + + 2 + + + 0 + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + + + POST_STD_VM + POST_STD_VM2 + + 0 + + + 2 + + + 0 + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + + diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml new file mode 100644 index 000000000..e4f7d2f6d --- /dev/null +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml @@ -0,0 +1,96 @@ + + + WINDOWS + POST_STD_VM1 + no + 4096 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + WaaG + + ./win10-ltsc.img + + + + + + + + + YOCTO + POST_STD_VM2 + no + 512 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG + + ./YaaG.img + + + + + + + \ No newline at end of file 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 33d8d2292..74f4ac127 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -106,7 +106,7 @@ 00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev 10) - 09:00.0 Non-Volatile memory controller: Silicon Motion, Inc. Device 2263 (rev 03) + 01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. SM2263EN/SM2263XT SSD Controller (rev 03) n diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml new file mode 100644 index 000000000..ad6c1e5eb --- /dev/null +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -0,0 +1,181 @@ + + + + n + /dev/ttyS0 + 5 + 5 + 3 + + + y + SCHED_BVT + y + y + n + n + + n + n + n + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + 0xfffff + + n + y + n + y + n + n + + n + + + + + 0x2000 + 0x400000000 + + + 16 + 0x100 + 1 + 96 + 120 + 64 + 64 + 16 + + + 0x00000010 + + + + PRE_STD_VM + PRE_STD_VM0 + + 0 + + + 0 + 2 + + + 0 + 0 + + + 0 + 0 + + + 0x100000000 + 0x20000000 + 0x0 + 0x0 + + + YOCTO + KERNEL_BZIMAGE + Linux_bzImage + Ubuntu + rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi + + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + 00:17.0 SATA controller: Intel Corporation Cannon Lake PCH SATA AHCI Controller (rev 10) + 00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev 10) + + + + n + + + + PRE_STD_VM + PRE_STD_VM1 + + 0 + + + 1 + 3 + + + 0 + 0 + + + 0 + 0 + + + 0x120000000 + 0x20000000 + 0x0 + 0x0 + + + YOCTO + KERNEL_BZIMAGE + Linux_bzImage + Ubuntu + rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M + consoleblank=0 tsc=reliable reboot=acpi + + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + 00:14.0 USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10) + + + + n + + + diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml new file mode 100644 index 000000000..90cc68187 --- /dev/null +++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml @@ -0,0 +1,284 @@ + + + WINDOWS + POST_STD_VM1 + no + 4096 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + WaaG + + ./win10-ltsc.img + + + + + + + + + PREEMPT-RT LINUX + POST_RT_VM1 + Hard RT + 1024 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + RT + + ./core-image-weston-intel-corei7-64.wic + @stdio:stdio_port + + + + + + + + YOCTO + POST_STD_VM2 + no + 512 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG3 + + ./YaaG.img + + + + + + + + YOCTO + POST_STD_VM3 + no + 512 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG4 + + ./YaaG.img + + + + + + + + YOCTO + POST_STD_VM4 + no + 512 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG5 + + ./YaaG.img + + + + + + + + YOCTO + POST_STD_VM5 + no + 512 + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + @stdio:stdio_port + YaaG6 + + ./YaaG.img + + + + + + + \ No newline at end of file diff --git a/misc/config_tools/data/generic_board/generic_board.xml b/misc/config_tools/data/generic_board/generic_board.xml index 6732fd155..e5ad8db96 100644 --- a/misc/config_tools/data/generic_board/generic_board.xml +++ b/misc/config_tools/data/generic_board/generic_board.xml @@ -227,9 +227,9 @@ 000ec000-000effff : PCI Bus 0000:00 000f0000-000fffff : PCI Bus 0000:00 000f0000-000fffff : System ROM - 00100000-2f7cdfff : System RAM - 2f7ce000-2f86cfff : Reserved - 2f86d000-33e6afff : System RAM + 00100000-2f7c9fff : System RAM + 2f7ca000-2f868fff : Reserved + 2f869000-33e6afff : System RAM 33e6b000-33e6bfff : Reserved 33e6c000-38136fff : System RAM 38137000-40b51fff : Reserved @@ -290,11 +290,11 @@ fee00000-fee00fff : Reserved ff000000-ffffffff : Reserved ff000000-ffffffff : pnp 00:05 - 100000000-3b07fffff : System RAM - 292a00000-293800ea0 : Kernel code - 293800ea1-29425363f : Kernel data - 29451d000-2949fffff : Kernel bss - 3b0800000-3b3ffffff : RAM buffer + 100000000-4b07fffff : System RAM + 35a400000-35b200ea0 : Kernel code + 35b200ea1-35bc536bf : Kernel data + 35bf1d000-35c3fffff : Kernel bss + 4b0800000-4b3ffffff : RAM buffer 4000000000-7fffffffff : PCI Bus 0000:00 4000000000-400fffffff : 0000:00:02.0 4000000000-40001d4fff : efifb @@ -345,7 +345,7 @@ 3, 5, 6, 7, 10, 11, 12, 13, 14, 15 - 11884904 kB + 16013644 kB 0, 1, 2, 3 @@ -749,8 +749,15 @@ - + + + +
0xfec00000
+ 0x0 + 120 + + \AMW0 @@ -1707,15 +1714,15 @@ - \_SB_.PC00.I2C1.TPL1 - \_SB_.PC00.I2C3.TPL1 - \_SB_.PC00.I2C1.TPD0 \_SB_.PC00.I2C3.TPD0 - \_SB_.PC00.I2C2.TPD0 + \_SB_.PC00.I2C1.TPL1 \_SB_.PC00.I2C0.TPL1 + \_SB_.PC00.I2C1.TPD0 + \_SB_.PC00.I2C3.TPL1 + \_SB_.PC00.I2C2.TPD0 + \_SB_.PC00.I2C2.TPL1 \_SB_.PC00.I2C0.TPD0 \_SB_.PC00.I2C1.UCM1 - \_SB_.PC00.I2C2.TPL1 \_SB_.PC00.I2C0.TPD0 PNP0C50 @@ -1800,11 +1807,11 @@ \_SB_.PC00.I2C2 5b821a5c2f035f53425f5043303049324332085f4144520c02001500 - \_SB_.PC00.I2C2.PMIC - \_SB_.PC00.FLM1 - \_SB_.PC00.LNK2 - \_SB_.PC00.I2C2.CAM0 \_SB_.PC00.FLM2 + \_SB_.PC00.FLM1 + \_SB_.PC00.I2C2.CAM0 + \_SB_.PC00.I2C2.PMIC + \_SB_.PC00.LNK2 \_SB_.PC00.I2C2.CAM0 INT3471 @@ -1866,20 +1873,20 @@ \_SB_.PC00.I2C3 5b821a5c2f035f53425f5043303049324333085f4144520c03001500 - \_SB_.PC00.LNK5 - \_SB_.PC00.CLP4 - \_SB_.PC00.CLP3 - \_SB_.PC00.FLM4 - \_SB_.PC00.LNK1 - \_SB_.PC00.LNK3 - \_SB_.PC00.CLP5 - \_SB_.PC00.LNK4 - \_SB_.PC00.FLM3 - \_SB_.PC00.FLM5 - \_SB_.PC00.LNK0 \_SB_.PC00.CLP1 - \_SB_.PC00.CLP0 \_SB_.PC00.CLP2 + \_SB_.PC00.FLM5 + \_SB_.PC00.LNK1 + \_SB_.PC00.CLP4 + \_SB_.PC00.LNK0 + \_SB_.PC00.LNK4 + \_SB_.PC00.CLP0 + \_SB_.PC00.LNK5 + \_SB_.PC00.LNK3 + \_SB_.PC00.FLM4 + \_SB_.PC00.FLM3 + \_SB_.PC00.CLP5 + \_SB_.PC00.CLP3 \_SB_.PC00.I2C3.TPD0 PNP0C50 @@ -2018,9 +2025,9 @@ \_SB_.PC00.I2C5 5b821a5c2f035f53425f5043303049324335085f4144520c01001900 + \_SB_.PC00.I2C5.PA02 \_SB_.PC00.I2C5.PA03 \_SB_.PC00.I2C5.PA01 - \_SB_.PC00.I2C5.PA02 \_SB_.PC00.I2C5.PA04 \_SB_.PC00.I2C5.PA01 @@ -3226,18 +3233,18 @@ - \_SB_.PC00.DSC5 - \_SB_.PC00.FLM1 \_SB_.PC00.DSC3 - \_SB_.PC00.FLM4 - \_SB_.PC00.FLM3 - \_SB_.PC00.FLM5 - \_SB_.PC00.FLM0 - \_SB_.PC00.FLM2 - \_SB_.PC00.DSC4 - \_SB_.PC00.DSC1 - \_SB_.PC00.UA00.BTH0 \_SB_.PC00.DSC2 + \_SB_.PC00.FLM2 + \_SB_.PC00.FLM5 + \_SB_.PC00.UA00.BTH0 + \_SB_.PC00.FLM1 + \_SB_.PC00.FLM0 + \_SB_.PC00.DSC1 + \_SB_.PC00.FLM3 + \_SB_.PC00.DSC4 + \_SB_.PC00.DSC5 + \_SB_.PC00.FLM4 \_SB_.HIDD diff --git a/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml b/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml index 221c5b0dd..1ac823dc0 100644 --- a/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml +++ b/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml @@ -227,9 +227,9 @@ 000ec000-000effff : PCI Bus 0000:00 000f0000-000fffff : PCI Bus 0000:00 000f0000-000fffff : System ROM - 00100000-2f7cdfff : System RAM - 2f7ce000-2f86cfff : Reserved - 2f86d000-33e6afff : System RAM + 00100000-2f7c9fff : System RAM + 2f7ca000-2f868fff : Reserved + 2f869000-33e6afff : System RAM 33e6b000-33e6bfff : Reserved 33e6c000-38136fff : System RAM 38137000-40b51fff : Reserved @@ -290,11 +290,11 @@ fee00000-fee00fff : Reserved ff000000-ffffffff : Reserved ff000000-ffffffff : pnp 00:05 - 100000000-3b07fffff : System RAM - 292a00000-293800ea0 : Kernel code - 293800ea1-29425363f : Kernel data - 29451d000-2949fffff : Kernel bss - 3b0800000-3b3ffffff : RAM buffer + 100000000-4b07fffff : System RAM + 35a400000-35b200ea0 : Kernel code + 35b200ea1-35bc536bf : Kernel data + 35bf1d000-35c3fffff : Kernel bss + 4b0800000-4b3ffffff : RAM buffer 4000000000-7fffffffff : PCI Bus 0000:00 4000000000-400fffffff : 0000:00:02.0 4000000000-40001d4fff : efifb @@ -345,7 +345,7 @@ 3, 5, 6, 7, 10, 11, 12, 13, 14, 15 - 11884904 kB + 16013644 kB 0, 1, 2, 3 @@ -749,8 +749,15 @@ - + + + +
0xfec00000
+ 0x0 + 120 + + \AMW0 @@ -1707,15 +1714,15 @@ - \_SB_.PC00.I2C1.TPL1 - \_SB_.PC00.I2C3.TPL1 - \_SB_.PC00.I2C1.TPD0 \_SB_.PC00.I2C3.TPD0 - \_SB_.PC00.I2C2.TPD0 + \_SB_.PC00.I2C1.TPL1 \_SB_.PC00.I2C0.TPL1 + \_SB_.PC00.I2C1.TPD0 + \_SB_.PC00.I2C3.TPL1 + \_SB_.PC00.I2C2.TPD0 + \_SB_.PC00.I2C2.TPL1 \_SB_.PC00.I2C0.TPD0 \_SB_.PC00.I2C1.UCM1 - \_SB_.PC00.I2C2.TPL1 \_SB_.PC00.I2C0.TPD0 PNP0C50 @@ -1800,11 +1807,11 @@ \_SB_.PC00.I2C2 5b821a5c2f035f53425f5043303049324332085f4144520c02001500 - \_SB_.PC00.I2C2.PMIC - \_SB_.PC00.FLM1 - \_SB_.PC00.LNK2 - \_SB_.PC00.I2C2.CAM0 \_SB_.PC00.FLM2 + \_SB_.PC00.FLM1 + \_SB_.PC00.I2C2.CAM0 + \_SB_.PC00.I2C2.PMIC + \_SB_.PC00.LNK2 \_SB_.PC00.I2C2.CAM0 INT3471 @@ -1866,20 +1873,20 @@ \_SB_.PC00.I2C3 5b821a5c2f035f53425f5043303049324333085f4144520c03001500 - \_SB_.PC00.LNK5 - \_SB_.PC00.CLP4 - \_SB_.PC00.CLP3 - \_SB_.PC00.FLM4 - \_SB_.PC00.LNK1 - \_SB_.PC00.LNK3 - \_SB_.PC00.CLP5 - \_SB_.PC00.LNK4 - \_SB_.PC00.FLM3 - \_SB_.PC00.FLM5 - \_SB_.PC00.LNK0 \_SB_.PC00.CLP1 - \_SB_.PC00.CLP0 \_SB_.PC00.CLP2 + \_SB_.PC00.FLM5 + \_SB_.PC00.LNK1 + \_SB_.PC00.CLP4 + \_SB_.PC00.LNK0 + \_SB_.PC00.LNK4 + \_SB_.PC00.CLP0 + \_SB_.PC00.LNK5 + \_SB_.PC00.LNK3 + \_SB_.PC00.FLM4 + \_SB_.PC00.FLM3 + \_SB_.PC00.CLP5 + \_SB_.PC00.CLP3 \_SB_.PC00.I2C3.TPD0 PNP0C50 @@ -2018,9 +2025,9 @@ \_SB_.PC00.I2C5 5b821a5c2f035f53425f5043303049324335085f4144520c01001900 + \_SB_.PC00.I2C5.PA02 \_SB_.PC00.I2C5.PA03 \_SB_.PC00.I2C5.PA01 - \_SB_.PC00.I2C5.PA02 \_SB_.PC00.I2C5.PA04 \_SB_.PC00.I2C5.PA01 @@ -3226,18 +3233,18 @@ - \_SB_.PC00.DSC5 - \_SB_.PC00.FLM1 \_SB_.PC00.DSC3 - \_SB_.PC00.FLM4 - \_SB_.PC00.FLM3 - \_SB_.PC00.FLM5 - \_SB_.PC00.FLM0 - \_SB_.PC00.FLM2 - \_SB_.PC00.DSC4 - \_SB_.PC00.DSC1 - \_SB_.PC00.UA00.BTH0 \_SB_.PC00.DSC2 + \_SB_.PC00.FLM2 + \_SB_.PC00.FLM5 + \_SB_.PC00.UA00.BTH0 + \_SB_.PC00.FLM1 + \_SB_.PC00.FLM0 + \_SB_.PC00.DSC1 + \_SB_.PC00.FLM3 + \_SB_.PC00.DSC4 + \_SB_.PC00.DSC5 + \_SB_.PC00.FLM4 \_SB_.HIDD diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml index e3835460e..4690139ae 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml @@ -22,9 +22,9 @@ - + - 00:02.0 VGA compatible controller: Intel Corporation Device 3ea0 (rev 02) + 00:02.0 VGA compatible controller: Intel Corporation WhiskeyLake-U GT2 [UHD Graphics 620] diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index d73ddf89f..61d181649 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -103,8 +103,8 @@ 1 - 00:17.0 SATA controller: Intel Corporation Device 9dd3 (rev 30) - 03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + 00:17.0 SATA controller: Intel Corporation Cannon Point-LP SATA Controller [AHCI Mode] (rev 30) + 04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) n @@ -165,8 +165,8 @@ 1 - 00:14.0 USB controller: Intel Corporation Device 9ded (rev 30) - 04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) + 00:14.0 USB controller: Intel Corporation Cannon Point-LP USB 3.1 xHCI Controller (rev 30) + 03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) n diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml index 6cec1f8b6..874f8495d 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml @@ -24,7 +24,7 @@ - + 0x8086 0x3ea0 0x8086 @@ -953,7 +960,7 @@ \_SB_.PCI0.IPU0 5b821a5c2f035f53425f5043493049505530085f4144520c00000500 - + 0x8086 0x9df9 0x8086 @@ -978,7 +985,7 @@ \_SB_.PCI0.ISHD 5b821a5c2f035f53425f5043493049534844085f4144520c00001300 - + 0x8086 0x9ded 0x8086 @@ -1076,7 +1083,7 @@ \_SB_.PCI0.XDCI 5b8244055c2f035f53425f5043493058444349085f53545211330a3043004e004c00200050004300480020005800440043004900200063006f006e00740072006f006c006c00650072000000085f4144520c01001400 - + 0x8086 0x9def 0x8086 @@ -1102,7 +1109,7 @@ \_SB_.PCI0.GPI0 - + 0x8086 0x9de0 0x8086 @@ -1119,7 +1126,7 @@ - + 0x8086 0x9dd3 0x8086 @@ -1210,7 +1217,7 @@ 5b821b5c2f045f53425f5043493050454d4343415244085f4144520a08 - + 0x8086 0x9db8 0x060400 @@ -1222,7 +1229,7 @@ - + 0x8086 0x9dbc 0x060400 @@ -1240,7 +1247,7 @@ - + 0x126f 0x2263 0x126f @@ -1270,7 +1277,7 @@ - + 0x8086 0x9db0 0x060400 @@ -1319,7 +1326,7 @@ - + 0x8086 0x9db1 0x060400 @@ -1368,7 +1375,7 @@ - + 0x8086 0x9d84 0x8086 @@ -1654,7 +1661,7 @@ - + 0x8086 0x9dc8 0x8086 @@ -1715,7 +1722,7 @@ - + 0x8086 0x9da3 0x8086 @@ -1727,7 +1734,7 @@ - + 0x8086 0x9da4 0x8086 @@ -1844,8 +1851,8 @@ - \_SB_.PCI0.PSDC \_SB_.PCI0.DSC1 + \_SB_.PCI0.PSDC \_SB_.PCI0.I2C0 @@ -1857,11 +1864,11 @@ + \_SB_.PCI0.I2C0.TPD0 \_SB_.PCI0.I2C0.HDAC \_SB_.PCI0.I2C0.PA01 - \_SB_.PCI0.I2C0.TPL1 \_SB_.PCI0.I2C0.UCMX - \_SB_.PCI0.I2C0.TPD0 + \_SB_.PCI0.I2C0.TPL1 \_SB_.PCI0.I2C0.HDAC INT0000 @@ -1945,9 +1952,9 @@ + \_SB_.PCI0.I2C1.UCMX \_SB_.PCI0.I2C1.TPL1 \_SB_.PCI0.I2C1.TPD0 - \_SB_.PCI0.I2C1.UCMX \_SB_.PCI0.I2C1.TPD0 PNP0C50 @@ -2005,16 +2012,16 @@ \_SB_.PCI0.LNK3 - \_SB_.PCI0.I2C2.TPD0 \_SB_.PCI0.I2C2.CAM0 - \_SB_.PCI0.LNK0 - \_SB_.PCI0.I2C2.PMIC - \_SB_.PCI0.I2C2.TPL1 - \_SB_.PCI0.CLP0 - \_SB_.PCI0.I2C2.UCMX - \_SB_.PCI0.CLP2 \_SB_.PCI0.LNK1 + \_SB_.PCI0.CLP0 + \_SB_.PCI0.LNK0 + \_SB_.PCI0.I2C2.TPL1 + \_SB_.PCI0.I2C2.UCMX + \_SB_.PCI0.I2C2.TPD0 \_SB_.PCI0.CLP3 + \_SB_.PCI0.CLP2 + \_SB_.PCI0.I2C2.PMIC \_SB_.PCI0.I2C2.CAM0 INT3471 @@ -2102,11 +2109,11 @@ - \_SB_.PCI0.LNK2 - \_SB_.PCI0.I2C3.UCMX \_SB_.PCI0.I2C3.TPL1 - \_SB_.PCI0.CLP1 \_SB_.PCI0.I2C3.TPD0 + \_SB_.PCI0.I2C3.UCMX + \_SB_.PCI0.CLP1 + \_SB_.PCI0.LNK2 \_SB_.PCI0.I2C3.TPD0 PNP0C50 @@ -2343,10 +2350,6 @@ \_SB_.PCI0.RP09.PXSX 5b821a5c2f045f53425f504349305250303950585358085f41445200 - - \_SB_.PCI0.RP09.SL09 - 5b821b5c2f045f53425f5043493052503039534c3039085f4144520aff - \_SB_.PCI0.RP10 @@ -2737,13 +2740,13 @@ \_SB_.UBTC PNP0CA0 0 - 5b8243045c2e5f53425f55425443085f4849440c5662c000085f4349440c41d00ca0085f55494400085f41445200085f43525311110a0e860900010010608c001000007900 + 5b8243045c2e5f53425f55425443085f4849440c5662c000085f4349440c41d00ca0085f55494400085f41445200085f43525311110a0e8609000100b0568a001000007900 n n n - + \_SB_.UBTC.CR01 5b82165c2f035f53425f5542544343523031085f41445200