| Message ID | 1407860725-25202-7-git-send-email-Liviu.Dudau@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
[+cc Linus] On Tue, Aug 12, 2014 at 05:25:19PM +0100, Liviu Dudau wrote: > Previously, of_pci_range_to_resource() would return a resource > that contained physical addresses of the IO space even if the > IORESOURCE_IO flags mandate a logical port set of values. Now > that the function has been fixed we need to update the drivers > that were taking advantage of the old behaviour. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> Something's wrong with the CC: list. You list Linus here in the changelog, but I don't see him in the CC: headers. > --- > arch/arm/mach-integrator/pci_v3.c | 24 +++++++++++++----------- > 1 file changed, 13 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c > index 05e1f73..193b7f8 100644 > --- a/arch/arm/mach-integrator/pci_v3.c > +++ b/arch/arm/mach-integrator/pci_v3.c > @@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void) > { > unsigned long flags; > unsigned int temp; > + phys_addr_t io_address = pci_pio_to_address(io_mem.start); > > pcibios_min_mem = 0x00100000; > > @@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void) > /* > * Setup window 2 - PCI IO > */ > - v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) | > + v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) | > V3_LB_BASE_ENABLE); > v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0)); > > @@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void) > static void __init pci_v3_postinit(void) > { > unsigned int pci_cmd; > + phys_addr_t io_address = pci_pio_to_address(io_mem.start); > > pci_cmd = PCI_COMMAND_MEMORY | > PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE; > @@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void) > "interrupt: %d\n", ret); > #endif > > - register_isa_ports(non_mem.start, io_mem.start, 0); > + register_isa_ports(non_mem.start, io_address, 0); > } > > /* > @@ -867,33 +869,33 @@ static int __init pci_v3_probe(struct platform_device *pdev) > > for_each_of_pci_range(&parser, &range) { > if (!range.flags) { > - of_pci_range_to_resource(&range, np, &conf_mem); > + ret = of_pci_range_to_resource(&range, np, &conf_mem); > conf_mem.name = "PCIv3 config"; > } > if (range.flags & IORESOURCE_IO) { > - of_pci_range_to_resource(&range, np, &io_mem); > + ret = of_pci_range_to_resource(&range, np, &io_mem); > + dev_info(&pdev->dev, "IO PCI range converted\n"); > io_mem.name = "PCIv3 I/O"; > } > if ((range.flags & IORESOURCE_MEM) && > !(range.flags & IORESOURCE_PREFETCH)) { > non_mem_pci = range.pci_addr; > non_mem_pci_sz = range.size; > - of_pci_range_to_resource(&range, np, &non_mem); > + ret = of_pci_range_to_resource(&range, np, &non_mem); > non_mem.name = "PCIv3 non-prefetched mem"; > } > if ((range.flags & IORESOURCE_MEM) && > (range.flags & IORESOURCE_PREFETCH)) { > pre_mem_pci = range.pci_addr; > pre_mem_pci_sz = range.size; > - of_pci_range_to_resource(&range, np, &pre_mem); > + ret = of_pci_range_to_resource(&range, np, &pre_mem); > pre_mem.name = "PCIv3 prefetched mem"; > } > - } > > - if (!conf_mem.start || !io_mem.start || > - !non_mem.start || !pre_mem.start) { > - dev_err(&pdev->dev, "missing ranges in device node\n"); > - return -EINVAL; > + if (ret < 0) { > + dev_err(&pdev->dev, "missing ranges in device node\n"); > + return -EINVAL; > + } > } > > pci_v3.map_irq = of_irq_parse_and_map_pci; > -- > 2.0.4 > -- 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
On Fri, Sep 05, 2014 at 11:08:20PM +0100, Bjorn Helgaas wrote: > [+cc Linus] > > On Tue, Aug 12, 2014 at 05:25:19PM +0100, Liviu Dudau wrote: > > Previously, of_pci_range_to_resource() would return a resource > > that contained physical addresses of the IO space even if the > > IORESOURCE_IO flags mandate a logical port set of values. Now > > that the function has been fixed we need to update the drivers > > that were taking advantage of the old behaviour. > > > > Cc: Linus Walleij <linus.walleij@linaro.org> > > Cc: Arnd Bergmann <arnd@arndb.de> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: Russell King <linux@arm.linux.org.uk> > > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> > > Something's wrong with the CC: list. You list Linus here in the changelog, > but I don't see him in the CC: headers. Yes, turns out one of my .git/config directories had supresscc=all. Best regards, Liviu > > > --- > > arch/arm/mach-integrator/pci_v3.c | 24 +++++++++++++----------- > > 1 file changed, 13 insertions(+), 11 deletions(-) > > > > diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c > > index 05e1f73..193b7f8 100644 > > --- a/arch/arm/mach-integrator/pci_v3.c > > +++ b/arch/arm/mach-integrator/pci_v3.c > > @@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void) > > { > > unsigned long flags; > > unsigned int temp; > > + phys_addr_t io_address = pci_pio_to_address(io_mem.start); > > > > pcibios_min_mem = 0x00100000; > > > > @@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void) > > /* > > * Setup window 2 - PCI IO > > */ > > - v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) | > > + v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) | > > V3_LB_BASE_ENABLE); > > v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0)); > > > > @@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void) > > static void __init pci_v3_postinit(void) > > { > > unsigned int pci_cmd; > > + phys_addr_t io_address = pci_pio_to_address(io_mem.start); > > > > pci_cmd = PCI_COMMAND_MEMORY | > > PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE; > > @@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void) > > "interrupt: %d\n", ret); > > #endif > > > > - register_isa_ports(non_mem.start, io_mem.start, 0); > > + register_isa_ports(non_mem.start, io_address, 0); > > } > > > > /* > > @@ -867,33 +869,33 @@ static int __init pci_v3_probe(struct platform_device *pdev) > > > > for_each_of_pci_range(&parser, &range) { > > if (!range.flags) { > > - of_pci_range_to_resource(&range, np, &conf_mem); > > + ret = of_pci_range_to_resource(&range, np, &conf_mem); > > conf_mem.name = "PCIv3 config"; > > } > > if (range.flags & IORESOURCE_IO) { > > - of_pci_range_to_resource(&range, np, &io_mem); > > + ret = of_pci_range_to_resource(&range, np, &io_mem); > > + dev_info(&pdev->dev, "IO PCI range converted\n"); > > io_mem.name = "PCIv3 I/O"; > > } > > if ((range.flags & IORESOURCE_MEM) && > > !(range.flags & IORESOURCE_PREFETCH)) { > > non_mem_pci = range.pci_addr; > > non_mem_pci_sz = range.size; > > - of_pci_range_to_resource(&range, np, &non_mem); > > + ret = of_pci_range_to_resource(&range, np, &non_mem); > > non_mem.name = "PCIv3 non-prefetched mem"; > > } > > if ((range.flags & IORESOURCE_MEM) && > > (range.flags & IORESOURCE_PREFETCH)) { > > pre_mem_pci = range.pci_addr; > > pre_mem_pci_sz = range.size; > > - of_pci_range_to_resource(&range, np, &pre_mem); > > + ret = of_pci_range_to_resource(&range, np, &pre_mem); > > pre_mem.name = "PCIv3 prefetched mem"; > > } > > - } > > > > - if (!conf_mem.start || !io_mem.start || > > - !non_mem.start || !pre_mem.start) { > > - dev_err(&pdev->dev, "missing ranges in device node\n"); > > - return -EINVAL; > > + if (ret < 0) { > > + dev_err(&pdev->dev, "missing ranges in device node\n"); > > + return -EINVAL; > > + } > > } > > > > pci_v3.map_irq = of_irq_parse_and_map_pci; > > -- > > 2.0.4 > > > -- > 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 >
On Tue, Aug 12, 2014 at 6:25 PM, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > Previously, of_pci_range_to_resource() would return a resource > that contained physical addresses of the IO space even if the > IORESOURCE_IO flags mandate a logical port set of values. Now > that the function has been fixed we need to update the drivers > that were taking advantage of the old behaviour. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> I guess you know what you're doing so: Acked-by: Linus Walleij <linus.walleij@linaro.org> I expect this patch to go through the PCI tree or so? Or do you expect me to funnel it? Yours, Linus Walleij -- 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
On Mon, Sep 22, 2014 at 01:47:16PM +0100, Linus Walleij wrote: > On Tue, Aug 12, 2014 at 6:25 PM, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > > > Previously, of_pci_range_to_resource() would return a resource > > that contained physical addresses of the IO space even if the > > IORESOURCE_IO flags mandate a logical port set of values. Now > > that the function has been fixed we need to update the drivers > > that were taking advantage of the old behaviour. > > > > Cc: Linus Walleij <linus.walleij@linaro.org> > > Cc: Arnd Bergmann <arnd@arndb.de> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: Russell King <linux@arm.linux.org.uk> > > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> > > I guess you know what you're doing so: I hope so :) > Acked-by: Linus Walleij <linus.walleij@linaro.org> Thanks! > > I expect this patch to go through the PCI tree or so? Or do you > expect me to funnel it? It will go through PCI tree together with the patch that "fixes" the existing functionality. Best regards, Liviu > > Yours, > Linus Walleij >
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index 05e1f73..193b7f8 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void) { unsigned long flags; unsigned int temp; + phys_addr_t io_address = pci_pio_to_address(io_mem.start); pcibios_min_mem = 0x00100000; @@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void) /* * Setup window 2 - PCI IO */ - v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) | + v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) | V3_LB_BASE_ENABLE); v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0)); @@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void) static void __init pci_v3_postinit(void) { unsigned int pci_cmd; + phys_addr_t io_address = pci_pio_to_address(io_mem.start); pci_cmd = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE; @@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void) "interrupt: %d\n", ret); #endif - register_isa_ports(non_mem.start, io_mem.start, 0); + register_isa_ports(non_mem.start, io_address, 0); } /* @@ -867,33 +869,33 @@ static int __init pci_v3_probe(struct platform_device *pdev) for_each_of_pci_range(&parser, &range) { if (!range.flags) { - of_pci_range_to_resource(&range, np, &conf_mem); + ret = of_pci_range_to_resource(&range, np, &conf_mem); conf_mem.name = "PCIv3 config"; } if (range.flags & IORESOURCE_IO) { - of_pci_range_to_resource(&range, np, &io_mem); + ret = of_pci_range_to_resource(&range, np, &io_mem); + dev_info(&pdev->dev, "IO PCI range converted\n"); io_mem.name = "PCIv3 I/O"; } if ((range.flags & IORESOURCE_MEM) && !(range.flags & IORESOURCE_PREFETCH)) { non_mem_pci = range.pci_addr; non_mem_pci_sz = range.size; - of_pci_range_to_resource(&range, np, &non_mem); + ret = of_pci_range_to_resource(&range, np, &non_mem); non_mem.name = "PCIv3 non-prefetched mem"; } if ((range.flags & IORESOURCE_MEM) && (range.flags & IORESOURCE_PREFETCH)) { pre_mem_pci = range.pci_addr; pre_mem_pci_sz = range.size; - of_pci_range_to_resource(&range, np, &pre_mem); + ret = of_pci_range_to_resource(&range, np, &pre_mem); pre_mem.name = "PCIv3 prefetched mem"; } - } - if (!conf_mem.start || !io_mem.start || - !non_mem.start || !pre_mem.start) { - dev_err(&pdev->dev, "missing ranges in device node\n"); - return -EINVAL; + if (ret < 0) { + dev_err(&pdev->dev, "missing ranges in device node\n"); + return -EINVAL; + } } pci_v3.map_irq = of_irq_parse_and_map_pci;
Previously, of_pci_range_to_resource() would return a resource that contained physical addresses of the IO space even if the IORESOURCE_IO flags mandate a logical port set of values. Now that the function has been fixed we need to update the drivers that were taking advantage of the old behaviour. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> --- arch/arm/mach-integrator/pci_v3.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)