| Message ID | 20131210043409.GA2734@pratyush-vbox (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Tuesday, December 10, 2013 1:34 PM, Pratyush Anand wrote: > On Tue, Dec 10, 2013 at 12:09:37AM +0800, Arnd Bergmann wrote: > > 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. > > Yes, now outbound viewport for IO translation will get correct input > address. > > > > > > @@ -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. > > OK. > > @ Jingoo, Mohit > > Is it possible for you to test following patch. Hi Pratyush Anand, This patch works properly on Exynos platform with two different NICs. Also, I am tracing this discussion. Thank you for sending your patch. Best regards, Jingoo Han > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index be6ce30..b83f5e8 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(global_io_offset, pp->io_base); > global_io_offset += SZ_64K; > pci_add_resource_offset(&sys->resources, &pp->io, > sys->io_offset); -- 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
Hello Pratyush, > -----Original Message----- > From: Jingoo Han [mailto:jg1.han@samsung.com] > Sent: Tuesday, December 10, 2013 10:55 AM > To: Pratyush ANAND; 'Arnd Bergmann'; Mohit KUMAR DCG > Cc: 'Marek Vasut'; 'Richard Zhu'; 'Kishon Vijay Abraham I'; linux- > pci@vger.kernel.org; 'Tim Harvey'; 'Jingoo Han' > Subject: Re: [Query/Discussion]: IO translation with designware PCIe > controller > > On Tuesday, December 10, 2013 1:34 PM, Pratyush Anand wrote: > > On Tue, Dec 10, 2013 at 12:09:37AM +0800, Arnd Bergmann wrote: > > > 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. > > > > Yes, now outbound viewport for IO translation will get correct input > > address. > > > > > > > > > @@ -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. > > > > OK. > > > > @ Jingoo, Mohit - Now its working properly for SPEAr1310 tested with directly connected EP(xhc cards) as well as EP Connected through switch(Lecroy PTC in AIC mode). Without this patch my EP devices were not working when connected through Switch. Thanks Mohit > > > > Is it possible for you to test following patch. > > Hi Pratyush Anand, > > This patch works properly on Exynos platform with two different NICs. Also, I > am tracing this discussion. > Thank you for sending your patch. > > Best regards, > Jingoo Han > > > > > diff --git a/drivers/pci/host/pcie-designware.c > > b/drivers/pci/host/pcie-designware.c > > index be6ce30..b83f5e8 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(global_io_offset, pp->io_base); > > global_io_offset += SZ_64K; > > pci_add_resource_offset(&sys->resources, &pp->io, > > sys->io_offset); > -- 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
Hi Tim, On Tue, Dec 10, 2013 at 02:31:08PM +0800, Mohit KUMAR DCG wrote: > Hello Pratyush, > > > -----Original Message----- > > From: Jingoo Han [mailto:jg1.han@samsung.com] > > Sent: Tuesday, December 10, 2013 10:55 AM > > To: Pratyush ANAND; 'Arnd Bergmann'; Mohit KUMAR DCG > > Cc: 'Marek Vasut'; 'Richard Zhu'; 'Kishon Vijay Abraham I'; linux- > > pci@vger.kernel.org; 'Tim Harvey'; 'Jingoo Han' > > Subject: Re: [Query/Discussion]: IO translation with designware PCIe > > controller > > > > On Tuesday, December 10, 2013 1:34 PM, Pratyush Anand wrote: > > > On Tue, Dec 10, 2013 at 12:09:37AM +0800, Arnd Bergmann wrote: > > > > 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. > > > > > > Yes, now outbound viewport for IO translation will get correct input > > > address. > > > > > > > > > > > > @@ -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. > > > > > > OK. > > > > > > @ Jingoo, Mohit > > - Now its working properly for SPEAr1310 tested with directly connected EP(xhc cards) as well as EP > Connected through switch(Lecroy PTC in AIC mode). Without this patch my EP devices were not working when > connected through Switch. > Can you also check if this patch resolves your issue, and you are able to work with switch without commenting dw_pcie_prog_viewport_io_outbound. Regards Pratyush > Thanks > Mohit > > > > > > > > Is it possible for you to test following patch. > > > > Hi Pratyush Anand, > > > > This patch works properly on Exynos platform with two different NICs. Also, I > > am tracing this discussion. > > Thank you for sending your patch. > > > > Best regards, > > Jingoo Han > > > > > > > > diff --git a/drivers/pci/host/pcie-designware.c > > > b/drivers/pci/host/pcie-designware.c > > > index be6ce30..b83f5e8 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(global_io_offset, pp->io_base); > > > global_io_offset += SZ_64K; > > > pci_add_resource_offset(&sys->resources, &pp->io, > > > sys->io_offset); > > -- 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..b83f5e8 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(global_io_offset, pp->io_base); global_io_offset += SZ_64K; pci_add_resource_offset(&sys->resources, &pp->io, sys->io_offset);