From patchwork Wed Mar 23 22:01:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Derrick X-Patchwork-Id: 8654681 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7DCE99F3D1 for ; Wed, 23 Mar 2016 22:03:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A0D8203EB for ; Wed, 23 Mar 2016 22:03:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 537622038D for ; Wed, 23 Mar 2016 22:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbcCWWDZ (ORCPT ); Wed, 23 Mar 2016 18:03:25 -0400 Received: from mga01.intel.com ([192.55.52.88]:5385 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595AbcCWWDZ (ORCPT ); Wed, 23 Mar 2016 18:03:25 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 23 Mar 2016 15:03:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,383,1455004800"; d="scan'208";a="940254559" Received: from nsgse-neoncity01.lm.intel.com (HELO nsgse-neoncity01.localdomain) ([10.232.118.5]) by orsmga002.jf.intel.com with ESMTP; 23 Mar 2016 15:03:19 -0700 From: Jon Derrick To: helgaas@kernel.org Cc: Jon Derrick , keith.busch@intel.com, linux-pci@vger.kernel.org Subject: [PATCH] pci: Added flag to pci_host_bridge to hint not to use acpi Date: Wed, 23 Mar 2016 16:01:58 -0600 Message-Id: <1458770518-10203-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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a hint, no_acpi, to the pci_host_bridge struct which informs the hotplug driver to not try and release the host bridge from acpi. The VMD driver creates a root port which does not have an acpi entry. This patch will allow the hotplug driver to bypass acpi release when enumerating the VMD root port as a hotplug slot. Signed-off-by: Jon Derrick --- arch/x86/pci/vmd.c | 4 ++++ drivers/pci/pcie/portdrv_acpi.c | 5 +++++ include/linux/pci.h | 1 + 3 files changed, 10 insertions(+) diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c index 7792aba..a196be3 100644 --- a/arch/x86/pci/vmd.c +++ b/arch/x86/pci/vmd.c @@ -531,6 +531,7 @@ static int vmd_find_free_domain(void) static int vmd_enable_domain(struct vmd_dev *vmd) { struct pci_sysdata *sd = &vmd->sysdata; + struct pci_host_bridge *host_bridge; struct resource *res; u32 upper_bits; unsigned long flags; @@ -609,6 +610,9 @@ static int vmd_enable_domain(struct vmd_dev *vmd) return -ENODEV; } + host_bridge = to_pci_host_bridge(vmd->bus->bridge); + host_bridge->no_acpi = true; + vmd_attach_resources(vmd); vmd_setup_dma_ops(vmd); dev_set_msi_domain(&vmd->bus->dev, vmd->irq_domain); diff --git a/drivers/pci/pcie/portdrv_acpi.c b/drivers/pci/pcie/portdrv_acpi.c index b4d2894..0e6fa69 100644 --- a/drivers/pci/pcie/portdrv_acpi.c +++ b/drivers/pci/pcie/portdrv_acpi.c @@ -35,12 +35,17 @@ int pcie_port_acpi_setup(struct pci_dev *port, int *srv_mask) { struct acpi_pci_root *root; + struct pci_host_bridge *host_bridge; acpi_handle handle; u32 flags; if (acpi_pci_disabled) return 0; + host_bridge = pci_find_host_bridge(port->bus); + if (host_bridge && host_bridge->no_acpi) + return 0; + handle = acpi_find_root_bridge_handle(port); if (!handle) return -EINVAL; diff --git a/include/linux/pci.h b/include/linux/pci.h index 15f466e..a6958e9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -407,6 +407,7 @@ struct pci_host_bridge { void (*release_fn)(struct pci_host_bridge *); void *release_data; unsigned int ignore_reset_delay:1; /* for entire hierarchy */ + unsigned int no_acpi:1; /* bypasses acpi release */ /* Resource alignment requirements */ resource_size_t (*align_resource)(struct pci_dev *dev, const struct resource *res,