From patchwork Wed Sep 5 01:09:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Derrick X-Patchwork-Id: 10588147 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA46C1669 for ; Wed, 5 Sep 2018 01:15:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFAFE29C4D for ; Wed, 5 Sep 2018 01:15:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C494229C5A; Wed, 5 Sep 2018 01:15:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7177529C4D for ; Wed, 5 Sep 2018 01:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726440AbeIEFnP (ORCPT ); Wed, 5 Sep 2018 01:43:15 -0400 Received: from mga17.intel.com ([192.55.52.151]:46017 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725825AbeIEFnP (ORCPT ); Wed, 5 Sep 2018 01:43:15 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2018 18:15:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,331,1531810800"; d="scan'208";a="254551431" Received: from unknown (HELO localhost.localdomain.localdomain) ([10.232.117.194]) by orsmga005.jf.intel.com with ESMTP; 04 Sep 2018 18:15:34 -0700 From: Jon Derrick To: Bjorn Helgaas Cc: Keith Busch , Lorenzo Pieralisi , , Jon Derrick Subject: [PATCH 1/2] PCI/VMD: Detach resources after stopping root bus Date: Tue, 4 Sep 2018 19:09:50 -0600 Message-Id: <1536109791-2672-1-git-send-email-jonathan.derrick@intel.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes the ugly warning: [ 181.940162] Trying to free nonexistent resource Signed-off-by: Jon Derrick --- drivers/pci/controller/vmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index fd2dbd7..46ed80f 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -813,12 +813,12 @@ static void vmd_remove(struct pci_dev *dev) { struct vmd_dev *vmd = pci_get_drvdata(dev); - vmd_detach_resources(vmd); sysfs_remove_link(&vmd->dev->dev.kobj, "domain"); pci_stop_root_bus(vmd->bus); pci_remove_root_bus(vmd->bus); vmd_cleanup_srcu(vmd); vmd_teardown_dma_ops(vmd); + vmd_detach_resources(vmd); irq_domain_remove(vmd->irq_domain); } From patchwork Wed Sep 5 01:09:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Derrick X-Patchwork-Id: 10588149 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CD02180E for ; Wed, 5 Sep 2018 01:15:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10E7B29C4D for ; Wed, 5 Sep 2018 01:15:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04C4B29C59; Wed, 5 Sep 2018 01:15:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 920C329C56 for ; Wed, 5 Sep 2018 01:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725825AbeIEFnP (ORCPT ); Wed, 5 Sep 2018 01:43:15 -0400 Received: from mga17.intel.com ([192.55.52.151]:46017 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726290AbeIEFnP (ORCPT ); Wed, 5 Sep 2018 01:43:15 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2018 18:15:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,331,1531810800"; d="scan'208";a="254551437" Received: from unknown (HELO localhost.localdomain.localdomain) ([10.232.117.194]) by orsmga005.jf.intel.com with ESMTP; 04 Sep 2018 18:15:35 -0700 From: Jon Derrick To: Bjorn Helgaas Cc: Keith Busch , Lorenzo Pieralisi , , Jon Derrick Subject: [PATCH 2/2] PCI/VMD: Expose VMD host-bridge Date: Tue, 4 Sep 2018 19:09:51 -0600 Message-Id: <1536109791-2672-2-git-send-email-jonathan.derrick@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1536109791-2672-1-git-send-email-jonathan.derrick@intel.com> References: <1536109791-2672-1-git-send-email-jonathan.derrick@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for kernel host-bridge enhancements, and to take advantage of pci_host_probe()'s calling of pcie_bus_configure_settings(), convert the VMD driver to expose a host bridge rather than a root bus. Signed-off-by: Jon Derrick --- drivers/pci/controller/vmd.c | 54 ++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 46ed80f..ca05679 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -93,7 +93,7 @@ struct vmd_dev { struct pci_sysdata sysdata; struct resource resources[3]; struct irq_domain *irq_domain; - struct pci_bus *bus; + struct pci_host_bridge *host; #ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops; @@ -582,7 +582,6 @@ static int vmd_find_free_domain(void) static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) { struct pci_sysdata *sd = &vmd->sysdata; - struct fwnode_handle *fn; struct resource *res; u32 upper_bits; unsigned long flags; @@ -690,37 +689,51 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) return sd->domain; sd->node = pcibus_to_node(vmd->dev->bus); - - fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain); - if (!fn) + sd->fwnode = irq_domain_alloc_named_id_fwnode("VMD-MSI", + vmd->sysdata.domain); + if (!sd->fwnode) return -ENODEV; - vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info, + vmd->irq_domain = pci_msi_create_irq_domain(sd->fwnode, + &vmd_msi_domain_info, x86_vector_domain); - irq_domain_free_fwnode(fn); if (!vmd->irq_domain) - return -ENODEV; + goto free_fwnode; + vmd->irq_domain->fwnode = sd->fwnode; pci_add_resource(&resources, &vmd->resources[0]); pci_add_resource_offset(&resources, &vmd->resources[1], offset[0]); pci_add_resource_offset(&resources, &vmd->resources[2], offset[1]); - vmd->bus = pci_create_root_bus(&vmd->dev->dev, busn_start, &vmd_ops, - sd, &resources); - if (!vmd->bus) { - pci_free_resource_list(&resources); - irq_domain_remove(vmd->irq_domain); - return -ENODEV; - } + vmd->host = devm_pci_alloc_host_bridge(&vmd->dev->dev, 0); + if (!vmd->host) + goto free_irqdomain; + + list_splice_init(&resources, &vmd->host->windows); + vmd->host->busnr = busn_start; + vmd->host->dev.parent = &vmd->dev->dev; + vmd->host->ops = &vmd_ops; + vmd->host->sysdata = sd; vmd_attach_resources(vmd); vmd_setup_dma_ops(vmd); - dev_set_msi_domain(&vmd->bus->dev, vmd->irq_domain); - pci_rescan_bus(vmd->bus); + dev_set_msi_domain(&vmd->host->dev, vmd->irq_domain); + if (pci_host_probe(vmd->host)) + goto detach_resources; - WARN(sysfs_create_link(&vmd->dev->dev.kobj, &vmd->bus->dev.kobj, + WARN(sysfs_create_link(&vmd->dev->dev.kobj, &vmd->host->bus->dev.kobj, "domain"), "Can't create symlink to domain\n"); return 0; + +detach_resources: + vmd_detach_resources(vmd); +free_fwnode: + irq_domain_free_fwnode(vmd->irq_domain->fwnode); +free_irqdomain: + pci_free_resource_list(&resources); + irq_domain_remove(vmd->irq_domain); + + return -ENODEV; } static irqreturn_t vmd_irq(int irq, void *data) @@ -814,11 +827,12 @@ static void vmd_remove(struct pci_dev *dev) struct vmd_dev *vmd = pci_get_drvdata(dev); sysfs_remove_link(&vmd->dev->dev.kobj, "domain"); - pci_stop_root_bus(vmd->bus); - pci_remove_root_bus(vmd->bus); + pci_stop_root_bus(vmd->host->bus); + pci_remove_root_bus(vmd->host->bus); vmd_cleanup_srcu(vmd); vmd_teardown_dma_ops(vmd); vmd_detach_resources(vmd); + irq_domain_free_fwnode(vmd->irq_domain->fwnode); irq_domain_remove(vmd->irq_domain); }