* [PATCH 2/2] PCI: iproc: Fix BCMA probe resource handling
2021-08-03 21:56 [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' Rob Herring
@ 2021-08-03 21:56 ` Rob Herring
2021-08-04 6:49 ` Rafał Miłecki
2021-08-03 23:43 ` [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' Bjorn Helgaas
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Rob Herring @ 2021-08-03 21:56 UTC (permalink / raw)
To: Rafał Miłecki
Cc: linux-pci, Srinath Mannam, Roman Bacik, Bharat Gooty,
Abhishek Shah, Jitendra Bhivare, Ray Jui, Florian Fainelli,
BCM Kernel Feedback, Scott Branden, Bjorn Helgaas,
Lorenzo Pieralisi, Krzysztof Wilczyński
In commit 7ef1c871da16 ("PCI: iproc: Use
pci_parse_request_of_pci_ranges()"), calling
devm_request_pci_bus_resources() was dropped from the common iProc
probe code, but is still needed for BCMA bus probing. Without it, there
will be lots of warnings like this:
pci 0000:00:00.0: BAR 8: no space for [mem size 0x00c00000]
pci 0000:00:00.0: BAR 8: failed to assign [mem size 0x00c00000]
Add back calling devm_request_pci_bus_resources() and adding the
resources to pci_host_bridge.windows for BCMA bus probe.
Fixes: 7ef1c871da16 ("PCI: iproc: Use pci_parse_request_of_pci_ranges()")
Reported-by: Rafał Miłecki <zajec5@gmail.com>
Cc: Srinath Mannam <srinath.mannam@broadcom.com>
Cc: Roman Bacik <roman.bacik@broadcom.com>
Cc: Bharat Gooty <bharat.gooty@broadcom.com>
Cc: Abhishek Shah <abhishek.shah@broadcom.com>
Cc: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Cc: Ray Jui <ray.jui@broadcom.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: "Krzysztof Wilczyński" <kw@linux.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/pci/controller/pcie-iproc-bcma.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/controller/pcie-iproc-bcma.c b/drivers/pci/controller/pcie-iproc-bcma.c
index 56b8ee7bf330..f918c713afb0 100644
--- a/drivers/pci/controller/pcie-iproc-bcma.c
+++ b/drivers/pci/controller/pcie-iproc-bcma.c
@@ -35,7 +35,6 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
{
struct device *dev = &bdev->dev;
struct iproc_pcie *pcie;
- LIST_HEAD(resources);
struct pci_host_bridge *bridge;
int ret;
@@ -60,19 +59,16 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1;
pcie->mem.name = "PCIe MEM space";
pcie->mem.flags = IORESOURCE_MEM;
- pci_add_resource(&resources, &pcie->mem);
+ pci_add_resource(&bridge->windows, &pcie->mem);
+ ret = devm_request_pci_bus_resources(dev, &bridge->windows);
+ if (ret)
+ return ret;
pcie->map_irq = iproc_pcie_bcma_map_irq;
- ret = iproc_pcie_setup(pcie, &resources);
- if (ret) {
- dev_err(dev, "PCIe controller setup failed\n");
- pci_free_resource_list(&resources);
- return ret;
- }
-
bcma_set_drvdata(bdev, pcie);
- return 0;
+
+ return iproc_pcie_setup(pcie, &bridge->windows);
}
static void iproc_pcie_bcma_remove(struct bcma_device *bdev)
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] PCI: iproc: Fix BCMA probe resource handling
2021-08-03 21:56 ` [PATCH 2/2] PCI: iproc: Fix BCMA probe resource handling Rob Herring
@ 2021-08-04 6:49 ` Rafał Miłecki
0 siblings, 0 replies; 6+ messages in thread
From: Rafał Miłecki @ 2021-08-04 6:49 UTC (permalink / raw)
To: Rob Herring
Cc: linux-pci, Srinath Mannam, Roman Bacik, Bharat Gooty,
Abhishek Shah, Jitendra Bhivare, Ray Jui, Florian Fainelli,
BCM Kernel Feedback, Scott Branden, Bjorn Helgaas,
Lorenzo Pieralisi, Krzysztof Wilczyński
On 03.08.2021 23:56, Rob Herring wrote:
> In commit 7ef1c871da16 ("PCI: iproc: Use
> pci_parse_request_of_pci_ranges()"), calling
> devm_request_pci_bus_resources() was dropped from the common iProc
> probe code, but is still needed for BCMA bus probing. Without it, there
> will be lots of warnings like this:
>
> pci 0000:00:00.0: BAR 8: no space for [mem size 0x00c00000]
> pci 0000:00:00.0: BAR 8: failed to assign [mem size 0x00c00000]
>
> Add back calling devm_request_pci_bus_resources() and adding the
> resources to pci_host_bridge.windows for BCMA bus probe.
>
> Fixes: 7ef1c871da16 ("PCI: iproc: Use pci_parse_request_of_pci_ranges()")
> Reported-by: Rafał Miłecki <zajec5@gmail.com>
> Cc: Srinath Mannam <srinath.mannam@broadcom.com>
> Cc: Roman Bacik <roman.bacik@broadcom.com>
> Cc: Bharat Gooty <bharat.gooty@broadcom.com>
> Cc: Abhishek Shah <abhishek.shah@broadcom.com>
> Cc: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
> Cc: Ray Jui <ray.jui@broadcom.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>
> Cc: Scott Branden <sbranden@broadcom.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: "Krzysztof Wilczyński" <kw@linux.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Rob Herring <robh@kernel.org>
It works great again, thank you!
Tested-by: Rafał Miłecki <rafal@milecki.pl>
[ 6.624535] pcie_iproc_bcma bcma0:7: host bridge /axi@18000000/pcie@12000 ranges:
[ 6.632048] pcie_iproc_bcma bcma0:7: No bus range found for /axi@18000000/pcie@12000, using [bus 00-ff]
[ 6.641661] OF: /axi@18000000/pcie@12000: Missing device_type
[ 6.647432] pcie_iproc_bcma bcma0:7: non-prefetchable memory resource required
[ 6.783993] pcie_iproc_bcma bcma0:7: link: UP
[ 6.788471] pcie_iproc_bcma bcma0:7: PCI host bridge to bus 0000:00
[ 6.794784] pci_bus 0000:00: root bus resource [bus 00-ff]
[ 6.800288] pci_bus 0000:00: root bus resource [mem 0x08000000-0x0fffffff]
[ 6.807216] pci 0000:00:00.0: [14e4:d612] type 01 class 0x060400
[ 6.813242] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x4 may corrupt adjacent RW1C bits
[ 6.822927] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x4 may corrupt adjacent RW1C bits
[ 6.832620] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x1c may corrupt adjacent RW1C bits
[ 6.842387] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x1c may corrupt adjacent RW1C bits
[ 6.852162] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x3e may corrupt adjacent RW1C bits
[ 6.861951] pci 0000:00:00.0: PME# supported from D0 D3hot D3cold
[ 6.868065] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x4c may corrupt adjacent RW1C bits
[ 6.878472] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x3e may corrupt adjacent RW1C bits
[ 6.888259] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x4 may corrupt adjacent RW1C bits
[ 6.897947] pci_bus 0000:00: 1-byte config write to 0000:00:00.0 offset 0xc may corrupt adjacent RW1C bits
[ 6.907634] PCI: bus0: Fast back to back transfers disabled
[ 6.913224] pci 0000:00:00.0: bridge configuration invalid ([bus 00-00]), reconfiguring
[ 6.921255] pci_bus 0000:00: 2-byte config write to 0000:00:00.0 offset 0x3e may corrupt adjacent RW1C bits
[ 6.931146] pci 0000:01:00.0: [14e4:4365] type 00 class 0x028000
[ 6.937212] pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00007fff 64bit]
[ 6.944032] pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x007fffff 64bit]
[ 6.950839] pci 0000:01:00.0: reg 0x20: [mem 0x00000000-0x000fffff 64bit pref]
[ 6.958167] pci 0000:01:00.0: supports D1 D2
[ 6.963074] PCI: bus1: Fast back to back transfers disabled
[ 6.968693] pci_bus 0000:01: busn_res: [bus 01-ff] end is updated to 01
[ 6.975354] pci 0000:00:00.0: BAR 8: assigned [mem 0x08000000-0x08bfffff]
[ 6.982159] pci 0000:00:00.0: BAR 9: assigned [mem 0x08c00000-0x08cfffff 64bit pref]
[ 6.989931] pci 0000:01:00.0: BAR 2: assigned [mem 0x08000000-0x087fffff 64bit]
[ 6.997275] pci 0000:01:00.0: BAR 4: assigned [mem 0x08c00000-0x08cfffff 64bit pref]
[ 7.005046] pci 0000:01:00.0: BAR 0: assigned [mem 0x08800000-0x08807fff 64bit]
[ 7.012377] pci 0000:00:00.0: PCI bridge to [bus 01]
[ 7.017354] pci 0000:00:00.0: bridge window [mem 0x08000000-0x08bfffff]
[ 7.024162] pci 0000:00:00.0: bridge window [mem 0x08c00000-0x08cfffff 64bit pref]
[ 7.032111] pcie_iproc_bcma bcma0:8: host bridge /axi@18000000/pcie@13000 ranges:
[ 7.039647] pcie_iproc_bcma bcma0:8: No bus range found for /axi@18000000/pcie@13000, using [bus 00-ff]
[ 7.049252] pcie_iproc_bcma bcma0:8: non-prefetchable memory resource required
[ 7.183989] pcie_iproc_bcma bcma0:8: link: UP
[ 7.188463] pcie_iproc_bcma bcma0:8: PCI host bridge to bus 0001:00
[ 7.194776] pci_bus 0001:00: root bus resource [bus 00-ff]
[ 7.200280] pci_bus 0001:00: root bus resource [mem 0x20000000-0x27ffffff]
[ 7.207206] pci 0001:00:00.0: [14e4:d612] type 01 class 0x060400
[ 7.213267] pci 0001:00:00.0: PME# supported from D0 D3hot D3cold
[ 7.220014] PCI: bus0: Fast back to back transfers disabled
[ 7.225619] pci 0001:00:00.0: bridge configuration invalid ([bus 00-00]), reconfiguring
[ 7.233772] pci 0001:01:00.0: [14e4:4365] type 00 class 0x028000
[ 7.239834] pci 0001:01:00.0: reg 0x10: [mem 0x00000000-0x00007fff 64bit]
[ 7.246659] pci 0001:01:00.0: reg 0x18: [mem 0x00000000-0x007fffff 64bit]
[ 7.253469] pci 0001:01:00.0: reg 0x20: [mem 0x00000000-0x000fffff 64bit pref]
[ 7.260805] pci 0001:01:00.0: supports D1 D2
[ 7.265717] PCI: bus1: Fast back to back transfers disabled
[ 7.271311] pci_bus 0001:01: busn_res: [bus 01-ff] end is updated to 01
[ 7.277970] pci 0001:00:00.0: BAR 8: assigned [mem 0x20000000-0x20bfffff]
[ 7.284778] pci 0001:00:00.0: BAR 9: assigned [mem 0x20c00000-0x20cfffff 64bit pref]
[ 7.292546] pci 0001:01:00.0: BAR 2: assigned [mem 0x20000000-0x207fffff 64bit]
[ 7.299887] pci 0001:01:00.0: BAR 4: assigned [mem 0x20c00000-0x20cfffff 64bit pref]
[ 7.307670] pci 0001:01:00.0: BAR 0: assigned [mem 0x20800000-0x20807fff 64bit]
[ 7.315016] pci 0001:00:00.0: PCI bridge to [bus 01]
[ 7.319995] pci 0001:00:00.0: bridge window [mem 0x20000000-0x20bfffff]
[ 7.326807] pci 0001:00:00.0: bridge window [mem 0x20c00000-0x20cfffff 64bit pref]
[ 7.334761] pcie_iproc_bcma bcma0:9: host bridge /axi@18000000/pcie@14000 ranges:
[ 7.342279] pcie_iproc_bcma bcma0:9: No bus range found for /axi@18000000/pcie@14000, using [bus 00-ff]
[ 7.351896] pcie_iproc_bcma bcma0:9: non-prefetchable memory resource required
[ 7.483989] pcie_iproc_bcma bcma0:9: PHY or data link is INACTIVE!
[ 7.490184] pcie_iproc_bcma bcma0:9: no PCIe EP device detected
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
2021-08-03 21:56 [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' Rob Herring
2021-08-03 21:56 ` [PATCH 2/2] PCI: iproc: Fix BCMA probe resource handling Rob Herring
@ 2021-08-03 23:43 ` Bjorn Helgaas
2021-08-04 6:47 ` Rafał Miłecki
2021-08-04 11:23 ` Lorenzo Pieralisi
3 siblings, 0 replies; 6+ messages in thread
From: Bjorn Helgaas @ 2021-08-03 23:43 UTC (permalink / raw)
To: Rob Herring
Cc: Rafał Miłecki, linux-pci, Srinath Mannam, Roman Bacik,
Bharat Gooty, Abhishek Shah, Jitendra Bhivare, Ray Jui,
Florian Fainelli, BCM Kernel Feedback, Scott Branden,
Bjorn Helgaas, Lorenzo Pieralisi
On Tue, Aug 03, 2021 at 03:56:55PM -0600, Rob Herring wrote:
> Commit 669cbc708122 ("PCI: Move DT resource setup into
> devm_pci_alloc_host_bridge()") made devm_pci_alloc_host_bridge() fail on
> any DT resource parsing errors, but Broadcom iProc uses
> devm_pci_alloc_host_bridge() on BCMA bus devices that don't have DT
> resources. In particular, there is no 'ranges' property. Fix iProc by
> making 'ranges' optional.
>
> If 'ranges' is required by a platform, there's going to be more errors
> latter on if it is missing.
s/latter/later/
> Fixes: 669cbc708122 ("PCI: Move DT resource setup into devm_pci_alloc_host_bridge()")
> Reported-by: Rafał Miłecki <zajec5@gmail.com>
> Cc: Srinath Mannam <srinath.mannam@broadcom.com>
> Cc: Roman Bacik <roman.bacik@broadcom.com>
> Cc: Bharat Gooty <bharat.gooty@broadcom.com>
> Cc: Abhishek Shah <abhishek.shah@broadcom.com>
> Cc: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
> Cc: Ray Jui <ray.jui@broadcom.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>
> Cc: Scott Branden <sbranden@broadcom.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
I assume Lorenzo will merge this along with the iproc change.
> ---
> drivers/pci/of.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index a143b02b2dcd..d84381ce82b5 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -310,7 +310,7 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
> /* Check for ranges property */
> err = of_pci_range_parser_init(&parser, dev_node);
> if (err)
> - goto failed;
> + return 0;
>
> dev_dbg(dev, "Parsing ranges property...\n");
> for_each_of_pci_range(&parser, &range) {
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
2021-08-03 21:56 [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' Rob Herring
2021-08-03 21:56 ` [PATCH 2/2] PCI: iproc: Fix BCMA probe resource handling Rob Herring
2021-08-03 23:43 ` [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' Bjorn Helgaas
@ 2021-08-04 6:47 ` Rafał Miłecki
2021-08-04 11:23 ` Lorenzo Pieralisi
3 siblings, 0 replies; 6+ messages in thread
From: Rafał Miłecki @ 2021-08-04 6:47 UTC (permalink / raw)
To: Rob Herring
Cc: linux-pci, Srinath Mannam, Roman Bacik, Bharat Gooty,
Abhishek Shah, Jitendra Bhivare, Ray Jui, Florian Fainelli,
BCM Kernel Feedback, Scott Branden, Bjorn Helgaas,
Lorenzo Pieralisi
On 03.08.2021 23:56, Rob Herring wrote:
> Commit 669cbc708122 ("PCI: Move DT resource setup into
> devm_pci_alloc_host_bridge()") made devm_pci_alloc_host_bridge() fail on
> any DT resource parsing errors, but Broadcom iProc uses
> devm_pci_alloc_host_bridge() on BCMA bus devices that don't have DT
> resources. In particular, there is no 'ranges' property. Fix iProc by
> making 'ranges' optional.
>
> If 'ranges' is required by a platform, there's going to be more errors
> latter on if it is missing.
>
> Fixes: 669cbc708122 ("PCI: Move DT resource setup into devm_pci_alloc_host_bridge()")
> Reported-by: Rafał Miłecki <zajec5@gmail.com>
> Cc: Srinath Mannam <srinath.mannam@broadcom.com>
> Cc: Roman Bacik <roman.bacik@broadcom.com>
> Cc: Bharat Gooty <bharat.gooty@broadcom.com>
> Cc: Abhishek Shah <abhishek.shah@broadcom.com>
> Cc: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
> Cc: Ray Jui <ray.jui@broadcom.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>
> Cc: Scott Branden <sbranden@broadcom.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Signed-off-by: Rob Herring <robh@kernel.org>
You're great Rob, thank you!
I've tested it on top of the 669cbc708122 and linux-5.10.y.
Tested-by: Rafał Miłecki <rafal@milecki.pl>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
2021-08-03 21:56 [PATCH 1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' Rob Herring
` (2 preceding siblings ...)
2021-08-04 6:47 ` Rafał Miłecki
@ 2021-08-04 11:23 ` Lorenzo Pieralisi
3 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Pieralisi @ 2021-08-04 11:23 UTC (permalink / raw)
To: Rob Herring, Rafał Miłecki
Cc: Lorenzo Pieralisi, Scott Branden, Florian Fainelli,
BCM Kernel Feedback, Bjorn Helgaas, Abhishek Shah,
Srinath Mannam, linux-pci, Jitendra Bhivare, Roman Bacik,
Bharat Gooty, Ray Jui
On Tue, 3 Aug 2021 15:56:55 -0600, Rob Herring wrote:
> Commit 669cbc708122 ("PCI: Move DT resource setup into
> devm_pci_alloc_host_bridge()") made devm_pci_alloc_host_bridge() fail on
> any DT resource parsing errors, but Broadcom iProc uses
> devm_pci_alloc_host_bridge() on BCMA bus devices that don't have DT
> resources. In particular, there is no 'ranges' property. Fix iProc by
> making 'ranges' optional.
>
> [...]
Applied to pci/iproc, thanks!
[1/2] PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
https://git.kernel.org/lpieralisi/pci/c/d277f6e88c
[2/2] PCI: iproc: Fix BCMA probe resource handling
https://git.kernel.org/lpieralisi/pci/c/aeaea8969b
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 6+ messages in thread