| Message ID | 1485241525-201782-4-git-send-email-yuanzhichang@hisilicon.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Jan 24, 2017 at 03:05:23PM +0800, zhichang.yuan wrote: > There are some special ISA/LPC devices that work on a specific I/O range where > it is not correct to specify a 'ranges' property in DTS parent node as cpu > addresses translated from DTS node are only for memory space on some > architectures, such as Arm64. Without the parent 'ranges' property, current > of_translate_address() return an error. > Here we add special handlings for this case. > During the OF address translation, some checkings will be perfromed to > identify whether the device node is registered as indirect-IO. If yes, the I/O > translation will be done in a different way from that one of PCI MMIO. > In this way, the I/O 'reg' property of the special ISA/LPC devices will be > parsed correctly. > > Signed-off-by: zhichang.yuan <yuanzhichang@hisilicon.com> > Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Shouldn't this be Reviewed-by? Otherwise, looks fine to me. Acked-by: Rob Herring <robh@kernel.org> > --- > drivers/of/address.c | 87 ++++++++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 71 insertions(+), 16 deletions(-) > -- 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 27/01/2017 22:03, Rob Herring wrote: > On Tue, Jan 24, 2017 at 03:05:23PM +0800, zhichang.yuan wrote: >> There are some special ISA/LPC devices that work on a specific I/O range where >> it is not correct to specify a 'ranges' property in DTS parent node as cpu >> addresses translated from DTS node are only for memory space on some >> architectures, such as Arm64. Without the parent 'ranges' property, current >> of_translate_address() return an error. >> Here we add special handlings for this case. >> During the OF address translation, some checkings will be perfromed to >> identify whether the device node is registered as indirect-IO. If yes, the I/O >> translation will be done in a different way from that one of PCI MMIO. >> In this way, the I/O 'reg' property of the special ISA/LPC devices will be >> parsed correctly. >> >> Signed-off-by: zhichang.yuan <yuanzhichang@hisilicon.com> >> Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Shouldn't this be Reviewed-by? > The background is that Zhichang is following a sketch of a re-worked driver from Arnd, which Arnd gave Signed-off-by. But this patch does not follow it verbatim. I think this patchset should be resent without Arnd's signature. Or Arnd may kindly review and say it's ok. John > Otherwise, looks fine to me. > > Acked-by: Rob Herring <robh@kernel.org> > >> --- >> drivers/of/address.c | 87 ++++++++++++++++++++++++++++++++++++++++++---------- >> 1 file changed, 71 insertions(+), 16 deletions(-) >> > > . > -- 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 Mon, Jan 30, 2017 at 9:57 AM, John Garry <john.garry@huawei.com> wrote: > On 27/01/2017 22:03, Rob Herring wrote: >> On Tue, Jan 24, 2017 at 03:05:23PM +0800, zhichang.yuan wrote: >>> Signed-off-by: zhichang.yuan <yuanzhichang@hisilicon.com> >>> Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> >>> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> >> >> Shouldn't this be Reviewed-by? >> > > The background is that Zhichang is following a sketch of a re-worked driver > from Arnd, which Arnd gave Signed-off-by. But this patch does not follow it > verbatim. > > I think this patchset should be resent without Arnd's signature. Or Arnd may > kindly review and say it's ok. My general recommendation is that whenever authorship is not 100% obvious, then the changelog comment should explain in free form who did what. When you do that, please leave my Signed-off-by intact and put it on top. You can also (in addition to explaining it in the text) add an explanantion behind the address, such as Signed-off-by: Arnd Bergmann <arnd@arndb.de> # earlier draft I'll try to get around to do a full review of the series later today. 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
diff --git a/drivers/of/address.c b/drivers/of/address.c index d85d228..6a424ec 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -545,9 +545,14 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, * that translation is impossible (that is we are not dealing with a value * that can be mapped to a cpu physical address). This is not really specified * that way, but this is traditionally the way IBM at least do things + * + * Whenever the translation fails, the *host pointer will be set to the + * device that lacks a tranlation, and the return code is relative to + * that node. */ static u64 __of_translate_address(struct device_node *dev, - const __be32 *in_addr, const char *rprop) + const __be32 *in_addr, const char *rprop, + struct device_node **host) { struct device_node *parent = NULL; struct of_bus *bus, *pbus; @@ -560,6 +565,7 @@ static u64 __of_translate_address(struct device_node *dev, /* Increase refcount at current level */ of_node_get(dev); + *host = NULL; /* Get parent & match bus type */ parent = of_get_parent(dev); if (parent == NULL) @@ -592,6 +598,18 @@ static u64 __of_translate_address(struct device_node *dev, break; } + /* + * For indirectIO device which has no ranges property, get + * the address from reg directly. + */ + if (extio_find_node(&dev->fwnode)) { + result = of_read_number(addr + 1, na - 1); + pr_debug("indirectIO matched(%s) 0x%llx\n", + of_node_full_name(dev), result); + *host = of_node_get(dev); + break; + } + /* Get new parent bus and counts */ pbus = of_match_bus(parent); pbus->count_cells(dev, &pna, &pns); @@ -624,13 +642,32 @@ static u64 __of_translate_address(struct device_node *dev, u64 of_translate_address(struct device_node *dev, const __be32 *in_addr) { - return __of_translate_address(dev, in_addr, "ranges"); + struct device_node *host; + u64 ret; + + ret = __of_translate_address(dev, in_addr, "ranges", &host); + if (host) { + of_node_put(host); + return OF_BAD_ADDR; + } + + return ret; } EXPORT_SYMBOL(of_translate_address); u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr) { - return __of_translate_address(dev, in_addr, "dma-ranges"); + struct device_node *host; + u64 ret; + + ret = __of_translate_address(dev, in_addr, "dma-ranges", &host); + + if (host) { + of_node_put(host); + return OF_BAD_ADDR; + } + + return ret; } EXPORT_SYMBOL(of_translate_dma_address); @@ -672,29 +709,47 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, } EXPORT_SYMBOL(of_get_address); +static u64 of_translate_ioport(struct device_node *dev, const __be32 *in_addr) +{ + u64 taddr; + unsigned long port; + struct device_node *host; + + taddr = __of_translate_address(dev, in_addr, "ranges", &host); + if (host) { + /* host specific port access */ + port = extio_translate(&host->fwnode, taddr); + of_node_put(host); + } else { + /* memory mapped I/O range */ + port = pci_address_to_pio(taddr); + } + + if (port == (unsigned long)-1) + return OF_BAD_ADDR; + + return port; +} + static int __of_address_to_resource(struct device_node *dev, const __be32 *addrp, u64 size, unsigned int flags, const char *name, struct resource *r) { u64 taddr; - if ((flags & (IORESOURCE_IO | IORESOURCE_MEM)) == 0) + if (flags & IORESOURCE_MEM) + taddr = of_translate_address(dev, addrp); + else if (flags & IORESOURCE_IO) + taddr = of_translate_ioport(dev, addrp); + else return -EINVAL; - taddr = of_translate_address(dev, addrp); + if (taddr == OF_BAD_ADDR) return -EINVAL; memset(r, 0, sizeof(struct resource)); - if (flags & IORESOURCE_IO) { - unsigned long port; - port = pci_address_to_pio(taddr); - if (port == (unsigned long)-1) - return -EINVAL; - r->start = port; - r->end = port + size - 1; - } else { - r->start = taddr; - r->end = taddr + size - 1; - } + + r->start = taddr; + r->end = taddr + size - 1; r->flags = flags; r->name = name ? name : dev->full_name;