| Message ID | 20190611151930.15852-5-rfried.dev@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Joe Hershberger |
| Headers | show |
| Series | [U-Boot,1/6] net: macb: sync header definitions as taken from Linux | expand |
> -----Original Message----- > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Ramon Fried > Sent: Tuesday, June 11, 2019 8:49 PM > To: u-boot@lists.denx.de > Cc: Joe Hershberger <joe.hershberger@ni.com> > Subject: [U-Boot] [PATCH 5/6] net: macb: add dma_burst_length config > > GEM support higher DMA burst writes/reads than the default (4). > add configuration structure with dma burst length so it could be applied later > to DMA configuration. > > Signed-off-by: Ramon Fried <rfried.dev@gmail.com> > --- > > drivers/net/macb.c | 22 +++++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/macb.c b/drivers/net/macb.c index > ae8937bbb1..fb42172520 100644 > --- a/drivers/net/macb.c > +++ b/drivers/net/macb.c > @@ -82,6 +82,7 @@ struct macb_dma_desc { > > struct macb_device { > void *regs; > + unsigned int dma_burst_length; > > unsigned int rx_tail; > unsigned int tx_head; > @@ -118,6 +119,11 @@ struct macb_device { > phy_interface_t phy_interface; > #endif > }; > + > +struct macb_config { > + unsigned int dma_burst_length; > +}; > + > #ifndef CONFIG_DM_ETH > #define to_macb(_nd) container_of(_nd, struct macb_device, netdev) > #endif @@ -1133,8 +1139,13 @@ static int macb_enable_clk(struct udevice > *dev) } #endif > > +static const struct macb_config default_gem_config = { > + .dma_burst_length = 16, > +}; > + > static int macb_eth_probe(struct udevice *dev) { > + const struct macb_config *macb_config; > struct eth_pdata *pdata = dev_get_platdata(dev); > struct macb_device *macb = dev_get_priv(dev); > const char *phy_mode; > @@ -1151,6 +1162,11 @@ static int macb_eth_probe(struct udevice *dev) > > macb->regs = (void *)pdata->iobase; > > + macb_config = (struct macb_config *)dev_get_driver_data(dev); > + if (!macb_config) > + macb_config = &default_gem_config; > + > + macb->dma_burst_length = macb_config->dma_burst_length; > #ifdef CONFIG_CLK > ret = macb_enable_clk(dev); > if (ret) > @@ -1211,12 +1227,16 @@ static int macb_eth_ofdata_to_platdata(struct > udevice *dev) > return macb_late_eth_ofdata_to_platdata(dev); > } > > +static const struct macb_config sama5d4_config = { > + .dma_burst_length = 4, > +}; > + > static const struct udevice_id macb_eth_ids[] = { > { .compatible = "cdns,macb" }, > { .compatible = "cdns,at91sam9260-macb" }, > { .compatible = "atmel,sama5d2-gem" }, > { .compatible = "atmel,sama5d3-gem" }, > - { .compatible = "atmel,sama5d4-gem" }, > + { .compatible = "atmel,sama5d4-gem", .data = > (ulong)&sama5d4_config }, > { .compatible = "cdns,zynq-gem" }, > { } > }; > -- > 2.21.0 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot Reviewed-by: Anup Patel <anup.patel@wdc.com> Tested-by: Anup Patel <anup.patel@wdc.com> Regards, Anup
On Tue, Jun 11, 2019 at 10:39 AM Ramon Fried <rfried.dev@gmail.com> wrote: > > GEM support higher DMA burst writes/reads than the default (4). > add configuration structure with dma burst length so it could be > applied later to DMA configuration. > > Signed-off-by: Ramon Fried <rfried.dev@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index ae8937bbb1..fb42172520 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -82,6 +82,7 @@ struct macb_dma_desc { struct macb_device { void *regs; + unsigned int dma_burst_length; unsigned int rx_tail; unsigned int tx_head; @@ -118,6 +119,11 @@ struct macb_device { phy_interface_t phy_interface; #endif }; + +struct macb_config { + unsigned int dma_burst_length; +}; + #ifndef CONFIG_DM_ETH #define to_macb(_nd) container_of(_nd, struct macb_device, netdev) #endif @@ -1133,8 +1139,13 @@ static int macb_enable_clk(struct udevice *dev) } #endif +static const struct macb_config default_gem_config = { + .dma_burst_length = 16, +}; + static int macb_eth_probe(struct udevice *dev) { + const struct macb_config *macb_config; struct eth_pdata *pdata = dev_get_platdata(dev); struct macb_device *macb = dev_get_priv(dev); const char *phy_mode; @@ -1151,6 +1162,11 @@ static int macb_eth_probe(struct udevice *dev) macb->regs = (void *)pdata->iobase; + macb_config = (struct macb_config *)dev_get_driver_data(dev); + if (!macb_config) + macb_config = &default_gem_config; + + macb->dma_burst_length = macb_config->dma_burst_length; #ifdef CONFIG_CLK ret = macb_enable_clk(dev); if (ret) @@ -1211,12 +1227,16 @@ static int macb_eth_ofdata_to_platdata(struct udevice *dev) return macb_late_eth_ofdata_to_platdata(dev); } +static const struct macb_config sama5d4_config = { + .dma_burst_length = 4, +}; + static const struct udevice_id macb_eth_ids[] = { { .compatible = "cdns,macb" }, { .compatible = "cdns,at91sam9260-macb" }, { .compatible = "atmel,sama5d2-gem" }, { .compatible = "atmel,sama5d3-gem" }, - { .compatible = "atmel,sama5d4-gem" }, + { .compatible = "atmel,sama5d4-gem", .data = (ulong)&sama5d4_config }, { .compatible = "cdns,zynq-gem" }, { } };
GEM support higher DMA burst writes/reads than the default (4). add configuration structure with dma burst length so it could be applied later to DMA configuration. Signed-off-by: Ramon Fried <rfried.dev@gmail.com> --- drivers/net/macb.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)