From: Bjorn Helgaas <helgaas@kernel.org>
To: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Cc: lorenzo.pieralisi@arm.com, linux-pci@vger.kernel.org,
Vidya Sagar <vidyas@nvidia.com>
Subject: Re: [PATCH] PCI: Fix pci_host_bridge initialization
Date: Fri, 5 Apr 2019 17:51:02 -0500 [thread overview]
Message-ID: <20190405225102.GE159318@google.com> (raw)
In-Reply-To: <20190318160718.10925-1-jean-philippe.brucker@arm.com>
[+cc Vidya -- Jean-Philippe magically fixed the "tangent 2" problem :)]
On Mon, Mar 18, 2019 at 04:07:18PM +0000, Jean-Philippe Brucker wrote:
> 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>
Applied with stable tag to pci/enumeration for v5.2, thanks!
> ---
> drivers/pci/probe.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 2ec0df04e0dc..012250a78da7 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -586,16 +586,9 @@ static void pci_release_host_bridge_dev(struct device *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
> @@ -608,6 +601,18 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv)
> 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;
> }
> @@ -622,7 +627,7 @@ struct pci_host_bridge *devm_pci_alloc_host_bridge(struct device *dev,
> 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;
> --
> 2.21.0
>
prev parent reply other threads:[~2019-04-05 22:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 16:07 [PATCH] PCI: Fix pci_host_bridge initialization Jean-Philippe Brucker
2019-04-05 22:51 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405225102.GE159318@google.com \
--to=helgaas@kernel.org \
--cc=jean-philippe.brucker@arm.com \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=vidyas@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).