> > @@ -879,11 +891,18 @@
> > prev = NULL;
> > while ((rlen -= np * sizeof(unsigned int)) >= 0) {
> > if (prev) {
> > - if (prev[0] == ranges[0] && prev[1] == ranges[1] &&
> > - (prev[2] + prev[na+4]) == ranges[2] &&
> > - (prev[na+2] + prev[na+4]) == ranges[na+2]) {
> > - prev[na+4] += ranges[na+4];
> > + prev_pci_space = prev[0];
> > + prev_pci_addr = pci_get_range64(&prev[1]);
> > + prev_size = pci_get_range64(&prev[na+3]);
> > + pci_space = ranges[0];
> > + pci_addr = pci_get_range64(&ranges[1]);
> > + if ((prev_pci_space == pci_space) &&
> > + ((prev_pci_addr + prev_size) == pci_addr)) {
> > + size = pci_get_range64(&ranges[na+3]);
> > + prev_size += size;
> > ranges[0] = 0;
> > + prev[na+3] = (u32)((prev_size >> 32) &
> > 0xffffffff);
> > + prev[na+4] = (u32)(prev_size & 0xffffffff);
> > ranges += np;
> > continue;
>
> I do think that ranges hacking (even on a copy) to cope with contiguous
> ranges is not a good deed. And nobody would object the upper looks horrible
> from the maintenance POV.
> >
Yes, hacking of ranges shouldn't be done there. PowerMac does range
coalescing separately, we can move this to some generic place maybe and
use it where needed.
Just make everything use resource_size_t in the PCI bits and u64 in the
parsing bits.
> This is not correct - it should depend on #ac of the parent node.
> But I'll stop right here - there is no deep mutual difference between 32 & 64
> bit so that to keep 2 similar implementations, none of which (esp 32bit)
> really comply the spec. It should work the same way, and, if there are
> differences, they should be handled
> explicitly, and, of course, reconsidered if they make sense (like
> isa_io_base, absense of io_size in ppc32 and so on)
>
> I am *not* telling here that my implementation is the only true way around.
> But we need to improve and make code cleaner rather then just extend existing
> error-prone approach.
We need to merge 32 and 64 bits here for sure.
Ben.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
