From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753669AbaIHMZ5 (ORCPT ); Mon, 8 Sep 2014 08:25:57 -0400 Received: from service87.mimecast.com ([91.220.42.44]:33772 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752925AbaIHMZy convert rfc822-to-8bit (ORCPT ); Mon, 8 Sep 2014 08:25:54 -0400 Date: Mon, 8 Sep 2014 13:25:49 +0100 From: Liviu Dudau To: Bjorn Helgaas Cc: Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Arnd Bergmann , Russell King , Tanmay Inamdar , Grant Likely , Sinan Kaya , Jingoo Han , Kukjin Kim , Suravee Suthikulanit , linux-pci , linux-arch , LKML , Device Tree ML , LAKML , Linus Walleij Subject: Re: [PATCH v9 06/12] ARM: integrator: Correct usage of of_pci_range_to_resource() Message-ID: <20140908122549.GI27864@e106497-lin.cambridge.arm.com> References: <1407860725-25202-1-git-send-email-Liviu.Dudau@arm.com> <1407860725-25202-7-git-send-email-Liviu.Dudau@arm.com> <20140905220820.GI8080@google.com> MIME-Version: 1.0 In-Reply-To: <20140905220820.GI8080@google.com> User-Agent: Mutt/1.5.22 (2013-10-16) X-OriginalArrivalTime: 08 Sep 2014 12:25:50.0777 (UTC) FILETIME=[06C2EA90:01CFCB60] X-MC-Unique: 114090813255110701 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > Cc: Arnd Bergmann > > Cc: Rob Herring > > Cc: Russell King > > Signed-off-by: Liviu Dudau > > 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 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