]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: ethernet: ti: cpsw: optimize end of poll cycle
authorIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Tue, 29 Nov 2016 15:00:50 +0000 (17:00 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Nov 2016 19:37:14 +0000 (14:37 -0500)
Check budget fullness only after it's updated and update
channel mask only once to keep budget balance between channels.
It's also needed for farther changes.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpsw.c

index 27379fa3d1b1ae01cd3233c215ff034eaefaa9cb..5ea2e3dba21a86c1d87c1925a5d68a9c407a412b 100644 (file)
@@ -788,19 +788,13 @@ static int cpsw_tx_poll(struct napi_struct *napi_tx, int budget)
 
        /* process every unprocessed channel */
        ch_map = cpdma_ctrl_txchs_state(cpsw->dma);
-       for (ch = 0, num_tx = 0; num_tx < budget; ch_map >>= 1, ch++) {
-               if (!ch_map) {
-                       ch_map = cpdma_ctrl_txchs_state(cpsw->dma);
-                       if (!ch_map)
-                               break;
-
-                       ch = 0;
-               }
-
+       for (ch = 0, num_tx = 0; ch_map; ch_map >>= 1, ch++) {
                if (!(ch_map & 0x01))
                        continue;
 
                num_tx += cpdma_chan_process(cpsw->txch[ch], budget - num_tx);
+               if (num_tx >= budget)
+                       break;
        }
 
        if (num_tx < budget) {
@@ -823,19 +817,13 @@ static int cpsw_rx_poll(struct napi_struct *napi_rx, int budget)
 
        /* process every unprocessed channel */
        ch_map = cpdma_ctrl_rxchs_state(cpsw->dma);
-       for (ch = 0, num_rx = 0; num_rx < budget; ch_map >>= 1, ch++) {
-               if (!ch_map) {
-                       ch_map = cpdma_ctrl_rxchs_state(cpsw->dma);
-                       if (!ch_map)
-                               break;
-
-                       ch = 0;
-               }
-
+       for (ch = 0, num_rx = 0; ch_map; ch_map >>= 1, ch++) {
                if (!(ch_map & 0x01))
                        continue;
 
                num_rx += cpdma_chan_process(cpsw->rxch[ch], budget - num_rx);
+               if (num_rx >= budget)
+                       break;
        }
 
        if (num_rx < budget) {