From aa7e623c655d43df61d1368d3708fab6040c918a Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Wed, 16 Sep 2015 16:03:48 +0200 Subject: [PATCH 06/22] spapr_pci: Introduce a liobn number generating macros Message-id: <1442419432-8537-2-git-send-email-lvivier@redhat.com> Patchwork-id: 67785 O-Subject: [RHEL7.2 qemu-kvm-rhev PATCH 1/5] spapr_pci: Introduce a liobn number generating macros Bugzilla: 1263795 RH-Acked-by: Laszlo Ersek RH-Acked-by: Thomas Huth RH-Acked-by: David Gibson From: Alexey Kardashevskiy We are going to have multiple DMA windows per PHB and we want them to migrate so we need a predictable way of assigning LIOBNs. This introduces a macro which makes up a LIOBN from fixed prefix, PHB index (unique PHB id) and window number. This introduces a SPAPR_PCI_DMA_WINDOW_NUM() to know the window number from LIOBN. It is used to distinguish the default 32bit windows from dynamic windows and avoid picking default DMA window properties from a wrong TCE table. Signed-off-by: Alexey Kardashevskiy Reviewed-by: David Gibson Signed-off-by: David Gibson Signed-off-by: Alexander Graf (cherry picked from commit c8545818b331e9a32e5dd47f0aefbcf2b93e41da) Signed-off-by: Laurent Vivier BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1250326 Signed-off-by: Miroslav Rezanina --- hw/ppc/spapr_pci.c | 4 ++-- include/hw/ppc/spapr.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 88b43aa..1f98046 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1146,7 +1146,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) } sphb->buid = SPAPR_PCI_BASE_BUID + sphb->index; - sphb->dma_liobn = SPAPR_PCI_BASE_LIOBN + sphb->index; + sphb->dma_liobn = SPAPR_PCI_LIOBN(sphb->index, 0); windows_base = SPAPR_PCI_WINDOW_BASE + sphb->index * SPAPR_PCI_WINDOW_SPACING; @@ -1495,7 +1495,7 @@ static int spapr_phb_children_dt(Object *child, void *opaque) sPAPRTCETable *tcet; tcet = (sPAPRTCETable *) object_dynamic_cast(child, TYPE_SPAPR_TCE_TABLE); - if (!tcet) { + if (!tcet || SPAPR_PCI_DMA_WINDOW_NUM(tcet->liobn)) { return 0; } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index b8e757e..4c788c5 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -537,7 +537,9 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, #define SPAPR_TCE_PAGE_MASK (SPAPR_TCE_PAGE_SIZE - 1) #define SPAPR_VIO_BASE_LIOBN 0x00000000 -#define SPAPR_PCI_BASE_LIOBN 0x80000000 +#define SPAPR_PCI_LIOBN(phb_index, window_num) \ + (0x80000000 | ((phb_index) << 8) | (window_num)) +#define SPAPR_PCI_DMA_WINDOW_NUM(liobn) ((liobn) & 0xff) #define RTAS_ERROR_LOG_MAX 2048 -- 1.8.3.1