From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPoTz-0007CB-FI for qemu-devel@nongnu.org; Mon, 23 Feb 2015 03:35:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YPoTs-0006M9-8Q for qemu-devel@nongnu.org; Mon, 23 Feb 2015 03:35:15 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:48431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPoTr-0006Gq-GU for qemu-devel@nongnu.org; Mon, 23 Feb 2015 03:35:08 -0500 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Feb 2015 18:35:03 +1000 From: Alexey Kardashevskiy Date: Mon, 23 Feb 2015 19:33:54 +1100 Message-Id: <1424680440-10913-5-git-send-email-aik@ozlabs.ru> In-Reply-To: <1424680440-10913-1-git-send-email-aik@ozlabs.ru> References: <1424680440-10913-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 04/10] spapr_vio: Introduce a liobn number generating macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf 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 Reviewed-by: David Gibson --- 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 245cdd7..8baab0a 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -468,7 +468,7 @@ static int spapr_vio_busdev_init(DeviceState *qdev) } 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 6c702ca..0dc72db 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -443,6 +443,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.0.0