| Message ID | 20131209071241.GA5760@pratyush-vbox (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Monday 09 December 2013, Pratyush Anand wrote: > > I think it does handle this correctly, look at > > > > static int dw_pcie_setup(int nr, struct pci_sys_data *sys) > > { > > ... > > if (global_io_offset < SZ_1M && pp->config.io_size > 0) { > > sys->io_offset = global_io_offset - pp->config.io_bus_addr; > > pci_ioremap_io(sys->io_offset, pp->io.start); > > global_io_offset += SZ_64K; > > pci_add_resource_offset(&sys->resources, &pp->io, > > sys->io_offset); > > } > > ... > > } > > > > I believe this does the right thing, but you have to put the correct > > translation into the 'ranges' property of the host bridge node in DT. > > May be not exactly. pp->io is the realio, and it is passed correctly > to pci_add_resource_offset. But, as you had also > said that pci_ioremap_io will receive cpu physical address space as > input, therefore I think following modification will be needed to work > io transaction properly. I see. I think you are right. > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index be6ce30..cf68632 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -378,6 +378,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > + global_io_offset); > pp->config.io_size = resource_size(&pp->io); > pp->config.io_bus_addr = range.pci_addr; > + pp->io_base = range.cpu_addr; > } > if (restype == IORESOURCE_MEM) { > of_pci_range_to_resource(&range, np, &pp->mem); > @@ -403,7 +404,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > pp->cfg0_base = pp->cfg.start; > pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; > - pp->io_base = pp->io.start; > pp->mem_base = pp->mem.start; > > pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, This looks correct to me and it seems to also fix a bug in dw_pcie_prog_viewport_io_outbound if I read this correctly. > @@ -667,7 +667,7 @@ static int dw_pcie_setup(int nr, struct pci_sys_data *sys) > > if (global_io_offset < SZ_1M && pp->config.io_size > 0) { > sys->io_offset = global_io_offset - pp->config.io_bus_addr; > - pci_ioremap_io(sys->io_offset, pp->io.start); > + pci_ioremap_io(sys->io_offset, pp->io_base); > global_io_offset += SZ_64K; > pci_add_resource_offset(&sys->resources, &pp->io, > sys->io_offset); I think there is still a related bug in here: we should pass global_io_offset rather than sys->io_offset to pci_ioremap_io, so we map the new window into the first available spot in the Linux view of the I/O space, rather than passing a number that might be zero for any bus, if the 'ranges' are set up to have an identity mapping between Linux I/O spaces and PCI I/O spaces. You should be able to verify this by setting the I/O range for the bus to a random 4KB multiple in DT and observe that Linux start allocating ports from 0x1000 but the raw BAR values would contain the value you have chosen. Arnd -- 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 Monday, December 09, 2013 at 08:12:42 AM, Pratyush Anand wrote: > Hi Arnd, > > On Fri, Dec 06, 2013 at 10:46:23PM +0800, Arnd Bergmann wrote: > > On Friday 06 December 2013, Pratyush Anand wrote: > [...] > > > > > > For example in SPEAr1340, physically RAM is mapped on above > > > > > addresses. PCIe address translation unit can accept address only > > > > > in the range of core addresses which are assigned to PCIe RC ie > > > > > 0x80000000-0x8FFFFFFF. > > > > > > > > Since this is a physical address, it corresponds to address space 3 > > > > in my list above, and the address you pick here is what you pass to > > > > pci_ioremap_io. > > > > > > This is what I was expecting. But currently designware driver does not > > > pass this address to pci_ioremap_io. > > > OK.. We will fix it and will send patch. > > > > I think it does handle this correctly, look at > > > > static int dw_pcie_setup(int nr, struct pci_sys_data *sys) > > { > > > > ... > > > > if (global_io_offset < SZ_1M && pp->config.io_size > 0) { > > > > sys->io_offset = global_io_offset - > > pp->config.io_bus_addr; pci_ioremap_io(sys->io_offset, > > pp->io.start); > > global_io_offset += SZ_64K; > > pci_add_resource_offset(&sys->resources, &pp->io, > > > > sys->io_offset); > > > > } > > > > ... > > > > } > > > > I believe this does the right thing, but you have to put the correct > > translation into the 'ranges' property of the host bridge node in DT. > > May be not exactly. pp->io is the realio, and it is passed correctly > to pci_add_resource_offset. But, as you had also > said that pci_ioremap_io will receive cpu physical address space as > input, therefore I think following modification will be needed to work > io transaction properly. > > > diff --git a/drivers/pci/host/pcie-designware.c > b/drivers/pci/host/pcie-designware.c index be6ce30..cf68632 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -378,6 +378,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > + global_io_offset); > pp->config.io_size = resource_size(&pp->io); > pp->config.io_bus_addr = range.pci_addr; > + pp->io_base = range.cpu_addr; > } > if (restype == IORESOURCE_MEM) { > of_pci_range_to_resource(&range, np, &pp->mem); > @@ -403,7 +404,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > pp->cfg0_base = pp->cfg.start; > pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; > - pp->io_base = pp->io.start; > pp->mem_base = pp->mem.start; > > pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, > @@ -667,7 +667,7 @@ static int dw_pcie_setup(int nr, struct pci_sys_data > *sys) > > if (global_io_offset < SZ_1M && pp->config.io_size > 0) { > sys->io_offset = global_io_offset - pp->config.io_bus_addr; > - pci_ioremap_io(sys->io_offset, pp->io.start); > + pci_ioremap_io(sys->io_offset, pp->io_base); > global_io_offset += SZ_64K; > pci_add_resource_offset(&sys->resources, &pp->io, > sys->io_offset); Tim, can you test if this patch fixes your SKY2 IOspace problem please ? -- 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
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index be6ce30..cf68632 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -378,6 +378,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) + global_io_offset); pp->config.io_size = resource_size(&pp->io); pp->config.io_bus_addr = range.pci_addr; + pp->io_base = range.cpu_addr; } if (restype == IORESOURCE_MEM) { of_pci_range_to_resource(&range, np, &pp->mem); @@ -403,7 +404,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base = pp->cfg.start; pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; - pp->io_base = pp->io.start; pp->mem_base = pp->mem.start; pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, @@ -667,7 +667,7 @@ static int dw_pcie_setup(int nr, struct pci_sys_data *sys) if (global_io_offset < SZ_1M && pp->config.io_size > 0) { sys->io_offset = global_io_offset - pp->config.io_bus_addr; - pci_ioremap_io(sys->io_offset, pp->io.start); + pci_ioremap_io(sys->io_offset, pp->io_base); global_io_offset += SZ_64K; pci_add_resource_offset(&sys->resources, &pp->io, sys->io_offset);