[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 05/33] spapr_vio: Introduce a liobn number generating
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 05/33] spapr_vio: Introduce a liobn number generating macros |
Date: |
Thu, 7 May 2015 15:33:31 +1000 |
From: Alexey Kardashevskiy <address@hidden>
This introduces a macro which makes up a LIOBN from fixed prefix and
VIO device address (@reg property).
This is to keep LIOBN macros rendering consistent - the same macro for
PCI has been added by the previous patch.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_vio.c | 2 +-
include/hw/ppc/spapr.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 1360b97..174033d 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -469,7 +469,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev,
Error **errp)
}
if (pc->rtce_window_size) {
- uint32_t liobn = SPAPR_VIO_BASE_LIOBN | dev->reg;
+ uint32_t liobn = SPAPR_VIO_LIOBN(dev->reg);
memory_region_init(&dev->mrroot, OBJECT(dev), "iommu-spapr-root",
ram_size);
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 9a9bb90..92ee72b 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -482,6 +482,7 @@ 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_VIO_LIOBN(reg) (0x00000000 | (reg))
#define SPAPR_PCI_LIOBN(phb_index, window_num) \
(0x80000000 | ((phb_index) << 8) | (window_num))
#define SPAPR_PCI_DMA_WINDOW_NUM(liobn) ((liobn) & 0xff)
--
2.1.0
- [Qemu-ppc] [PATCH 00/33] Accumulated -machine pseries patches 2015-05-07, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 02/33] spapr_iommu: Disable in-kernel IOMMU tables for >4GB windows, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 03/33] spapr_iommu: Make H_PUT_TCE_INDIRECT endian-safe, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 05/33] spapr_vio: Introduce a liobn number generating macros,
David Gibson <=
- [Qemu-ppc] [PATCH 07/33] spapr_iommu: Add separate trace points for PCI DMA operations, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 04/33] spapr_pci: Introduce a liobn number generating macros, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 06/33] spapr_pci: Define default DMA window size as a macro, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 01/33] spapr_pci: Fix unsafe signed/unsigned comparisons, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 09/33] spapr_iommu: Make spapr_tce_find_by_liobn() public, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 14/33] hw/ppc/spapr: Fix error message when firmware could not be loaded, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 10/33] spapr_pci: Rework device-tree rendering, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 13/33] pseries: Add pseries-2.4 machine type, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 11/33] spapr_iommu: Give unique QOM name to TCE table, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 08/33] spapr_pci: Make find_phb()/find_dev() public, David Gibson, 2015/05/07