From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIEVJ-00014s-1c for qemu-devel@nongnu.org; Fri, 15 Aug 2014 06:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIEV7-0001B3-96 for qemu-devel@nongnu.org; Fri, 15 Aug 2014 06:13:00 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:44594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIEV5-000198-W8 for qemu-devel@nongnu.org; Fri, 15 Aug 2014 06:12:49 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 Aug 2014 20:12:45 +1000 From: Alexey Kardashevskiy Date: Fri, 15 Aug 2014 20:12:27 +1000 Message-Id: <1408097555-28126-6-git-send-email-aik@ozlabs.ru> In-Reply-To: <1408097555-28126-1-git-send-email-aik@ozlabs.ru> References: <1408097555-28126-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [RFC PATCH v2 05/13] spapr_pci: 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 , Alexander Graf , Gavin Shan , Alex Williamson , qemu-ppc@nongnu.org, David Gibson 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, will be used in next patch(es) to distinguish the default 32bit windows from dynamic windows. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr_pci.c | 2 +- include/hw/ppc/spapr.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 5c46c0d..17eb0d8 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -529,7 +529,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; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index c9d6c6c..782519a 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -443,7 +443,8 @@ 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(i, n) (0x80000000 | ((i) << 8) | (n)) +#define SPAPR_PCI_DMA_WINDOW_NUM(liobn) ((liobn) & 0xff) #define RTAS_ERROR_LOG_MAX 2048 -- 2.0.0