[PATCH v7 2/6] pci: OF: Fix the conversion of IO ranges into IO resources.

Liviu Dudau
2014-03-14T19:00:17Z

On Fri, Mar 14, 2014 at 06:46:23PM +0000, Arnd Bergmann wrote:
> On Friday 14 March 2014, Liviu Dudau wrote:
> > You are right, that was lazy of me. What about this version?
>
> Yes, that seems better. Thanks for fixing it up.
>
> But back to the more important question that I realized we have
> not resolved yet:
>
> You now have two completely independent allocation functions for
> logical I/O space numbers, and they will return different numbers
> for any nontrivial scenario.
>
> > +int of_pci_range_to_resource(struct of_pci_range *range,
> > + struct device_node *np, struct resource *res)
> > +{
> > + 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;
> > + int err = pci_register_io_range(range->cpu_addr, range->size);
> > + if (err)
> > + goto invalid_range;
> > + port = pci_address_to_pio(range->cpu_addr);
> > + if (port == (unsigned long)-1) {
> > + err = -EINVAL;
> > + goto invalid_range;
> > + }
> > + res->start = port;
> > + } else {
>
> This one concatenates the I/O spaces and assumes that each space starts
> at bus address zero, and takes little precaution to avoid filling up IO_SPACE_LIMIT
> if the sizes are too big.

Actually, you are attaching too much meaning to this one. pci_register_io_range()
only tries to remember the ranges, nothing else. And it *does* check that the
total sum of registered ranges does not exceed IO_SPACE_LIMIT. This is used before
we have any resource mapped for that range (actually it is used to *create* the
resource for the range) so there is no other helping hand.

It doesn't assume that space starts at bus address zero, it ignores the bus address.
It only handles CPU addresses for the range, to help with generating logical IO ports.
If you have overlapping CPU addresses with different bus addresses it will not work,
but then I guess you will have different problems then.

>
> >+unsigned long pci_ioremap_io(const struct resource *res, phys_addr_t phys_addr)
> >+{
> >+ unsigned long start, len, virt_start;
> >+ int err;
> >+
> >+ if (res->end > IO_SPACE_LIMIT)
> >+ return -EINVAL;
> >+
> >+ /*
> >+ * try finding free space for the whole size first,
> >+ * fall back to 64K if not available
> >+ */
> >+ len = resource_size(res);
> >+ start = bitmap_find_next_zero_area(pci_iospace, IO_SPACE_PAGES,
> >+ res->start / PAGE_SIZE, len / PAGE_SIZE, 0);
> >+ if (start == IO_SPACE_PAGES && len > SZ_64K) {
> >+ len = SZ_64K;
> >+ start = 0;
> >+ start = bitmap_find_next_zero_area(pci_iospace, IO_SPACE_PAGES,
> >+ start, len / PAGE_SIZE, 0);
> >+ }
> >+
> >+ /* no 64K area found */
> >+ if (start == IO_SPACE_PAGES)
> >+ return -ENOMEM;
> >+
> >+ /* ioremap physical aperture to virtual aperture */
> >+ virt_start = start * PAGE_SIZE + (unsigned long)PCI_IOBASE;
> >+ err = ioremap_page_range(virt_start, virt_start + len,
> >+ phys_addr, __pgprot(PROT_DEVICE_nGnRE));
> >+ if (err)
> >+ return err;
> >+
> >+ bitmap_set(pci_iospace, start, len / PAGE_SIZE);
> >+
> >+ /* return io_offset */
> >+ return start * PAGE_SIZE - res->start;
> >+}
>
> While this one will try to fall back to smaller sizes, and will honor nonzero
> bus addresses.

Yes, because this one does the actual allocation. And it needs to know how
the mapping from CPU to bus works.

>
> I think we shouldn't even try to do the same thing twice, but instead just
> use a single allocator. I'd prefer the one I came up with, but I realize
> that I am biased here ;-)

I agree, but I think the two functions serve two different and distinct roles.

Best regards,
Liviu

>
> Arnd
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo at 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! /
---------------
?\_(?)_/?