| Message ID | 20210302153451.19440-16-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | ppc: qemu: Add eTSEC support | expand |
On Tue, Mar 2, 2021 at 5:36 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > At present the tsec driver uses a non-standard DT bindings to get > its <reg> base / size. The upstream Linux kernel seems to require > the <reg> base / size to be put under a subnode of the eTSEC node > with a name prefix "queue-group". This is not documented in the > kernel DT bindings, but it looks every dtsi file that contains the > eTSEC node was written like this. > > This commit updates the tsec driver to handle this case. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > drivers/net/tsec.c | 26 ++++++++++++++++++++++++-- > 1 file changed, 24 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c > index 24f9962b82..5012cd29f1 100644 > --- a/drivers/net/tsec.c > +++ b/drivers/net/tsec.c > @@ -831,13 +831,35 @@ int tsec_probe(struct udevice *dev) > struct tsec_data *data; > const char *phy_mode; > fdt_addr_t reg; > - ofnode parent; > + ofnode parent, child; > int ret; > > data = (struct tsec_data *)dev_get_driver_data(dev); > > pdata->iobase = (phys_addr_t)dev_read_addr(dev); > - priv->regs = dev_remap_addr(dev); > + if (pdata->iobase != FDT_ADDR_T_NONE) { > + priv->regs = dev_remap_addr(dev); > + } else { > + ofnode_for_each_subnode(child, dev_ofnode(dev)) { > + if (!strncmp(ofnode_get_name(child), "queue-group", > + strlen("queue-group"))) { > + reg = ofnode_get_addr(child); > + if (reg == FDT_ADDR_T_NONE) { > + printf("No 'reg' property of <queue-group>\n"); > + return -ENOENT; > + } > + pdata->iobase = reg; > + priv->regs = map_physmem(pdata->iobase, 0, > + MAP_NOCACHE); > + break; > + } > + } > + > + if (!ofnode_valid(child)) { > + printf("No child node for <queue-group>?\n"); > + return -ENOENT; > + } > + } > > ret = dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0, > &phandle_args); > -- > 2.25.1 > Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 24f9962b82..5012cd29f1 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -831,13 +831,35 @@ int tsec_probe(struct udevice *dev) struct tsec_data *data; const char *phy_mode; fdt_addr_t reg; - ofnode parent; + ofnode parent, child; int ret; data = (struct tsec_data *)dev_get_driver_data(dev); pdata->iobase = (phys_addr_t)dev_read_addr(dev); - priv->regs = dev_remap_addr(dev); + if (pdata->iobase != FDT_ADDR_T_NONE) { + priv->regs = dev_remap_addr(dev); + } else { + ofnode_for_each_subnode(child, dev_ofnode(dev)) { + if (!strncmp(ofnode_get_name(child), "queue-group", + strlen("queue-group"))) { + reg = ofnode_get_addr(child); + if (reg == FDT_ADDR_T_NONE) { + printf("No 'reg' property of <queue-group>\n"); + return -ENOENT; + } + pdata->iobase = reg; + priv->regs = map_physmem(pdata->iobase, 0, + MAP_NOCACHE); + break; + } + } + + if (!ofnode_valid(child)) { + printf("No child node for <queue-group>?\n"); + return -ENOENT; + } + } ret = dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0, &phandle_args);
At present the tsec driver uses a non-standard DT bindings to get its <reg> base / size. The upstream Linux kernel seems to require the <reg> base / size to be put under a subnode of the eTSEC node with a name prefix "queue-group". This is not documented in the kernel DT bindings, but it looks every dtsi file that contains the eTSEC node was written like this. This commit updates the tsec driver to handle this case. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/net/tsec.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)