Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f89d21b9 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: extend limits for cpsw_get/set_ringparam 



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: default avatarIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58fa118f

drivers/net/ethernet/ti/cpsw.c

+3 −4
Original line number Diff line number Diff line
@@ -2493,8 +2493,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);

}
@@ -2509,8 +2508,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))