From: Jonathan Chocron <jonnyc@amazon.com>
To: <lorenzo.pieralisi@arm.com>, <bhelgaas@google.com>,
<jingoohan1@gmail.com>, <gustavo.pimentel@synopsys.com>,
<robh+dt@kernel.org>, <mark.rutland@arm.com>
Cc: <dwmw@amazon.co.uk>, <benh@kernel.crashing.org>,
<alisaidi@amazon.com>, <ronenk@amazon.com>, <barakw@amazon.com>,
<talel@amazon.com>, <hanochu@amazon.com>, <hhhawa@amazon.com>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>, <jonnyc@amazon.com>
Subject: [PATCH v2 8/8] PCI: dw: Add support for PCI_PROBE_ONLY/PCI_REASSIGN_ALL_BUS flags
Date: Thu, 18 Jul 2019 12:47:18 +0300 [thread overview]
Message-ID: <20190718094718.25083-4-jonnyc@amazon.com> (raw)
In-Reply-To: <20190718094531.21423-1-jonnyc@amazon.com>
This basically aligns the usage of PCI_PROBE_ONLY and
PCI_REASSIGN_ALL_BUS in dw_pcie_host_init() with the logic in
pci_host_common_probe().
Now it will be possible to control via the devicetree whether to just
probe the PCI bus (in cases where FW already configured it) or to fully
configure it.
Signed-off-by: Jonathan Chocron <jonnyc@amazon.com>
---
.../pci/controller/dwc/pcie-designware-host.c | 23 +++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index d2ca748e4c85..0a294d8aa21a 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -342,6 +342,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
if (!bridge)
return -ENOMEM;
+ of_pci_check_probe_only();
+
ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
&bridge->windows, &pp->io_base);
if (ret)
@@ -474,6 +476,10 @@ int dw_pcie_host_init(struct pcie_port *pp)
pp->root_bus_nr = pp->busn->start;
+ /* Do not reassign bus nums if probe only */
+ if (!pci_has_flag(PCI_PROBE_ONLY))
+ pci_add_flags(PCI_REASSIGN_ALL_BUS);
+
bridge->dev.parent = dev;
bridge->sysdata = pp;
bridge->busnr = pp->root_bus_nr;
@@ -490,11 +496,20 @@ int dw_pcie_host_init(struct pcie_port *pp)
if (pp->ops->scan_bus)
pp->ops->scan_bus(pp);
- pci_bus_size_bridges(pp->root_bus);
- pci_bus_assign_resources(pp->root_bus);
+ /*
+ * We insert PCI resources into the iomem_resource and
+ * ioport_resource trees in either pci_bus_claim_resources()
+ * or pci_bus_assign_resources().
+ */
+ if (pci_has_flag(PCI_PROBE_ONLY)) {
+ pci_bus_claim_resources(pp->root_bus);
+ } else {
+ pci_bus_size_bridges(pp->root_bus);
+ pci_bus_assign_resources(pp->root_bus);
- list_for_each_entry(child, &pp->root_bus->children, node)
- pcie_bus_configure_settings(child);
+ list_for_each_entry(child, &pp->root_bus->children, node)
+ pcie_bus_configure_settings(child);
+ }
pci_bus_add_devices(pp->root_bus);
return 0;
--
2.17.1
prev parent reply other threads:[~2019-07-18 9:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 9:45 [PATCH v2 0/8] Amazon's Annapurna Labs DT-based PCIe host controller driver Jonathan Chocron
2019-07-18 9:45 ` [PATCH v2 1/8] PCI: Add Amazon's Annapurna Labs vendor ID Jonathan Chocron
2019-07-18 9:45 ` [PATCH v2 2/8] PCI: Add ACS quirk for Amazon Annapurna Labs root ports Jonathan Chocron
2019-07-19 8:25 ` Gustavo Pimentel
2019-07-18 9:45 ` [PATCH v2 3/8] PCI/VPD: Add VPD release quirk for Amazon's Annapurna Labs Root Port Jonathan Chocron
2019-07-19 8:24 ` Gustavo Pimentel
2019-07-18 9:45 ` [PATCH v2 4/8] PCI: Add quirk to disable MSI-X support " Jonathan Chocron
2019-07-19 9:17 ` Gustavo Pimentel
2019-07-18 9:47 ` [PATCH v2 5/8] dt-bindings: PCI: Add Amazon's Annapurna Labs PCIe host bridge binding Jonathan Chocron
2019-07-18 9:47 ` [PATCH v2 6/8] PCI: al: Add support for DW based driver type Jonathan Chocron
2019-07-19 8:55 ` Gustavo Pimentel
2019-07-21 15:08 ` Chocron, Jonathan
2019-07-22 0:47 ` Benjamin Herrenschmidt
2019-07-22 8:54 ` Gustavo Pimentel
2019-07-22 15:38 ` Chocron, Jonathan
2019-07-22 21:15 ` Bjorn Helgaas
2019-07-18 9:47 ` [PATCH v2 7/8] PCI: dw: Add validation that PCIe core is set to correct mode Jonathan Chocron
2019-07-19 9:15 ` Gustavo Pimentel
2019-07-18 9:47 ` Jonathan Chocron [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=20190718094718.25083-4-jonnyc@amazon.com \
--to=jonnyc@amazon.com \
--cc=alisaidi@amazon.com \
--cc=barakw@amazon.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw@amazon.co.uk \
--cc=gustavo.pimentel@synopsys.com \
--cc=hanochu@amazon.com \
--cc=hhhawa@amazon.com \
--cc=jingoohan1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=ronenk@amazon.com \
--cc=talel@amazon.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).