PCI: of_property: Assign PCI instead of CPU bus address to dynamic PCI nodes

Commit Message

Andrea della Porta Nov. 8, 2024, 9:42 a.m. UTC

When populating "ranges" property for a PCI bridge or endpoint,
of_pci_prop_ranges() incorrectly use the CPU bus address of the resource.
In such PCI nodes, the window should instead be in PCI address space. Call
pci_bus_address() on the resource in order to obtain the PCI bus
address.

Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
Cc: [e-mail]
Signed-off-by: Andrea della Porta <[e-mail]>
Acked-by: Bjorn Helgaas <[e-mail]>
Tested-by: Herve Codina <[e-mail]>
---
This patch, originally preparatory for a bigger patchset (see [1]), has
been splitted in a standalone one for better management and because it
contains a bugfix which is probably of interest to stable branch.

 drivers/pci/of_property.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Herve Codina Nov. 8, 2024, 10:09 a.m. UTC | #1

Hi Andrea,

On Fri,  8 Nov 2024 10:42:56 +0100
Andrea della Porta <[e-mail]> wrote:

> When populating "ranges" property for a PCI bridge or endpoint,
> of_pci_prop_ranges() incorrectly use the CPU bus address of the resource.
> In such PCI nodes, the window should instead be in PCI address space. Call
> pci_bus_address() on the resource in order to obtain the PCI bus
> address.
> 
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Cc: [e-mail]
> Signed-off-by: Andrea della Porta <[e-mail]>
> Acked-by: Bjorn Helgaas <[e-mail]>
> Tested-by: Herve Codina <[e-mail]>
> ---
> This patch, originally preparatory for a bigger patchset (see [1]), has
> been splitted in a standalone one for better management and because it
> contains a bugfix which is probably of interest to stable branch.

Nothing to say for the patch itself.

Just here, you mentioned "see [1]" but you didn't provide the link.

IMHO, this is not blocking for applying the patch but, just for other people
looking at this email in the mailing list, can you reply providing the link?

Best regards,
Hervé

Andrea della Porta Nov. 8, 2024, 10:14 a.m. UTC | #2

Hi herve,

On 11:09 Fri 08 Nov     , Herve Codina wrote:
> Hi Andrea,
> 
> On Fri,  8 Nov 2024 10:42:56 +0100
> Andrea della Porta <[e-mail]> wrote:
> 
> > When populating "ranges" property for a PCI bridge or endpoint,
> > of_pci_prop_ranges() incorrectly use the CPU bus address of the resource.
> > In such PCI nodes, the window should instead be in PCI address space. Call
> > pci_bus_address() on the resource in order to obtain the PCI bus
> > address.
> > 
> > Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> > Cc: [e-mail]
> > Signed-off-by: Andrea della Porta <[e-mail]>
> > Acked-by: Bjorn Helgaas <[e-mail]>
> > Tested-by: Herve Codina <[e-mail]>
> > ---
> > This patch, originally preparatory for a bigger patchset (see [1]), has
> > been splitted in a standalone one for better management and because it
> > contains a bugfix which is probably of interest to stable branch.
> 
> Nothing to say for the patch itself.
> 
> Just here, you mentioned "see [1]" but you didn't provide the link.
> 
> IMHO, this is not blocking for applying the patch but, just for other people
> looking at this email in the mailing list, can you reply providing the link?

Thanks for pointing that out, sorry about that. Here it is:

[1] - https://lore.kernel.org/all/f6b4[e-mail]/

Many thanks,
Andrea

> 
> Best regards,
> Hervé

Andrea della Porta Nov. 14, 2024, 3:26 p.m. UTC | #3

Hi,

On 11:14 Fri 08 Nov     , Andrea della Porta wrote:
> Hi herve,
> 
> On 11:09 Fri 08 Nov     , Herve Codina wrote:
> > Hi Andrea,
> > 
> > On Fri,  8 Nov 2024 10:42:56 +0100
> > Andrea della Porta <[e-mail]> wrote:
> > 
> > > When populating "ranges" property for a PCI bridge or endpoint,
> > > of_pci_prop_ranges() incorrectly use the CPU bus address of the resource.
> > > In such PCI nodes, the window should instead be in PCI address space. Call
> > > pci_bus_address() on the resource in order to obtain the PCI bus
> > > address.
> > > 
> > > Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> > > Cc: [e-mail]
> > > Signed-off-by: Andrea della Porta <[e-mail]>
> > > Acked-by: Bjorn Helgaas <[e-mail]>
> > > Tested-by: Herve Codina <[e-mail]>
> > > ---
> > > This patch, originally preparatory for a bigger patchset (see [1]), has
> > > been splitted in a standalone one for better management and because it
> > > contains a bugfix which is probably of interest to stable branch.
> > 
> > Nothing to say for the patch itself.
> > 
> > Just here, you mentioned "see [1]" but you didn't provide the link.
> > 
> > IMHO, this is not blocking for applying the patch but, just for other people
> > looking at this email in the mailing list, can you reply providing the link?
> 
> Thanks for pointing that out, sorry about that. Here it is:
> 
> [1] - https://lore.kernel.org/all/f6b4[e-mail]/

