[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] spapr_pci: Introduce a liobn number generatin
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-devel] [PATCH 03/10] spapr_pci: Introduce a liobn number generating macros |
Date: |
Mon, 23 Feb 2015 19:33:53 +1100 |
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 <address@hidden>
Reviewed-by: David Gibson <address@hidden>
---
Changes:
v5:
* renamed parameters in SPAPR_PCI_LIOBN()
---
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 cebdeb3..388fd53 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -508,7 +508,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;
@@ -849,7 +849,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 a8e6817..6c702ca 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -443,7 +443,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
--
2.0.0
- [Qemu-devel] [PATCH 00/10] spapr: Small patches to prepare for Dynamic DMA windows, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 02/10] spapr_iommu: Make H_PUT_TCE_INDIRECT endian-safe, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 04/10] spapr_vio: Introduce a liobn number generating macros, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 01/10] spapr_iommu: Disable in-kernel IOMMU tables for >4GB windows, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 03/10] spapr_pci: Introduce a liobn number generating macros,
Alexey Kardashevskiy <=
- [Qemu-devel] [PATCH 08/10] spapr_iommu: Make spapr_tce_find_by_liobn() public, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 07/10] spapr_pci: Make find_phb()/find_dev() public, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 06/10] spapr_iommu: Add separate trace points for PCI DMA operations, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 09/10] spapr_pci: Rework device-tree rendering, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 05/10] spapr_pci: Define default DMA window size as a macro, Alexey Kardashevskiy, 2015/02/23
- [Qemu-devel] [PATCH 10/10] spapr_iommu: Give unique QOM name to TCE table, Alexey Kardashevskiy, 2015/02/23