Alexandru and Qu reported this resource allocation failure on
ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
pci 0000:00:00.0: PCI bridge to [bus 01]
pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
"BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
PCI allocation code isn't smart enough to allocate it in a host
bridge window marked as 64-bit, even though this should work fine.
A DT host bridge description includes the windows from the CPU
address space to the PCI bus space. On a few architectures
(microblaze, powerpc, sparc), the DT may also describe PCI devices
themselves, including their BARs.
Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
the fact that some DT addresses described 64-bit windows and BARs.
That was a problem because the virtio virtual NIC has a 32-bit BAR
and a 64-bit BAR, and the driver couldn't distinguish them.
9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
bridge windows, which exposed the fact that the PCI allocator isn't
smart enough to put 32-bit resources in those 64-bit windows.
Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
that information.
Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
Reported-at: https://lore.kernel.org/lkml/[email protected]/
Reported-by: Alexandru Elisei <[email protected]>
Reported-by: Qu Wenruo <[email protected]>
Suggested-by: Bjorn Helgaas <[email protected]>
Signed-off-by: Punit Agrawal <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Rob Herring <[email protected]>
---
Hi,
The patch is an updated version to fix the PCI allocation issues on
RK3399 based platforms. Previous postings can be found at [0][1][2].
The updated patch instead of clearing the 64-bit flag for
non-prefetchable memory below 4GB does it unconditionally on the basis
that PCI allocation logic cannot deal with the 64-bit flag (although
it should be able to). The result is a simpler patch that restores the
input to the allocation logic to be identical to before 9d57e61bf723.
Tested locally on a RockPro64 on top of v5.13-rc6. Please consider
merging.
Thanks,
Punit
Changes:
v4:
* Updated Patch 1 based on Bjorn's suggestion. Also dropped the
Tested-by tags due to the change of logic
* Dropped patch 2 and 3 from the series as it's not critical to the
series
* Dropped the device tree changes (Patch 4) as they are already queued
in the soc tree
v3:
* Improved commit log for clarity (Patch 1)
* Added Tested-by tags
v2:
* Check ranges PCI / bus addresses rather than CPU addresses
* (new) Restrict 32-bit size warnings on ranges that don't have the 64-bit attribute set
* Refactor the 32-bit size warning to the range parsing loop. This
change also prints the warnings right after the window mappings are
logged.
[0] https://lore.kernel.org/linux-arm-kernel/[email protected]/
[1] https://lore.kernel.org/linux-pci/[email protected]/
[2] https://lore.kernel.org/linux-pci/[email protected]/
drivers/pci/of.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 85dcb7097da4..a143b02b2dcd 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -353,6 +353,8 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
dev_node);
*io_base = range.cpu_addr;
+ } else if (resource_type(res) == IORESOURCE_MEM) {
+ res->flags &= ~IORESOURCE_MEM_64;
}
pci_add_resource_offset(resources, res, res->start - range.pci_addr);
--
2.30.2
Hi Punit,
Thank you for working on this!
On 6/15/21 12:04 AM, Punit Agrawal wrote:
> Alexandru and Qu reported this resource allocation failure on
> ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
>
> pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
> pci 0000:00:00.0: PCI bridge to [bus 01]
> pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
>
> "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
> PCI allocation code isn't smart enough to allocate it in a host
> bridge window marked as 64-bit, even though this should work fine.
>
> A DT host bridge description includes the windows from the CPU
> address space to the PCI bus space. On a few architectures
> (microblaze, powerpc, sparc), the DT may also describe PCI devices
> themselves, including their BARs.
>
> Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
> flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
> the fact that some DT addresses described 64-bit windows and BARs.
> That was a problem because the virtio virtual NIC has a 32-bit BAR
> and a 64-bit BAR, and the driver couldn't distinguish them.
>
> 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
> fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
> bridge windows, which exposed the fact that the PCI allocator isn't
> smart enough to put 32-bit resources in those 64-bit windows.
>
> Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
> that information.
I've tested the patch on my rockpro64. Kernel built from tag v5.13-rc6:
[ 0.345676] pci 0000:01:00.0: 8.000 Gb/s available PCIe bandwidth, limited by
2.5 GT/s PCIe x4 link at 0000:00:00.0 (capable of 31.504 Gb/s with 8.0 GT/s PCIe
x4 link)
[ 0.359300] pci_bus 0000:01: busn_res: [bus 01-1f] end is updated to 01
[ 0.359343] pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
[ 0.359365] pci 0000:00:00.0: BAR 14: failed to assign [mem size 0x00100000]
[ 0.359387] pci 0000:01:00.0: BAR 0: no space for [mem size 0x00004000 64bit]
[ 0.359407] pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x00004000 64bit]
[ 0.359428] pci 0000:00:00.0: PCI bridge to [bus 01]
[ 0.359862] pcieport 0000:00:00.0: PME: Signaling with IRQ 76
[ 0.360190] pcieport 0000:00:00.0: AER: enabled with IRQ 76
Kernel built from tag v5.13-rc6 with this patch applied:
[ 0.345434] pci 0000:01:00.0: 8.000 Gb/s available PCIe bandwidth, limited by
2.5 GT/s PCIe x4 link at 0000:00:00.0 (capable of 31.504 Gb/s with 8.0 GT/s PCIe
x4 link)
[ 0.359081] pci_bus 0000:01: busn_res: [bus 01-1f] end is updated to 01
[ 0.359128] pci 0000:00:00.0: BAR 14: assigned [mem 0xfa000000-0xfa0fffff]
[ 0.359155] pci 0000:01:00.0: BAR 0: assigned [mem 0xfa000000-0xfa003fff 64bit]
[ 0.359217] pci 0000:00:00.0: PCI bridge to [bus 01]
[ 0.359239] pci 0000:00:00.0: bridge window [mem 0xfa000000-0xfa0fffff]
[ 0.359422] pcieport 0000:00:00.0: enabling device (0000 -> 0002)
[ 0.359687] pcieport 0000:00:00.0: PME: Signaling with IRQ 76
[ 0.360001] pcieport 0000:00:00.0: AER: enabled with IRQ 76
And the NVME on the PCIE expansion card works as expected:
Tested-by: Alexandru Elisei <[email protected]>
Thanks,
Alex
>
> Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
> Reported-at: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Alexandru Elisei <[email protected]>
> Reported-by: Qu Wenruo <[email protected]>
> Suggested-by: Bjorn Helgaas <[email protected]>
> Signed-off-by: Punit Agrawal <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Rob Herring <[email protected]>
> ---
> Hi,
>
> The patch is an updated version to fix the PCI allocation issues on
> RK3399 based platforms. Previous postings can be found at [0][1][2].
>
> The updated patch instead of clearing the 64-bit flag for
> non-prefetchable memory below 4GB does it unconditionally on the basis
> that PCI allocation logic cannot deal with the 64-bit flag (although
> it should be able to). The result is a simpler patch that restores the
> input to the allocation logic to be identical to before 9d57e61bf723.
>
> Tested locally on a RockPro64 on top of v5.13-rc6. Please consider
> merging.
>
> Thanks,
> Punit
>
> Changes:
> v4:
>
> * Updated Patch 1 based on Bjorn's suggestion. Also dropped the
> Tested-by tags due to the change of logic
> * Dropped patch 2 and 3 from the series as it's not critical to the
> series
> * Dropped the device tree changes (Patch 4) as they are already queued
> in the soc tree
>
> v3:
> * Improved commit log for clarity (Patch 1)
> * Added Tested-by tags
>
> v2:
> * Check ranges PCI / bus addresses rather than CPU addresses
> * (new) Restrict 32-bit size warnings on ranges that don't have the 64-bit attribute set
> * Refactor the 32-bit size warning to the range parsing loop. This
> change also prints the warnings right after the window mappings are
> logged.
>
> [0] https://lore.kernel.org/linux-arm-kernel/[email protected]/
> [1] https://lore.kernel.org/linux-pci/[email protected]/
> [2] https://lore.kernel.org/linux-pci/[email protected]/
>
> drivers/pci/of.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index 85dcb7097da4..a143b02b2dcd 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -353,6 +353,8 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
> dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
> dev_node);
> *io_base = range.cpu_addr;
> + } else if (resource_type(res) == IORESOURCE_MEM) {
> + res->flags &= ~IORESOURCE_MEM_64;
> }
>
> pci_add_resource_offset(resources, res, res->start - range.pci_addr);
On Mon, Jun 14, 2021 at 5:05 PM Punit Agrawal <[email protected]> wrote:
>
> Alexandru and Qu reported this resource allocation failure on
> ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
>
> pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
> pci 0000:00:00.0: PCI bridge to [bus 01]
> pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
>
> "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
> PCI allocation code isn't smart enough to allocate it in a host
> bridge window marked as 64-bit, even though this should work fine.
>
> A DT host bridge description includes the windows from the CPU
> address space to the PCI bus space. On a few architectures
> (microblaze, powerpc, sparc), the DT may also describe PCI devices
> themselves, including their BARs.
>
> Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
> flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
> the fact that some DT addresses described 64-bit windows and BARs.
> That was a problem because the virtio virtual NIC has a 32-bit BAR
> and a 64-bit BAR, and the driver couldn't distinguish them.
>
> 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
> fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
> bridge windows, which exposed the fact that the PCI allocator isn't
> smart enough to put 32-bit resources in those 64-bit windows.
>
> Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
> that information.
>
> Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
> Reported-at: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Alexandru Elisei <[email protected]>
> Reported-by: Qu Wenruo <[email protected]>
> Suggested-by: Bjorn Helgaas <[email protected]>
> Signed-off-by: Punit Agrawal <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Rob Herring <[email protected]>
I think we've beat this one to death.
Reviewed-by: Rob Herring <[email protected]>
Hi Alex,
Alexandru Elisei <[email protected]> writes:
> Hi Punit,
>
> Thank you for working on this!
>
> On 6/15/21 12:04 AM, Punit Agrawal wrote:
>> Alexandru and Qu reported this resource allocation failure on
>> ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
>>
>> pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
>> pci 0000:00:00.0: PCI bridge to [bus 01]
>> pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
>> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
>>
>> "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
>> PCI allocation code isn't smart enough to allocate it in a host
>> bridge window marked as 64-bit, even though this should work fine.
>>
>> A DT host bridge description includes the windows from the CPU
>> address space to the PCI bus space. On a few architectures
>> (microblaze, powerpc, sparc), the DT may also describe PCI devices
>> themselves, including their BARs.
>>
>> Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
>> flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
>> the fact that some DT addresses described 64-bit windows and BARs.
>> That was a problem because the virtio virtual NIC has a 32-bit BAR
>> and a 64-bit BAR, and the driver couldn't distinguish them.
>>
>> 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
>> fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
>> bridge windows, which exposed the fact that the PCI allocator isn't
>> smart enough to put 32-bit resources in those 64-bit windows.
>>
>> Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
>> that information.
>
> I've tested the patch on my rockpro64. Kernel built from tag v5.13-rc6:
>
> [ 0.345676] pci 0000:01:00.0: 8.000 Gb/s available PCIe bandwidth, limited by
> 2.5 GT/s PCIe x4 link at 0000:00:00.0 (capable of 31.504 Gb/s with 8.0 GT/s PCIe
> x4 link)
> [ 0.359300] pci_bus 0000:01: busn_res: [bus 01-1f] end is updated to 01
> [ 0.359343] pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> [ 0.359365] pci 0000:00:00.0: BAR 14: failed to assign [mem size 0x00100000]
> [ 0.359387] pci 0000:01:00.0: BAR 0: no space for [mem size 0x00004000 64bit]
> [ 0.359407] pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x00004000 64bit]
> [ 0.359428] pci 0000:00:00.0: PCI bridge to [bus 01]
> [ 0.359862] pcieport 0000:00:00.0: PME: Signaling with IRQ 76
> [ 0.360190] pcieport 0000:00:00.0: AER: enabled with IRQ 76
>
> Kernel built from tag v5.13-rc6 with this patch applied:
>
> [ 0.345434] pci 0000:01:00.0: 8.000 Gb/s available PCIe bandwidth, limited by
> 2.5 GT/s PCIe x4 link at 0000:00:00.0 (capable of 31.504 Gb/s with 8.0 GT/s PCIe
> x4 link)
> [ 0.359081] pci_bus 0000:01: busn_res: [bus 01-1f] end is updated to 01
> [ 0.359128] pci 0000:00:00.0: BAR 14: assigned [mem 0xfa000000-0xfa0fffff]
> [ 0.359155] pci 0000:01:00.0: BAR 0: assigned [mem 0xfa000000-0xfa003fff 64bit]
> [ 0.359217] pci 0000:00:00.0: PCI bridge to [bus 01]
> [ 0.359239] pci 0000:00:00.0: bridge window [mem 0xfa000000-0xfa0fffff]
> [ 0.359422] pcieport 0000:00:00.0: enabling device (0000 -> 0002)
> [ 0.359687] pcieport 0000:00:00.0: PME: Signaling with IRQ 76
> [ 0.360001] pcieport 0000:00:00.0: AER: enabled with IRQ 76
>
> And the NVME on the PCIE expansion card works as expected:
>
> Tested-by: Alexandru Elisei <[email protected]>
Thanks a lot for the retest and the detailed logs.
Punit
[...]
Hi Rob,
Rob Herring <[email protected]> writes:
> On Mon, Jun 14, 2021 at 5:05 PM Punit Agrawal <[email protected]> wrote:
>>
>> Alexandru and Qu reported this resource allocation failure on
>> ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
>>
>> pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
>> pci 0000:00:00.0: PCI bridge to [bus 01]
>> pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
>> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
>>
>> "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
>> PCI allocation code isn't smart enough to allocate it in a host
>> bridge window marked as 64-bit, even though this should work fine.
>>
>> A DT host bridge description includes the windows from the CPU
>> address space to the PCI bus space. On a few architectures
>> (microblaze, powerpc, sparc), the DT may also describe PCI devices
>> themselves, including their BARs.
>>
>> Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
>> flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
>> the fact that some DT addresses described 64-bit windows and BARs.
>> That was a problem because the virtio virtual NIC has a 32-bit BAR
>> and a 64-bit BAR, and the driver couldn't distinguish them.
>>
>> 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
>> fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
>> bridge windows, which exposed the fact that the PCI allocator isn't
>> smart enough to put 32-bit resources in those 64-bit windows.
>>
>> Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
>> that information.
>>
>> Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
>> Reported-at: https://lore.kernel.org/lkml/[email protected]/
>> Reported-by: Alexandru Elisei <[email protected]>
>> Reported-by: Qu Wenruo <[email protected]>
>> Suggested-by: Bjorn Helgaas <[email protected]>
>> Signed-off-by: Punit Agrawal <[email protected]>
>> Cc: Bjorn Helgaas <[email protected]>
>> Cc: Rob Herring <[email protected]>
>
> I think we've beat this one to death.
>
> Reviewed-by: Rob Herring <[email protected]>
Thanks for taking a look. Hopefully everybody is happy with this
version and the patch can get merged soon.
I assume Bjorn will pick this up as a fix with Alex's Tested-by tag. Let
me know if any other steps are needed.
Thanks,
Punit
[...]
On Tue, 15 Jun 2021 at 01:05, Punit Agrawal <[email protected]> wrote:
>
> Alexandru and Qu reported this resource allocation failure on
> ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
>
> pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
> pci 0000:00:00.0: PCI bridge to [bus 01]
> pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
>
> "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
> PCI allocation code isn't smart enough to allocate it in a host
> bridge window marked as 64-bit, even though this should work fine.
>
> A DT host bridge description includes the windows from the CPU
> address space to the PCI bus space. On a few architectures
> (microblaze, powerpc, sparc), the DT may also describe PCI devices
> themselves, including their BARs.
>
> Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
> flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
> the fact that some DT addresses described 64-bit windows and BARs.
> That was a problem because the virtio virtual NIC has a 32-bit BAR
> and a 64-bit BAR, and the driver couldn't distinguish them.
>
> 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
> fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
> bridge windows, which exposed the fact that the PCI allocator isn't
> smart enough to put 32-bit resources in those 64-bit windows.
>
> Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
> that information.
>
> Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
> Reported-at: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Alexandru Elisei <[email protected]>
> Reported-by: Qu Wenruo <[email protected]>
> Suggested-by: Bjorn Helgaas <[email protected]>
> Signed-off-by: Punit Agrawal <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Rob Herring <[email protected]>
Acked-by: Ard Biesheuvel <[email protected]>
> ---
> Hi,
>
> The patch is an updated version to fix the PCI allocation issues on
> RK3399 based platforms. Previous postings can be found at [0][1][2].
>
> The updated patch instead of clearing the 64-bit flag for
> non-prefetchable memory below 4GB does it unconditionally on the basis
> that PCI allocation logic cannot deal with the 64-bit flag (although
> it should be able to). The result is a simpler patch that restores the
> input to the allocation logic to be identical to before 9d57e61bf723.
>
> Tested locally on a RockPro64 on top of v5.13-rc6. Please consider
> merging.
>
> Thanks,
> Punit
>
> Changes:
> v4:
>
> * Updated Patch 1 based on Bjorn's suggestion. Also dropped the
> Tested-by tags due to the change of logic
> * Dropped patch 2 and 3 from the series as it's not critical to the
> series
> * Dropped the device tree changes (Patch 4) as they are already queued
> in the soc tree
>
> v3:
> * Improved commit log for clarity (Patch 1)
> * Added Tested-by tags
>
> v2:
> * Check ranges PCI / bus addresses rather than CPU addresses
> * (new) Restrict 32-bit size warnings on ranges that don't have the 64-bit attribute set
> * Refactor the 32-bit size warning to the range parsing loop. This
> change also prints the warnings right after the window mappings are
> logged.
>
> [0] https://lore.kernel.org/linux-arm-kernel/[email protected]/
> [1] https://lore.kernel.org/linux-pci/[email protected]/
> [2] https://lore.kernel.org/linux-pci/[email protected]/
>
> drivers/pci/of.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index 85dcb7097da4..a143b02b2dcd 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -353,6 +353,8 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
> dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
> dev_node);
> *io_base = range.cpu_addr;
> + } else if (resource_type(res) == IORESOURCE_MEM) {
> + res->flags &= ~IORESOURCE_MEM_64;
> }
>
> pci_add_resource_offset(resources, res, res->start - range.pci_addr);
> --
> 2.30.2
>
On Tue, Jun 15, 2021 at 08:04:57AM +0900, Punit Agrawal wrote:
> Alexandru and Qu reported this resource allocation failure on
> ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
>
> pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
> pci 0000:00:00.0: PCI bridge to [bus 01]
> pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
>
> "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
> PCI allocation code isn't smart enough to allocate it in a host
> bridge window marked as 64-bit, even though this should work fine.
>
> A DT host bridge description includes the windows from the CPU
> address space to the PCI bus space. On a few architectures
> (microblaze, powerpc, sparc), the DT may also describe PCI devices
> themselves, including their BARs.
>
> Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
> flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
> the fact that some DT addresses described 64-bit windows and BARs.
> That was a problem because the virtio virtual NIC has a 32-bit BAR
> and a 64-bit BAR, and the driver couldn't distinguish them.
>
> 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
> fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
> bridge windows, which exposed the fact that the PCI allocator isn't
> smart enough to put 32-bit resources in those 64-bit windows.
>
> Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
> that information.
>
> Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
> Reported-at: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Alexandru Elisei <[email protected]>
> Reported-by: Qu Wenruo <[email protected]>
> Suggested-by: Bjorn Helgaas <[email protected]>
> Signed-off-by: Punit Agrawal <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Rob Herring <[email protected]>
Applied with:
Tested-by: Alexandru Elisei <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Acked-by: Ard Biesheuvel <[email protected]>
to for-linus for v5.13, thanks a lot!
> ---
> Hi,
>
> The patch is an updated version to fix the PCI allocation issues on
> RK3399 based platforms. Previous postings can be found at [0][1][2].
>
> The updated patch instead of clearing the 64-bit flag for
> non-prefetchable memory below 4GB does it unconditionally on the basis
> that PCI allocation logic cannot deal with the 64-bit flag (although
> it should be able to). The result is a simpler patch that restores the
> input to the allocation logic to be identical to before 9d57e61bf723.
>
> Tested locally on a RockPro64 on top of v5.13-rc6. Please consider
> merging.
>
> Thanks,
> Punit
>
> Changes:
> v4:
>
> * Updated Patch 1 based on Bjorn's suggestion. Also dropped the
> Tested-by tags due to the change of logic
> * Dropped patch 2 and 3 from the series as it's not critical to the
> series
> * Dropped the device tree changes (Patch 4) as they are already queued
> in the soc tree
>
> v3:
> * Improved commit log for clarity (Patch 1)
> * Added Tested-by tags
>
> v2:
> * Check ranges PCI / bus addresses rather than CPU addresses
> * (new) Restrict 32-bit size warnings on ranges that don't have the 64-bit attribute set
> * Refactor the 32-bit size warning to the range parsing loop. This
> change also prints the warnings right after the window mappings are
> logged.
>
> [0] https://lore.kernel.org/linux-arm-kernel/[email protected]/
> [1] https://lore.kernel.org/linux-pci/[email protected]/
> [2] https://lore.kernel.org/linux-pci/[email protected]/
>
> drivers/pci/of.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index 85dcb7097da4..a143b02b2dcd 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -353,6 +353,8 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
> dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
> dev_node);
> *io_base = range.cpu_addr;
> + } else if (resource_type(res) == IORESOURCE_MEM) {
> + res->flags &= ~IORESOURCE_MEM_64;
> }
>
> pci_add_resource_offset(resources, res, res->start - range.pci_addr);
> --
> 2.30.2
>
On Wed, Jun 16, 2021 at 06:12:34PM -0500, Bjorn Helgaas wrote:
> On Tue, Jun 15, 2021 at 08:04:57AM +0900, Punit Agrawal wrote:
> > Alexandru and Qu reported this resource allocation failure on
> > ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
> >
> > pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
> > pci 0000:00:00.0: PCI bridge to [bus 01]
> > pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> > pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
> >
> > "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
> > PCI allocation code isn't smart enough to allocate it in a host
> > bridge window marked as 64-bit, even though this should work fine.
> >
> > A DT host bridge description includes the windows from the CPU
> > address space to the PCI bus space. On a few architectures
> > (microblaze, powerpc, sparc), the DT may also describe PCI devices
> > themselves, including their BARs.
> >
> > Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
> > flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
> > the fact that some DT addresses described 64-bit windows and BARs.
> > That was a problem because the virtio virtual NIC has a 32-bit BAR
> > and a 64-bit BAR, and the driver couldn't distinguish them.
> >
> > 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
> > fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
> > bridge windows, which exposed the fact that the PCI allocator isn't
> > smart enough to put 32-bit resources in those 64-bit windows.
> >
> > Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
> > that information.
> >
> > Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
> > Reported-at: https://lore.kernel.org/lkml/[email protected]/
> > Reported-by: Alexandru Elisei <[email protected]>
> > Reported-by: Qu Wenruo <[email protected]>
> > Suggested-by: Bjorn Helgaas <[email protected]>
> > Signed-off-by: Punit Agrawal <[email protected]>
> > Cc: Bjorn Helgaas <[email protected]>
> > Cc: Rob Herring <[email protected]>
>
> Applied with:
>
> Tested-by: Alexandru Elisei <[email protected]>
> Reviewed-by: Rob Herring <[email protected]>
> Acked-by: Ard Biesheuvel <[email protected]>
>
> to for-linus for v5.13, thanks a lot!
Late-tested-by: Domenico Andreoli <[email protected]>
See https://lore.kernel.org/lkml/YMyTUv7Jsd89PGci@m4/T/#u
Thanks!
Dom
--
rsa4096: 3B10 0CA1 8674 ACBA B4FE FCD2 CE5B CF17 9960 DE13
ed25519: FFB4 0CC3 7F2E 091D F7DA 356E CC79 2832 ED38 CB05
On Fri, Jun 18, 2021 at 03:55:43PM +0200, Domenico Andreoli wrote:
> On Wed, Jun 16, 2021 at 06:12:34PM -0500, Bjorn Helgaas wrote:
> > On Tue, Jun 15, 2021 at 08:04:57AM +0900, Punit Agrawal wrote:
> > > Alexandru and Qu reported this resource allocation failure on
> > > ROCKPro64 v2 and ROCK Pi 4B, both based on the RK3399:
> > >
> > > pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit]
> > > pci 0000:00:00.0: PCI bridge to [bus 01]
> > > pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000]
> > > pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit]
> > >
> > > "BAR 14" is the PCI bridge's 32-bit non-prefetchable window, and our
> > > PCI allocation code isn't smart enough to allocate it in a host
> > > bridge window marked as 64-bit, even though this should work fine.
> > >
> > > A DT host bridge description includes the windows from the CPU
> > > address space to the PCI bus space. On a few architectures
> > > (microblaze, powerpc, sparc), the DT may also describe PCI devices
> > > themselves, including their BARs.
> > >
> > > Before 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource
> > > flags for 64-bit memory addresses"), of_bus_pci_get_flags() ignored
> > > the fact that some DT addresses described 64-bit windows and BARs.
> > > That was a problem because the virtio virtual NIC has a 32-bit BAR
> > > and a 64-bit BAR, and the driver couldn't distinguish them.
> > >
> > > 9d57e61bf723 set IORESOURCE_MEM_64 for those 64-bit DT ranges, which
> > > fixed the virtio driver. But it also set IORESOURCE_MEM_64 for host
> > > bridge windows, which exposed the fact that the PCI allocator isn't
> > > smart enough to put 32-bit resources in those 64-bit windows.
> > >
> > > Clear IORESOURCE_MEM_64 from host bridge windows since we don't need
> > > that information.
> > >
> > > Fixes: 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses")
> > > Reported-at: https://lore.kernel.org/lkml/[email protected]/
> > > Reported-by: Alexandru Elisei <[email protected]>
> > > Reported-by: Qu Wenruo <[email protected]>
> > > Suggested-by: Bjorn Helgaas <[email protected]>
> > > Signed-off-by: Punit Agrawal <[email protected]>
> > > Cc: Bjorn Helgaas <[email protected]>
> > > Cc: Rob Herring <[email protected]>
> >
> > Applied with:
> >
> > Tested-by: Alexandru Elisei <[email protected]>
> > Reviewed-by: Rob Herring <[email protected]>
> > Acked-by: Ard Biesheuvel <[email protected]>
> >
> > to for-linus for v5.13, thanks a lot!
>
> Late-tested-by: Domenico Andreoli <[email protected]>
>
> See https://lore.kernel.org/lkml/YMyTUv7Jsd89PGci@m4/T/#u
I updated the commit to add your report and tested-by, thanks!