Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / configs / f2a88xm-hd3.c

diff --git a/configs/f2a88xm-hd3.c b/configs/f2a88xm-hd3.c
index 16f0aa0651f1261db70384991e290f9e8a225cdd..321d148dfa8dd20085f716eb9323aadfe41dca7b 100644 (file)
--- a/configs/f2a88xm-hd3.c
+++ b/configs/f2a88xm-hd3.c
@@ -37,15 +37,24 @@ struct {
                        .phys_start = 0x3b000000,
                        .size = 0x4000000,
                },
+               .debug_console = {
+                       .phys_start = 0x3f8,
+               },
                .platform_info.x86 = {
                        .mmconfig_base = 0xe0000000,
                        .mmconfig_end_bus = 0xff,
                        .pm_timer_address = 0x808,
-                       .iommu_base = {
-                               0xfeb80000,
+                       .iommu_units = {
+                               {
+                                       .base = 0xfeb80000,
+                                       .size = 0x80000,
+                                       .amd_bdf = 0x02,
+                                       .amd_base_cap = 0x40,
+                                       .amd_msi_cap = 0x54,
+                                       .amd_features = 0x80048824,
+                               },
                        },
                },
-               .device_limit = 128,
                .interrupt_limit = 256,
                .root_cell = {
                        .name = "F2A88XM-HD3",
@@ -325,13 +334,17 @@ struct {
                {
                        .address = 0xfec00000,
                        .id = 0x0,
-                       .pin_bitmap = 0xffffff,
+                       .pin_bitmap = {
+                               0xffffff
+                       },
                },
                /* IOAPIC 1, GSI base 24 */
                {
                        .address = 0xfec01000,
                        .id = 0x0,
-                       .pin_bitmap = 0xffffff,
+                       .pin_bitmap = {
+                               0xffffff
+                       },
                },
        },