Thread (41 messages) 41 messages, 5 authors, 2014-09-23

Re: [PATCH v11 04/10] PCI: OF: Fix the conversion of IO ranges into IO resources.

From: Rob Herring <hidden>
Date: 2014-09-22 17:19:08
Also in: linux-arch, linux-arm-kernel, linux-pci, lkml

On Mon, Sep 22, 2014 at 10:32 AM, Liviu Dudau [off-list ref] wrote:
On Sat, Sep 20, 2014 at 06:33:11PM +0100, Rob Herring wrote:
quoted
On 09/17/2014 08:30 PM, Liviu Dudau wrote:
quoted
The ranges property for a host bridge controller in DT describes
the mapping between the PCI bus address and the CPU physical address.
The resources framework however expects that the IO resources start
at a pseudo "port" address 0 (zero) and have a maximum size of IO_SPACE_LIMIT.
The conversion from pci ranges to resources failed to take that into account.
[...]
quoted
quoted
              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;
You should return ret rather than potentially changing the return value.
I was trying to keep the existing behaviour, which was to return -EINVAL if the
parsing has failed. But I can return ret and propagate the original error code.
A valid concern, but I checked and I believe the return from
of_pci_range_to_resource is currently -EINVAL.
quoted
quoted
+int of_pci_range_to_resource(struct of_pci_range *range,
+     struct device_node *np, struct resource *res)
+{
+     int err;
+     res->flags = range->flags;
+     res->parent = res->child = res->sibling = NULL;
+     res->name = np->full_name;
+
+     if (res->flags & IORESOURCE_IO) {
+             unsigned long port = -1;
Assigning a signed value to unsigned...
Ooops, sorry about that. Removed the initialisation now.
quoted
Does port need to be 64-bit on 64-bit hosts?
I'm following existing APIs. Basically my function is a variant of __of_address_to_resource()
Okay.

Rob
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help