From: Bjorn Helgaas <helgaas@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: linux-pci@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Phil Edworthy <phil.edworthy@renesas.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Simon Horman <horms@verge.net.au>,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling
Date: Thu, 4 Feb 2016 18:27:03 -0600 [thread overview]
Message-ID: <20160205002703.GK7031@localhost> (raw)
In-Reply-To: <1454066972-3609-1-git-send-email-lorenzo.pieralisi@arm.com>
[+cc Simon, R-car maintainer, linux-renesas-soc]
I badly want to merge this, so speak up now if you object :)
On Fri, Jan 29, 2016 at 11:29:31AM +0000, Lorenzo Pieralisi wrote:
> The PCIe rcar host driver is not used in system configurations
> requiring the PCI_PROBE_ONLY flag to be set to prevent resources
> assignment, therefore the driver code handling the flag can be
> removed from the kernel.
>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/host/pcie-rcar.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 4edb518..3509218 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -390,9 +390,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
>
> rcar_pcie_setup(&res, pcie);
>
> - /* Do not reassign resources if probe only */
> - if (!pci_has_flag(PCI_PROBE_ONLY))
> - pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
> + pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
>
> if (IS_ENABLED(CONFIG_PCI_MSI))
> bus = pci_scan_root_bus_msi(pcie->dev, pcie->root_bus_nr,
> @@ -408,13 +406,11 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
>
> pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
>
> - if (!pci_has_flag(PCI_PROBE_ONLY)) {
> - pci_bus_size_bridges(bus);
> - pci_bus_assign_resources(bus);
> + pci_bus_size_bridges(bus);
> + pci_bus_assign_resources(bus);
>
> - list_for_each_entry(child, &bus->children, node)
> - pcie_bus_configure_settings(child);
> - }
> + list_for_each_entry(child, &bus->children, node)
> + pcie_bus_configure_settings(child);
>
> pci_bus_add_devices(bus);
>
> --
> 2.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-02-05 0:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 11:29 [PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling Lorenzo Pieralisi
2016-01-29 11:29 ` [PATCH 2/2] drivers: pci: host: designware: " Lorenzo Pieralisi
2016-01-29 12:13 ` Gabriele Paoloni
2016-01-29 16:16 ` Pratyush Anand
2016-01-31 12:34 ` Jingoo Han
2016-02-05 20:28 ` Bjorn Helgaas
2016-02-05 0:27 ` Bjorn Helgaas [this message]
2016-02-05 9:35 ` [PATCH 1/2] drivers: pci: host: rcar: " Simon Horman
2016-02-05 20:27 ` Bjorn Helgaas
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=20160205002703.GK7031@localhost \
--to=helgaas@kernel.org \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=horms@verge.net.au \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=phil.edworthy@renesas.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.