* [PATCH] net: ethernet: ti: cpsw: extend limits for cpsw_get/set_ringparam
@ 2017-01-08 20:12 Ivan Khoronzhuk
2017-01-09 19:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ivan Khoronzhuk @ 2017-01-08 20:12 UTC (permalink / raw)
To: netdev, mugunthanvnm
Cc: linux-omap, grygorii.strashko, linux-kernel, Ivan Khoronzhuk
Allow to set number of descs close to possible values. In case of
minimum limit it's equal to number of channels to be able to set
at least one desc per channel. For maximum limit leave enough descs
number for tx channels.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
---
Based on net-next/master
drivers/net/ethernet/ti/cpsw.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 458298d..09e0ed6 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2474,8 +2474,7 @@ static void cpsw_get_ringparam(struct net_device *ndev,
/* not supported */
ering->tx_max_pending = 0;
ering->tx_pending = cpdma_get_num_tx_descs(cpsw->dma);
- /* Max 90% RX buffers */
- ering->rx_max_pending = (descs_pool_size * 9) / 10;
+ ering->rx_max_pending = descs_pool_size - CPSW_MAX_QUEUES;
ering->rx_pending = cpdma_get_num_rx_descs(cpsw->dma);
}
@@ -2490,8 +2489,8 @@ static int cpsw_set_ringparam(struct net_device *ndev,
/* ignore ering->tx_pending - only rx_pending adjustment is supported */
if (ering->rx_mini_pending || ering->rx_jumbo_pending ||
- ering->rx_pending < (descs_pool_size / 10) ||
- ering->rx_pending > ((descs_pool_size * 9) / 10))
+ ering->rx_pending < CPSW_MAX_QUEUES ||
+ ering->rx_pending > (descs_pool_size - CPSW_MAX_QUEUES))
return -EINVAL;
if (ering->rx_pending == cpdma_get_num_rx_descs(cpsw->dma))
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: ethernet: ti: cpsw: extend limits for cpsw_get/set_ringparam
2017-01-08 20:12 [PATCH] net: ethernet: ti: cpsw: extend limits for cpsw_get/set_ringparam Ivan Khoronzhuk
@ 2017-01-09 19:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-01-09 19:29 UTC (permalink / raw)
To: ivan.khoronzhuk
Cc: netdev, mugunthanvnm, linux-omap, grygorii.strashko, linux-kernel
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Date: Sun, 8 Jan 2017 22:12:27 +0200
> Allow to set number of descs close to possible values. In case of
> minimum limit it's equal to number of channels to be able to set
> at least one desc per channel. For maximum limit leave enough descs
> number for tx channels.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-09 19:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-08 20:12 [PATCH] net: ethernet: ti: cpsw: extend limits for cpsw_get/set_ringparam Ivan Khoronzhuk
2017-01-09 19:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).