Re: [PATCH] net: ethernet: ti: fix netdev_queue compiling error

[chenjiahao (C)]

Hi,

Thanks for the review. But still I have a little question in the helper
you just mentioned:

static inline int qdisc_avail_bulklimit(const struct netdev_queue *txq)
{
#ifdef CONFIG_BQL
	/* Non-BQL migrated drivers will return 0, too. */
	return dql_avail(&txq->dql);
#else
	return 0;
#endif
}

In the snippet above, if CONFIG_BQL is not set, 0 will be simply 
returned and get printed. Should we distinguish this case, or just let 
it be?

Sincerely,
Jiahao Chen

在 2021/6/18 18:40, Grygorii Strashko 写道:
> On 17/06/2021 14:28, Chen Jiahao wrote:
> > There is a compiling error in am65-cpsw-nuss.c while not selecting
> > CONFIG_BQL:
> >
> > drivers/net/ethernet/ti/am65-cpsw-nuss.c: In function
> > ‘am65_cpsw_nuss_ndo_host_tx_timeout’:
> > drivers/net/ethernet/ti/am65-cpsw-nuss.c:353:26: error:
> > ‘struct netdev_queue’ has no member named ‘dql’
> >    353 |      dql_avail(&netif_txq->dql),
> >        |                          ^~
> >
> > This problem is solved by adding the #ifdef CONFIG_BQL directive
> > where struct dql is used.
> >
> > Fixes: 93a76530316a ("net: ethernet: ti: introduce am65x/j721e gigabit 
> > eth subsystem driver")
> > Signed-off-by: Chen Jiahao <chenjiahao16@xxxxxxxxxx>
> > ---
> >   drivers/net/ethernet/ti/am65-cpsw-nuss.c | 8 ++++++++
> >   1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c 
> > b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> > index 6a67b026df0b..a0b30bb763ea 100644
> > --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> > +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> > @@ -346,12 +346,20 @@ static void 
> > am65_cpsw_nuss_ndo_host_tx_timeout(struct net_device *ndev,
> >       tx_chn = &common->tx_chns[txqueue];
> >       trans_start = netif_txq->trans_start;
> > +#ifdef CONFIG_BQL
> >       netdev_err(ndev, "txq:%d DRV_XOFF:%d tmo:%u dql_avail:%d 
> > free_desc:%zu\n",
> >              txqueue,
> >              netif_tx_queue_stopped(netif_txq),
> >              jiffies_to_msecs(jiffies - trans_start),
> >              dql_avail(&netif_txq->dql),
> >              k3_cppi_desc_pool_avail(tx_chn->desc_pool));
> > +#else
> > +    netdev_err(ndev, "txq:%d DRV_XOFF:%d tmo:%u free_desc:%zu\n",
> > +           txqueue,
> > +           netif_tx_queue_stopped(netif_txq),
> > +           jiffies_to_msecs(jiffies - trans_start),
> > +           k3_cppi_desc_pool_avail(tx_chn->desc_pool));
> > +#endif
> >       if (netif_tx_queue_stopped(netif_txq)) {
> >           /* try recover if stopped by us */
>
> Seems like there is right helper available - qdisc_avail_bulklimit().
>
> Any way, it most probably has to be solved in generic way on netdev/dql 
> level.