From: Peng Fan <[email protected]> After linux moved to use linux,pci-domain, we update to correct pci domain here to use a domain not used by pci hardware.
i.MX8MQ: 2 i.MX8MM: 1 i.MX8MN: 0 i.MX8MP: 2 Working with NXP vendor tree is 5.10. Upstream tree only has i.MX8MQ pcie, since 5.11. Signed-off-by: Peng Fan <[email protected]> --- configs/arm64/imx8mm-linux-demo.c | 4 ++-- configs/arm64/imx8mm.c | 6 +++--- configs/arm64/imx8mp-inmate-demo.c | 2 +- configs/arm64/imx8mp-linux-demo.c | 8 ++++---- configs/arm64/imx8mp.c | 10 +++++----- configs/arm64/imx8mq-linux-demo.c | 4 ++-- configs/arm64/imx8mq.c | 5 +++-- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/configs/arm64/imx8mm-linux-demo.c b/configs/arm64/imx8mm-linux-demo.c index 196740cf..49272607 100644 --- a/configs/arm64/imx8mm-linux-demo.c +++ b/configs/arm64/imx8mm-linux-demo.c @@ -145,7 +145,7 @@ struct { .pci_devices = { { /* IVSHMEM 00:00.0 (demo) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 1, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, @@ -155,7 +155,7 @@ struct { }, { /* IVSHMEM 00:01.0 (networking) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 1, .bdf = 1 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 5, diff --git a/configs/arm64/imx8mm.c b/configs/arm64/imx8mm.c index ebc2d294..acb9fd5e 100644 --- a/configs/arm64/imx8mm.c +++ b/configs/arm64/imx8mm.c @@ -47,7 +47,7 @@ struct { .pci_mmconfig_base = 0xbb800000, .pci_mmconfig_end_bus = 0, .pci_is_virtual = 1, - .pci_domain = 0, + .pci_domain = 1, .arm = { .gic_version = 3, @@ -181,7 +181,7 @@ struct { .pci_devices = { { /* IVSHMEM 0000:00:00.0 (demo) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 1, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, @@ -191,7 +191,7 @@ struct { }, { /* IVSHMEM 0000:00:01.0 (networking) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 1, .bdf = 1 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 5, diff --git a/configs/arm64/imx8mp-inmate-demo.c b/configs/arm64/imx8mp-inmate-demo.c index 795c616f..127392df 100644 --- a/configs/arm64/imx8mp-inmate-demo.c +++ b/configs/arm64/imx8mp-inmate-demo.c @@ -114,7 +114,7 @@ struct { .pci_devices = { { .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, diff --git a/configs/arm64/imx8mp-linux-demo.c b/configs/arm64/imx8mp-linux-demo.c index 1e0a9f1c..22793c2a 100644 --- a/configs/arm64/imx8mp-linux-demo.c +++ b/configs/arm64/imx8mp-linux-demo.c @@ -178,7 +178,7 @@ struct { .pci_devices = { { .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 2 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, @@ -189,7 +189,7 @@ struct { }, { .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 3 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 4, @@ -200,7 +200,7 @@ struct { }, { /* IVSHMEM 00:00.0 (demo) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 8, @@ -210,7 +210,7 @@ struct { }, { /* IVSHMEM 00:01.0 (networking) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 1 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 13, diff --git a/configs/arm64/imx8mp.c b/configs/arm64/imx8mp.c index 3f758980..9654a764 100644 --- a/configs/arm64/imx8mp.c +++ b/configs/arm64/imx8mp.c @@ -42,7 +42,7 @@ struct { .pci_mmconfig_base = 0xfd700000, .pci_mmconfig_end_bus = 0, .pci_is_virtual = 1, - .pci_domain = 1, + .pci_domain = 2, .arm = { .gic_version = 3, @@ -199,7 +199,7 @@ struct { .pci_devices = { { .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 2 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, @@ -210,7 +210,7 @@ struct { }, { .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 3 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 4, @@ -221,7 +221,7 @@ struct { }, { /* IVSHMEM 0000:00:00.0 (demo) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 8, @@ -231,7 +231,7 @@ struct { }, { /* IVSHMEM 0000:00:01.0 (networking) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 1 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 13, diff --git a/configs/arm64/imx8mq-linux-demo.c b/configs/arm64/imx8mq-linux-demo.c index 1177f596..03e67a94 100644 --- a/configs/arm64/imx8mq-linux-demo.c +++ b/configs/arm64/imx8mq-linux-demo.c @@ -136,7 +136,7 @@ struct { .pci_devices = { { /* IVSHMEM 00:00.0 (demo) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 1, + .domain = 2, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, @@ -146,7 +146,7 @@ struct { }, { /* IVSHMEM 00:01.0 (networking) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 2, .bdf = 1 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 5, diff --git a/configs/arm64/imx8mq.c b/configs/arm64/imx8mq.c index 9f9c6071..145a36e4 100644 --- a/configs/arm64/imx8mq.c +++ b/configs/arm64/imx8mq.c @@ -42,6 +42,7 @@ struct { .pci_mmconfig_base = 0xbfb00000, .pci_mmconfig_end_bus = 0, .pci_is_virtual = 1, + .pci_domain = 2, .arm = { .gic_version = 3, @@ -161,7 +162,7 @@ struct { .pci_devices = { { /* IVSHMEM 0000:00:00.0 (demo) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 2, .bdf = 0 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 0, @@ -171,7 +172,7 @@ struct { }, { /* IVSHMEM 0000:00:01.0 (networking) */ .type = JAILHOUSE_PCI_TYPE_IVSHMEM, - .domain = 0, + .domain = 2, .bdf = 1 << 3, .bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX, .shmem_regions_start = 5, -- 2.30.0 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/20210330105658.16676-4-peng.fan%40oss.nxp.com.
