| From 6302bf3ef78dd210b5ff4a922afcb7d8eff8a211 Mon Sep 17 00:00:00 2001 |
| From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> |
| Date: Mon, 18 Mar 2019 16:07:18 +0000 |
| Subject: PCI: Init PCIe feature bits for managed host bridge alloc |
| |
| From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> |
| |
| commit 6302bf3ef78dd210b5ff4a922afcb7d8eff8a211 upstream. |
| |
| Two functions allocate a host bridge: devm_pci_alloc_host_bridge() and |
| pci_alloc_host_bridge(). At the moment, only the unmanaged one initializes |
| the PCIe feature bits, which prevents from using features such as hotplug |
| or AER on some systems, when booting with device tree. Make the |
| initialization code common. |
| |
| Fixes: 02bfeb484230 ("PCI/portdrv: Simplify PCIe feature permission checking") |
| Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| CC: stable@vger.kernel.org # v4.17+ |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/probe.c | 23 ++++++++++++++--------- |
| 1 file changed, 14 insertions(+), 9 deletions(-) |
| |
| --- a/drivers/pci/probe.c |
| +++ b/drivers/pci/probe.c |
| @@ -535,16 +535,9 @@ static void pci_release_host_bridge_dev( |
| kfree(to_pci_host_bridge(dev)); |
| } |
| |
| -struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) |
| +static void pci_init_host_bridge(struct pci_host_bridge *bridge) |
| { |
| - struct pci_host_bridge *bridge; |
| - |
| - bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL); |
| - if (!bridge) |
| - return NULL; |
| - |
| INIT_LIST_HEAD(&bridge->windows); |
| - bridge->dev.release = pci_release_host_bridge_dev; |
| |
| /* |
| * We assume we can manage these PCIe features. Some systems may |
| @@ -557,6 +550,18 @@ struct pci_host_bridge *pci_alloc_host_b |
| bridge->native_shpc_hotplug = 1; |
| bridge->native_pme = 1; |
| bridge->native_ltr = 1; |
| +} |
| + |
| +struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) |
| +{ |
| + struct pci_host_bridge *bridge; |
| + |
| + bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL); |
| + if (!bridge) |
| + return NULL; |
| + |
| + pci_init_host_bridge(bridge); |
| + bridge->dev.release = pci_release_host_bridge_dev; |
| |
| return bridge; |
| } |
| @@ -571,7 +576,7 @@ struct pci_host_bridge *devm_pci_alloc_h |
| if (!bridge) |
| return NULL; |
| |
| - INIT_LIST_HEAD(&bridge->windows); |
| + pci_init_host_bridge(bridge); |
| bridge->dev.release = devm_pci_release_host_bridge_dev; |
| |
| return bridge; |