Do I have to resubmit the patch with the referenced url fixed or is it
ok as it is?

Thanks,
Andrea

> 
> Many thanks,
> Andrea
> 
> > 
> > Best regards,
> > Hervé

Herve Codina Nov. 14, 2024, 3:45 p.m. UTC | #4

Hi Andrea,

On Thu, 14 Nov 2024 16:26:42 +0100
Andrea della Porta <[e-mail]> wrote:

> Hi,
> 
> On 11:14 Fri 08 Nov     , Andrea della Porta wrote:
> > Hi herve,
> > 
> > On 11:09 Fri 08 Nov     , Herve Codina wrote:  
> > > Hi Andrea,
> > > 
> > > On Fri,  8 Nov 2024 10:42:56 +0100
> > > Andrea della Porta <[e-mail]> wrote:
> > >   
> > > > When populating "ranges" property for a PCI bridge or endpoint,
> > > > of_pci_prop_ranges() incorrectly use the CPU bus address of the resource.
> > > > In such PCI nodes, the window should instead be in PCI address space. Call
> > > > pci_bus_address() on the resource in order to obtain the PCI bus
> > > > address.
> > > > 
> > > > Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> > > > Cc: [e-mail]
> > > > Signed-off-by: Andrea della Porta <[e-mail]>
> > > > Acked-by: Bjorn Helgaas <[e-mail]>
> > > > Tested-by: Herve Codina <[e-mail]>
> > > > ---
> > > > This patch, originally preparatory for a bigger patchset (see [1]), has
> > > > been splitted in a standalone one for better management and because it
> > > > contains a bugfix which is probably of interest to stable branch.  
> > > 
> > > Nothing to say for the patch itself.
> > > 
> > > Just here, you mentioned "see [1]" but you didn't provide the link.
> > > 
> > > IMHO, this is not blocking for applying the patch but, just for other people
> > > looking at this email in the mailing list, can you reply providing the link?  
> > 
> > Thanks for pointing that out, sorry about that. Here it is:
> > 
> > [1] - https://lore.kernel.org/all/f6b4[e-mail]/  
> 
> Do I have to resubmit the patch with the referenced url fixed or is it
> ok as it is?

This reference is after the '---' marker line and so will not be present in
the changelog once the patch is applied.

For this reason, I don't think you have to resubmit the patch.

If you need to resubmit the patch for any other reasons (resent because
the patch was applied, modification needed, ...) resubmit it with the
referenced url fixed.

Best regards,
Hervé

Bjorn Helgaas Nov. 15, 2024, 5:25 p.m. UTC | #5

On Fri, Nov 08, 2024 at 10:42:56AM +0100, Andrea della Porta wrote:
> When populating "ranges" property for a PCI bridge or endpoint,
> of_pci_prop_ranges() incorrectly use the CPU bus address of the resource.
> In such PCI nodes, the window should instead be in PCI address space. Call
> pci_bus_address() on the resource in order to obtain the PCI bus
> address.
> 
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Cc: [e-mail]
> Signed-off-by: Andrea della Porta <[e-mail]>
> Acked-by: Bjorn Helgaas <[e-mail]>
> Tested-by: Herve Codina <[e-mail]>

I picked this up on pci/of for v6.13, thanks!  Rob, let me know if
you'd prefer to take it or ack/review it.

> ---
> This patch, originally preparatory for a bigger patchset (see [1]), has
> been splitted in a standalone one for better management and because it
> contains a bugfix which is probably of interest to stable branch.
> 
>  drivers/pci/of_property.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
> index 5a0b98e69795..886c236e5de6 100644
> --- a/drivers/pci/of_property.c
> +++ b/drivers/pci/of_property.c
> @@ -126,7 +126,7 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs,
>  		if (of_pci_get_addr_flags(&res[j], &flags))
>  			continue;
>  
> -		val64 = res[j].start;
> +		val64 = pci_bus_address(pdev, &res[j] - pdev->resource);
>  		of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags,
>  				   false);
>  		if (pci_is_bridge(pdev)) {
> -- 
> 2.35.3
>

Patch

diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
index 5a0b98e69795..886c236e5de6 100644
--- a/drivers/pci/of_property.c
+++ b/drivers/pci/of_property.c
@@ -126,7 +126,7 @@  static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs,
 		if (of_pci_get_addr_flags(&res[j], &flags))
 			continue;
 
-		val64 = res[j].start;
+		val64 = pci_bus_address(pdev, &res[j] - pdev->resource);
 		of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags,
 				   false);
 		if (pci_is_bridge(pdev)) {