From patchwork Wed Jul 15 09:44:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 495728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 82AC51402BC for ; Wed, 15 Jul 2015 19:49:04 +1000 (AEST) Received: from localhost ([::1]:34735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJJG-0006SE-P1 for incoming@patchwork.ozlabs.org; Wed, 15 Jul 2015 05:49:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJH4-0002lQ-AH for qemu-devel@nongnu.org; Wed, 15 Jul 2015 05:46:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFJH0-0007SZ-3R for qemu-devel@nongnu.org; Wed, 15 Jul 2015 05:46:46 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:45841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJGr-0007KD-G2 for qemu-devel@nongnu.org; Wed, 15 Jul 2015 05:46:42 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Jul 2015 19:46:19 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 15 Jul 2015 19:46:17 +1000 X-Helo: d23dlp03.au.ibm.com X-MailFrom: aik@ozlabs.ru X-RcptTo: qemu-ppc@nongnu.org Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 04D32357804C; Wed, 15 Jul 2015 19:46:13 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t6F9jwm649938464; Wed, 15 Jul 2015 19:46:12 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t6F9jXKi007308; Wed, 15 Jul 2015 19:45:34 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t6F9jX6E006216; Wed, 15 Jul 2015 19:45:33 +1000 Received: from bran.ozlabs.ibm.com (unknown [9.192.254.114]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 7DDE8A03CA; Wed, 15 Jul 2015 19:45:09 +1000 (AEST) Received: from ka1.ozlabs.ibm.com (ka1.ozlabs.ibm.com [10.61.145.11]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id 6F576E38E6; Wed, 15 Jul 2015 19:45:09 +1000 (AEST) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Wed, 15 Jul 2015 19:44:58 +1000 Message-Id: <1436953507-16391-3-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 2.4.0.rc3.8.gfb3e7d5 In-Reply-To: <1436953507-16391-1-git-send-email-aik@ozlabs.ru> References: <1436953507-16391-1-git-send-email-aik@ozlabs.ru> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15071509-0017-0000-0000-0000018B1C64 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.147 Cc: Laurent Vivier , Thomas Huth , Michael Roth , Alexey Kardashevskiy , Alexander Graf , Gavin Shan , Alex Williamson , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH qemu v11 02/11] spapr_pci: Convert finish_realize() to dma_capabilities_update()+dma_init_window() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This reworks finish_realize() which used to finalize DMA setup with an assumption that it will not change later. New callbacks supports various window parameters such as page and windows sizes. The new callback return error code rather than Error**. This is a mechanical change so no change in behaviour is expected. This is a part of getting rid of spapr-pci-vfio-host-bridge type. Signed-off-by: Alexey Kardashevskiy Reviewed-by: David Gibson Reviewed-by: Laurent Vivier --- Changes: v8: * moved spapr_phb_dma_capabilities_update() higher to avoid forward declaration in following patches and keep DMA code together (i.e. next to spapr_pci_dma_iommu()) --- hw/ppc/spapr_pci.c | 59 ++++++++++++++++++++++++++------------------- hw/ppc/spapr_pci_vfio.c | 53 ++++++++++++++++------------------------ include/hw/pci-host/spapr.h | 8 +++++- 3 files changed, 62 insertions(+), 58 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index cfd3b7b..f302e92 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -810,6 +810,28 @@ static char *spapr_phb_get_loc_code(sPAPRPHBState *sphb, PCIDevice *pdev) return buf; } +static int spapr_phb_dma_capabilities_update(sPAPRPHBState *sphb) +{ + sphb->dma32_window_start = 0; + sphb->dma32_window_size = SPAPR_PCI_DMA32_SIZE; + + return 0; +} + +static int spapr_phb_dma_init_window(sPAPRPHBState *sphb, + uint32_t liobn, uint32_t page_shift, + uint64_t window_size) +{ + uint64_t bus_offset = sphb->dma32_window_start; + sPAPRTCETable *tcet; + + tcet = spapr_tce_new_table(DEVICE(sphb), liobn, bus_offset, page_shift, + window_size >> page_shift, + false); + + return tcet ? 0 : -1; +} + /* Macros to operate with address in OF binding to PCI */ #define b_x(x, p, l) (((x) & ((1<<(l))-1)) << (p)) #define b_n(x) b_x((x), 31, 1) /* 0 if relocatable */ @@ -1222,6 +1244,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) int i; PCIBus *bus; uint64_t msi_window_size = 4096; + sPAPRTCETable *tcet; if (sphb->index != (uint32_t)-1) { hwaddr windows_base; @@ -1371,33 +1394,18 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) } } - if (!info->finish_realize) { - error_setg(errp, "finish_realize not defined"); - return; - } - - info->finish_realize(sphb, errp); - - sphb->msi = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); -} - -static void spapr_phb_finish_realize(sPAPRPHBState *sphb, Error **errp) -{ - sPAPRTCETable *tcet; - uint32_t nb_table; - - nb_table = SPAPR_PCI_DMA32_SIZE >> SPAPR_TCE_PAGE_SHIFT; - tcet = spapr_tce_new_table(DEVICE(sphb), sphb->dma_liobn, - 0, SPAPR_TCE_PAGE_SHIFT, nb_table, false); + info->dma_capabilities_update(sphb); + info->dma_init_window(sphb, sphb->dma_liobn, SPAPR_TCE_PAGE_SHIFT, + sphb->dma32_window_size); + tcet = spapr_tce_find_by_liobn(sphb->dma_liobn); if (!tcet) { - error_setg(errp, "Unable to create TCE table for %s", - sphb->dtbusname); - return ; + error_setg(errp, "failed to create TCE table"); + return; } - - /* Register default 32bit DMA window */ - memory_region_add_subregion(&sphb->iommu_root, 0, + memory_region_add_subregion(&sphb->iommu_root, tcet->bus_offset, spapr_tce_get_iommu(tcet)); + + sphb->msi = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); } static int spapr_phb_children_reset(Object *child, void *opaque) @@ -1545,9 +1553,10 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_spapr_pci; set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->cannot_instantiate_with_device_add_yet = false; - spc->finish_realize = spapr_phb_finish_realize; hp->plug = spapr_phb_hot_plug_child; hp->unplug = spapr_phb_hot_unplug_child; + spc->dma_capabilities_update = spapr_phb_dma_capabilities_update; + spc->dma_init_window = spapr_phb_dma_init_window; } static const TypeInfo spapr_phb_info = { diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index cca45ed..6e3e17b 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -28,48 +28,36 @@ static Property spapr_phb_vfio_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void spapr_phb_vfio_finish_realize(sPAPRPHBState *sphb, Error **errp) +static int spapr_phb_vfio_dma_capabilities_update(sPAPRPHBState *sphb) { sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); struct vfio_iommu_spapr_tce_info info = { .argsz = sizeof(info) }; int ret; - sPAPRTCETable *tcet; - uint32_t liobn = svphb->phb.dma_liobn; - if (svphb->iommugroupid == -1) { - error_setg(errp, "Wrong IOMMU group ID %d", svphb->iommugroupid); - return; - } - - ret = vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid, - VFIO_CHECK_EXTENSION, - (void *) VFIO_SPAPR_TCE_IOMMU); - if (ret != 1) { - error_setg_errno(errp, -ret, - "spapr-vfio: SPAPR extension is not supported"); - return; - } - - ret = vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid, + ret = vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, VFIO_IOMMU_SPAPR_TCE_GET_INFO, &info); if (ret) { - error_setg_errno(errp, -ret, - "spapr-vfio: get info from container failed"); - return; + return ret; } - tcet = spapr_tce_new_table(DEVICE(sphb), liobn, info.dma32_window_start, - SPAPR_TCE_PAGE_SHIFT, - info.dma32_window_size >> SPAPR_TCE_PAGE_SHIFT, + sphb->dma32_window_start = info.dma32_window_start; + sphb->dma32_window_size = info.dma32_window_size; + + return ret; +} + +static int spapr_phb_vfio_dma_init_window(sPAPRPHBState *sphb, + uint32_t liobn, uint32_t page_shift, + uint64_t window_size) +{ + uint64_t bus_offset = sphb->dma32_window_start; + sPAPRTCETable *tcet; + + tcet = spapr_tce_new_table(DEVICE(sphb), liobn, bus_offset, page_shift, + window_size >> page_shift, true); - if (!tcet) { - error_setg(errp, "spapr-vfio: failed to create VFIO TCE table"); - return; - } - /* Register default 32bit DMA window */ - memory_region_add_subregion(&sphb->iommu_root, tcet->bus_offset, - spapr_tce_get_iommu(tcet)); + return tcet ? 0 : -1; } static void spapr_phb_vfio_eeh_reenable(sPAPRPHBVFIOState *svphb) @@ -257,7 +245,8 @@ static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) dc->props = spapr_phb_vfio_properties; dc->reset = spapr_phb_vfio_reset; - spc->finish_realize = spapr_phb_vfio_finish_realize; + spc->dma_capabilities_update = spapr_phb_vfio_dma_capabilities_update; + spc->dma_init_window = spapr_phb_vfio_dma_init_window; spc->eeh_set_option = spapr_phb_vfio_eeh_set_option; spc->eeh_get_state = spapr_phb_vfio_eeh_get_state; spc->eeh_reset = spapr_phb_vfio_eeh_reset; diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 5322b56..b6d5719 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -48,7 +48,10 @@ typedef struct sPAPRPHBVFIOState sPAPRPHBVFIOState; struct sPAPRPHBClass { PCIHostBridgeClass parent_class; - void (*finish_realize)(sPAPRPHBState *sphb, Error **errp); + int (*dma_capabilities_update)(sPAPRPHBState *sphb); + int (*dma_init_window)(sPAPRPHBState *sphb, + uint32_t liobn, uint32_t page_shift, + uint64_t window_size); int (*eeh_set_option)(sPAPRPHBState *sphb, unsigned int addr, int option); int (*eeh_get_state)(sPAPRPHBState *sphb, int *state); int (*eeh_reset)(sPAPRPHBState *sphb, int option); @@ -90,6 +93,9 @@ struct sPAPRPHBState { int32_t msi_devs_num; spapr_pci_msi_mig *msi_devs; + uint32_t dma32_window_start; + uint32_t dma32_window_size; + QLIST_ENTRY(sPAPRPHBState) list; };