From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ1vn-0002uK-Gv for qemu-devel@nongnu.org; Wed, 04 Feb 2015 10:32:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJ1vj-0008Ij-IJ for qemu-devel@nongnu.org; Wed, 04 Feb 2015 10:31:55 -0500 Message-ID: <54D23B65.6060109@suse.de> Date: Wed, 04 Feb 2015 16:31:49 +0100 From: Alexander Graf MIME-Version: 1.0 References: <1422523650-2888-1-git-send-email-aik@ozlabs.ru> <1422523650-2888-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1422523650-2888-4-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 03/18] spapr_pci: Introduce a liobn number generating macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: Alex Williamson , qemu-ppc@nongnu.org, David Gibson On 29.01.15 10:27, Alexey Kardashevskiy wrote: > 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 > --- > hw/ppc/spapr_pci.c | 4 ++-- > include/hw/ppc/spapr.h | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 4500849..64c7702 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -502,7 +502,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; > @@ -843,7 +843,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 642cdc3..a2c4bac 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -442,7 +442,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)) It would be more readable if you called "i" "phb_id" and "n" "window_num" instead ;). Alex > +#define SPAPR_PCI_DMA_WINDOW_NUM(liobn) ((liobn) & 0xff) > > #define RTAS_ERROR_LOG_MAX 2048 > >