From 585c652f812ac769d58262bbbce743aea6a672d1 Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Tue, 14 Jul 2020 11:33:18 +0800 Subject: [PATCH] acrn-config: update board xml for ehl-crb-b add tsn devices and the NVME device in the board xml Tracked-On: #4831 Signed-off-by: Shuang Zheng Reviewed-by: Binbin Wu --- .../acrn-config/xmls/board-xmls/ehl-crb-b.xml | 281 ++++++++++-------- 1 file changed, 153 insertions(+), 128 deletions(-) diff --git a/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml b/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml index 5c7b06d08..cb7741419 100644 --- a/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml +++ b/misc/acrn-config/xmls/board-xmls/ehl-crb-b.xml @@ -19,63 +19,71 @@ Region 0: Memory at 82000000 (64-bit, non-prefetchable) [size=16M] Region 2: Memory at 70000000 (64-bit, prefetchable) [size=256M] 00:08.0 System peripheral: Intel Corporation Device 4511 - Region 0: Memory at 833a2000 (64-bit, non-prefetchable) [disabled] [size=4K] + Region 0: Memory at 834e4000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:10.0 Serial bus controller [0c80]: Intel Corporation Device 4b44 - Region 0: Memory at 833a3000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 83441000 (64-bit, non-prefetchable) [virtual] [size=4K] 00:10.1 Serial bus controller [0c80]: Intel Corporation Device 4b45 - Region 0: Memory at 833a4000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 83444000 (64-bit, non-prefetchable) [virtual] [size=4K] 00:13.0 Serial bus controller [0c80]: Intel Corporation Device 4b84 - Region 0: Memory at 83398000 (64-bit, non-prefetchable) [disabled] [size=8K] + Region 0: Memory at 834d8000 (64-bit, non-prefetchable) [disabled] [size=8K] 00:14.0 USB controller: Intel Corporation Device 4b7d - Region 0: Memory at 83380000 (64-bit, non-prefetchable) [size=64K] + Region 0: Memory at 834c0000 (64-bit, non-prefetchable) [size=64K] 00:14.2 RAM memory: Intel Corporation Device 4b7f - Region 0: Memory at 83390000 (64-bit, non-prefetchable) [disabled] [size=16K] - Region 2: Memory at 833a5000 (64-bit, non-prefetchable) [disabled] [size=4K] + Region 0: Memory at 834d0000 (64-bit, non-prefetchable) [disabled] [size=16K] + Region 2: Memory at 834e7000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:15.0 Serial bus controller [0c80]: Intel Corporation Device 4b78 - Region 0: Memory at 833a6000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 83445000 (64-bit, non-prefetchable) [virtual] [size=4K] 00:15.2 Serial bus controller [0c80]: Intel Corporation Device 4b7a - Region 0: Memory at 833a7000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 83446000 (64-bit, non-prefetchable) [virtual] [size=4K] 00:15.3 Serial bus controller [0c80]: Intel Corporation Device 4b7b - Region 0: Memory at 833a8000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 83447000 (64-bit, non-prefetchable) [virtual] [size=4K] 00:16.0 Communication controller: Intel Corporation Device 4b70 - Region 0: Memory at 833a9000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 834eb000 (64-bit, non-prefetchable) [size=4K] 00:17.0 SATA controller: Intel Corporation Device 4b63 - Region 0: Memory at 833a0000 (32-bit, non-prefetchable) [size=8K] - Region 1: Memory at 833b3000 (32-bit, non-prefetchable) [size=256] - Region 5: Memory at 833b2000 (32-bit, non-prefetchable) [size=2K] + Region 0: Memory at 834e2000 (32-bit, non-prefetchable) [size=8K] + Region 1: Memory at 834f6000 (32-bit, non-prefetchable) [size=256] + Region 5: Memory at 834f5000 (32-bit, non-prefetchable) [size=2K] 00:19.0 Serial bus controller [0c80]: Intel Corporation Device 4b4b - Region 0: Memory at 833aa000 (64-bit, non-prefetchable) [virtual] [size=4K] + Region 0: Memory at 83448000 (64-bit, non-prefetchable) [virtual] [size=4K] 00:19.2 Communication controller: Intel Corporation Device 4b4d - Region 0: Memory at 833ab000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 83449000 (64-bit, non-prefetchable) [size=4K] 00:1a.0 SD Host controller: Intel Corporation Device 4b47 - Region 0: Memory at 833ac000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 834ee000 (64-bit, non-prefetchable) [size=4K] 00:1a.1 SD Host controller: Intel Corporation Device 4b48 - Region 0: Memory at 833ad000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 834ef000 (64-bit, non-prefetchable) [size=4K] 00:1a.3 Non-VGA unclassified device: Intel Corporation Device 4b4a - Region 0: Memory at 83300000 (64-bit, non-prefetchable) [disabled] [size=256K] + Region 0: Memory at 83400000 (64-bit, non-prefetchable) [disabled] [size=256K] 00:1b.0 Serial bus controller [0c80]: Intel Corporation Device 4bb9 - Region 0: Memory at 8339a000 (64-bit, non-prefetchable) [size=8K] + Region 0: Memory at 834da000 (64-bit, non-prefetchable) [size=8K] 00:1b.1 Serial bus controller [0c80]: Intel Corporation Device 4bba - Region 0: Memory at 8339c000 (64-bit, non-prefetchable) [size=8K] + Region 0: Memory at 834dc000 (64-bit, non-prefetchable) [size=8K] 00:1b.6 Serial bus controller [0c80]: Intel Corporation Device 4bbf - Region 0: Memory at 8339e000 (64-bit, non-prefetchable) [size=8K] + Region 0: Memory at 834de000 (64-bit, non-prefetchable) [size=8K] + 00:1c.0 PCI bridge: Intel Corporation Device 4b38 00:1d.0 System peripheral: Intel Corporation Device 4bb3 Region 0: Memory at 83000000 (64-bit, non-prefetchable) [disabled] [size=2M] 00:1d.1 Ethernet controller: Intel Corporation Device 4ba0 - Region 0: Memory at 83340000 (64-bit, non-prefetchable) [size=256K] + Region 0: Memory at 83500000 (64-bit, non-prefetchable) [disabled] [size=256K] + 00:1d.2 Ethernet controller: Intel Corporation Device 4bb0 + Region 0: Memory at 83480000 (64-bit, non-prefetchable) [disabled] [size=256K] 00:1e.0 Communication controller: Intel Corporation Device 4b28 - Region 0: Memory at 833ae000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 8344a000 (64-bit, non-prefetchable) [size=4K] 00:1e.1 Communication controller: Intel Corporation Device 4b29 - Region 0: Memory at 833af000 (64-bit, non-prefetchable) [size=4K] + Region 0: Memory at 8344b000 (64-bit, non-prefetchable) [size=4K] + 00:1e.4 Ethernet controller: Intel Corporation Device 4b32 + Region 0: Memory at 83442000 (64-bit, non-prefetchable) [disabled] [size=8K] + Region 2: Memory at 834f2000 (64-bit, non-prefetchable) [disabled] [size=4K] 00:1f.0 ISA bridge: Intel Corporation Device 4b00 00:1f.3 Multimedia audio controller: Intel Corporation Device 4b58 - Region 0: Memory at 83394000 (64-bit, non-prefetchable) [disabled] [size=16K] - Region 4: Memory at 83200000 (64-bit, non-prefetchable) [disabled] [size=1M] + Region 0: Memory at 834d4000 (64-bit, non-prefetchable) [size=16K] + Region 4: Memory at 83200000 (64-bit, non-prefetchable) [size=1M] 00:1f.4 SMBus: Intel Corporation Device 4b23 - Region 0: Memory at 833b0000 (64-bit, non-prefetchable) [size=256] + Region 0: Memory at 834f3000 (64-bit, non-prefetchable) [size=256] 00:1f.5 Serial bus controller [0c80]: Intel Corporation Device 4b24 - Region 0: Memory at 833b1000 (32-bit, non-prefetchable) [size=4K] + Region 0: Memory at 8344c000 (32-bit, non-prefetchable) [size=4K] Region 1: Memory at 80000000 (32-bit, non-prefetchable) [size=32M] + 01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. Device 2263 (rev 03) + Region 0: Memory at 83300000 (64-bit, non-prefetchable) [size=16K] @@ -100,19 +108,23 @@ 00:1b.0 0c80: 8086:4bb9 00:1b.1 0c80: 8086:4bba 00:1b.6 0c80: 8086:4bbf + 00:1c.0 0604: 8086:4b38 00:1d.0 0880: 8086:4bb3 00:1d.1 0200: 8086:4ba0 + 00:1d.2 0200: 8086:4bb0 00:1e.0 0780: 8086:4b28 00:1e.1 0780: 8086:4b29 + 00:1e.4 0200: 8086:4b32 00:1f.0 0601: 8086:4b00 00:1f.3 0401: 8086:4b58 00:1f.4 0c05: 8086:4b23 00:1f.5 0c80: 8086:4b24 + 01:00.0 0108: 126f:2263 (rev 03) - #define WAKE_VECTOR_32 0x66B9700CUL - #define WAKE_VECTOR_64 0x66B97018UL + #define WAKE_VECTOR_32 0x66BB000CUL + #define WAKE_VECTOR_64 0x66BB0018UL @@ -208,9 +220,9 @@ - {{SPACE_FFixedHW, 0x01U, 0x02U, 0x01U, 0x00UL}, 0x01U, 0x01U, 0x00U}, /* C1 */ - {{SPACE_FFixedHW, 0x01U, 0x02U, 0x01U, 0x31UL}, 0x02U, 0xFDU, 0x00U}, /* C2 */ - {{SPACE_FFixedHW, 0x01U, 0x02U, 0x01U, 0x60UL}, 0x03U, 0x418U, 0x00U}, /* C3 */ + {{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x01U, 0x00U}, /* C1 */ + {{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1816UL}, 0x02U, 0xFDU, 0x00U}, /* C2 */ + {{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1819UL}, 0x03U, 0x418U, 0x00U}, /* C3 */ @@ -237,100 +249,112 @@ 000f0000-000fffff : System ROM 00100000-3fffffff : System RAM 40000000-403fffff : Reserved - 40400000-61646fff : System RAM - 61647000-61647fff : Reserved - 61648000-6485cfff : System RAM - 6485d000-66b8bfff : Reserved + 40400000-6146bfff : System RAM + 6146c000-6146cfff : Reserved + 6146d000-6485cfff : System RAM + 6485d000-648b9fff : Unknown E820 type + 648ba000-66b8bfff : Reserved 65043000-65052fff : pnp 00:03 66b8c000-66be5fff : ACPI Non-volatile Storage 66be6000-66c4efff : ACPI Tables 66c4f000-66c4ffff : System RAM 66c50000-6fffffff : Reserved + 6c000000-6fffffff : Graphics Stolen Memory 70000000-bfffffff : PCI Bus 0000:00 70000000-7fffffff : 0000:00:02.0 - 70000000-707e8fff : BOOTFB 80000000-81ffffff : 0000:00:1f.5 82000000-82ffffff : 0000:00:02.0 83000000-831fffff : 0000:00:1d.0 83200000-832fffff : 0000:00:1f.3 - 83300000-8333ffff : 0000:00:1a.3 - 83340000-8337ffff : 0000:00:1d.1 - 83380000-8338ffff : 0000:00:14.0 - 83380000-8338ffff : xhci-hcd - 83390000-83393fff : 0000:00:14.2 - 83394000-83397fff : 0000:00:1f.3 - 83398000-83399fff : 0000:00:13.0 - 8339a000-8339bfff : 0000:00:1b.0 - 8339a000-8339bfff : 0000:00:1b.0 - 8339c000-8339dfff : 0000:00:1b.1 - 8339c000-8339dfff : 0000:00:1b.1 - 8339e000-8339ffff : 0000:00:1b.6 - 8339e000-8339ffff : 0000:00:1b.6 - 833a0000-833a1fff : 0000:00:17.0 - 833a0000-833a1fff : ahci - 833a2000-833a2fff : 0000:00:08.0 - 833a3000-833a3fff : 0000:00:10.0 - 833a3000-833a31ff : lpss_dev - 833a3000-833a31ff : i2c_designware.0 - 833a3200-833a32ff : lpss_priv - 833a4000-833a4fff : 0000:00:10.1 - 833a4000-833a41ff : lpss_dev - 833a4000-833a41ff : i2c_designware.1 - 833a4200-833a42ff : lpss_priv - 833a5000-833a5fff : 0000:00:14.2 - 833a6000-833a6fff : 0000:00:15.0 - 833a6000-833a61ff : lpss_dev - 833a6000-833a61ff : i2c_designware.2 - 833a6200-833a62ff : lpss_priv - 833a6800-833a6fff : idma64.2 - 833a6800-833a6fff : idma64.2 - 833a7000-833a7fff : 0000:00:15.2 - 833a7000-833a71ff : lpss_dev - 833a7000-833a71ff : i2c_designware.3 - 833a7200-833a72ff : lpss_priv - 833a7800-833a7fff : idma64.3 - 833a7800-833a7fff : idma64.3 - 833a8000-833a8fff : 0000:00:15.3 - 833a8000-833a81ff : lpss_dev - 833a8000-833a81ff : i2c_designware.4 - 833a8200-833a82ff : lpss_priv - 833a8800-833a8fff : idma64.4 - 833a8800-833a8fff : idma64.4 - 833a9000-833a9fff : 0000:00:16.0 - 833a9000-833a9fff : mei_me - 833aa000-833aafff : 0000:00:19.0 - 833aa000-833aa1ff : lpss_dev - 833aa000-833aa1ff : i2c_designware.5 - 833aa200-833aa2ff : lpss_priv - 833aa800-833aafff : idma64.5 - 833aa800-833aafff : idma64.5 - 833ab000-833abfff : 0000:00:19.2 - 833ab000-833ab1ff : lpss_dev - 833ab000-833ab01f : serial - 833ab200-833ab2ff : lpss_priv - 833ab800-833abfff : idma64.6 - 833ab800-833abfff : idma64.6 - 833ac000-833acfff : 0000:00:1a.0 - 833ac000-833acfff : mmc0 - 833ad000-833adfff : 0000:00:1a.1 - 833ae000-833aefff : 0000:00:1e.0 - 833ae000-833ae1ff : lpss_dev - 833ae000-833ae01f : serial - 833ae200-833ae2ff : lpss_priv - 833ae800-833aefff : idma64.7 - 833ae800-833aefff : idma64.7 - 833af000-833affff : 0000:00:1e.1 - 833af000-833af1ff : lpss_dev - 833af000-833af01f : serial - 833af200-833af2ff : lpss_priv - 833af800-833affff : idma64.8 - 833af800-833affff : idma64.8 - 833b0000-833b00ff : 0000:00:1f.4 - 833b1000-833b1fff : 0000:00:1f.5 - 833b2000-833b27ff : 0000:00:17.0 - 833b2000-833b27ff : ahci - 833b3000-833b30ff : 0000:00:17.0 - 833b3000-833b30ff : ahci + 83200000-832fffff : ICH HD audio + 83300000-833fffff : PCI Bus 0000:01 + 83300000-83303fff : 0000:01:00.0 + 83300000-83303fff : nvme + 83400000-8343ffff : 0000:00:1a.3 + 83440200-83440203 : INTC1033:01 + 83440204-83440207 : INTC1033:01 + 83441000-83441fff : 0000:00:10.0 + 83441000-834411ff : lpss_dev + 83441000-834411ff : i2c_designware.0 + 83441200-834412ff : lpss_priv + 83442000-83443fff : 0000:00:1e.4 + 83444000-83444fff : 0000:00:10.1 + 83444000-834441ff : lpss_dev + 83444000-834441ff : i2c_designware.1 + 83444200-834442ff : lpss_priv + 83445000-83445fff : 0000:00:15.0 + 83445000-834451ff : lpss_dev + 83445000-834451ff : i2c_designware.2 + 83445200-834452ff : lpss_priv + 83445800-83445fff : idma64.2 + 83445800-83445fff : idma64.2 + 83446000-83446fff : 0000:00:15.2 + 83446000-834461ff : lpss_dev + 83446000-834461ff : i2c_designware.3 + 83446200-834462ff : lpss_priv + 83446800-83446fff : idma64.3 + 83446800-83446fff : idma64.3 + 83447000-83447fff : 0000:00:15.3 + 83447000-834471ff : lpss_dev + 83447000-834471ff : i2c_designware.4 + 83447200-834472ff : lpss_priv + 83447800-83447fff : idma64.4 + 83447800-83447fff : idma64.4 + 83448000-83448fff : 0000:00:19.0 + 83448000-834481ff : lpss_dev + 83448000-834481ff : i2c_designware.5 + 83448200-834482ff : lpss_priv + 83448800-83448fff : idma64.5 + 83448800-83448fff : idma64.5 + 83449000-83449fff : 0000:00:19.2 + 83449000-834491ff : lpss_dev + 83449000-8344901f : serial + 83449200-834492ff : lpss_priv + 83449800-83449fff : idma64.6 + 83449800-83449fff : idma64.6 + 8344a000-8344afff : 0000:00:1e.0 + 8344a000-8344a1ff : lpss_dev + 8344a000-8344a01f : serial + 8344a200-8344a2ff : lpss_priv + 8344a800-8344afff : idma64.7 + 8344a800-8344afff : idma64.7 + 8344b000-8344bfff : 0000:00:1e.1 + 8344b000-8344b1ff : lpss_dev + 8344b000-8344b01f : serial + 8344b200-8344b2ff : lpss_priv + 8344b800-8344bfff : idma64.8 + 8344b800-8344bfff : idma64.8 + 8344c000-8344cfff : 0000:00:1f.5 + 83480000-834bffff : 0000:00:1d.2 + 834c0000-834cffff : 0000:00:14.0 + 834c0000-834cffff : xhci-hcd + 834d0000-834d3fff : 0000:00:14.2 + 834d4000-834d7fff : 0000:00:1f.3 + 834d4000-834d7fff : ICH HD audio + 834d8000-834d9fff : 0000:00:13.0 + 834da000-834dbfff : 0000:00:1b.0 + 834da000-834dbfff : 0000:00:1b.0 + 834dc000-834ddfff : 0000:00:1b.1 + 834dc000-834ddfff : 0000:00:1b.1 + 834de000-834dffff : 0000:00:1b.6 + 834de000-834dffff : 0000:00:1b.6 + 834e0200-834e0203 : INTC1033:00 + 834e0204-834e0207 : INTC1033:00 + 834e2000-834e3fff : 0000:00:17.0 + 834e2000-834e3fff : ahci + 834e4000-834e4fff : 0000:00:08.0 + 834e7000-834e7fff : 0000:00:14.2 + 834eb000-834ebfff : 0000:00:16.0 + 834ee000-834eefff : 0000:00:1a.0 + 834ee000-834eefff : mmc0 + 834ef000-834effff : 0000:00:1a.1 + 834f2000-834f2fff : 0000:00:1e.4 + 834f3000-834f30ff : 0000:00:1f.4 + 834f5000-834f57ff : 0000:00:17.0 + 834f5000-834f57ff : ahci + 834f6000-834f60ff : 0000:00:17.0 + 834f6000-834f60ff : ahci + 83500000-8353ffff : 0000:00:1d.1 c0000000-cfffffff : PCI MMCONFIG 0000 [bus 00-ff] c0000000-cfffffff : pnp 00:03 fd000000-fd68ffff : pnp 00:04 @@ -350,7 +374,7 @@ fed00000-fed003ff : HPET 0 fed00000-fed003ff : PNP0103:00 fed20000-fed7ffff : Reserved - fed40000-fed44fff : INTC6001:00 + fed20000-fed7ffff : pnp 00:03 fed90000-fed93fff : pnp 00:03 feda0000-feda0fff : pnp 00:03 feda1000-feda1fff : pnp 00:03 @@ -358,20 +382,21 @@ fee00000-fee00fff : Local APIC ff300000-ffffffff : Reserved 100000000-28fffffff : System RAM - 11c000000-11d0011c0 : Kernel code - 11d0011c1-11d9b94ff : Kernel data - 11db6b000-11e1fffff : Kernel bss + 178800000-1798010f0 : Kernel code + 1798010f1-179f79dff : Kernel data + 17a147000-17a3fffff : Kernel bss - /dev/mmcblk0p2: TYPE="ext4" - /dev/sdb2: TYPE="ext4" + /dev/nvme0n1p3: TYPE="ext4" + /dev/sda3: TYPE="ext4" + /dev/mmcblk0p3: TYPE="ext4" - seri:/dev/ttyS0 type:mmio base:0x833AB000 irq:33 bdf:"00:19.2" - seri:/dev/ttyS1 type:mmio base:0x833AE000 irq:16 bdf:"00:1e.0" - seri:/dev/ttyS2 type:mmio base:0x833AF000 irq:17 bdf:"00:1e.1" + seri:/dev/ttyS0 type:mmio base:0x83449000 irq:33 bdf:"00:19.2" + seri:/dev/ttyS1 type:mmio base:0x8344A000 irq:16 bdf:"00:1e.0" + seri:/dev/ttyS2 type:mmio base:0x8344B000 irq:17 bdf:"00:1e.1" @@ -379,7 +404,7 @@ - 7955388 kB + 7960904 kB @@ -387,7 +412,7 @@ - 32 + 16