Skip to content

Commit

Permalink
ravb: Rename "nc_queue" feature bit
Browse files Browse the repository at this point in the history 
Rename the feature bit "nc_queue" with "nc_queues" as AVB DMAC has
RX and TX NC queues.

There is no functional change.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Suggested-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Biju Das authored and Jakub Kicinski committed Oct 13, 2021
1 parent 030634f commit 1091da5
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/renesas/ravb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ struct ravb_hw_info {
unsigned multi_irqs:1; /* AVB-DMAC and E-MAC has multiple irqs */
unsigned gptp:1; /* AVB-DMAC has gPTP support */
unsigned ccc_gac:1; /* AVB-DMAC has gPTP support active in config mode */
unsigned nc_queue:1; /* AVB-DMAC has NC queue */
unsigned nc_queues:1; /* AVB-DMAC has RX and TX NC queues */
unsigned magic_pkt:1; /* E-MAC supports magic packet detection */
unsigned half_duplex:1; /* E-MAC supports half duplex mode */
};
Expand Down
36 changes: 18 additions & 18 deletions drivers/net/ethernet/renesas/ravb_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id)
result = IRQ_HANDLED;

/* Network control and best effort queue RX/TX */
if (info->nc_queue) {
if (info->nc_queues) {
for (q = RAVB_NC; q >= RAVB_BE; q--) {
if (ravb_queue_interrupt(ndev, q))
result = IRQ_HANDLED;
Expand Down Expand Up @@ -1315,7 +1315,7 @@ static int ravb_poll(struct napi_struct *napi, int budget)

/* Receive error message handling */
priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors;
if (info->nc_queue)
if (info->nc_queues)
priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors;
if (priv->rx_over_errors != ndev->stats.rx_over_errors)
ndev->stats.rx_over_errors = priv->rx_over_errors;
Expand Down Expand Up @@ -1566,7 +1566,7 @@ static void ravb_get_ethtool_stats(struct net_device *ndev,
int i = 0;
int q;

num_rx_q = info->nc_queue ? NUM_RX_QUEUE : 1;
num_rx_q = info->nc_queues ? NUM_RX_QUEUE : 1;
/* Device-specific stats */
for (q = RAVB_BE; q < num_rx_q; q++) {
struct net_device_stats *stats = &priv->stats[q];
Expand Down Expand Up @@ -1643,7 +1643,7 @@ static int ravb_set_ringparam(struct net_device *ndev,

/* Free all the skb's in the RX queue and the DMA buffers. */
ravb_ring_free(ndev, RAVB_BE);
if (info->nc_queue)
if (info->nc_queues)
ravb_ring_free(ndev, RAVB_NC);
}

Expand Down Expand Up @@ -1763,7 +1763,7 @@ static int ravb_open(struct net_device *ndev)
int error;

napi_enable(&priv->napi[RAVB_BE]);
if (info->nc_queue)
if (info->nc_queues)
napi_enable(&priv->napi[RAVB_NC]);

if (!info->multi_irqs) {
Expand Down Expand Up @@ -1838,7 +1838,7 @@ static int ravb_open(struct net_device *ndev)
out_free_irq:
free_irq(ndev->irq, ndev);
out_napi_off:
if (info->nc_queue)
if (info->nc_queues)
napi_disable(&priv->napi[RAVB_NC]);
napi_disable(&priv->napi[RAVB_BE]);
return error;
Expand Down Expand Up @@ -1888,7 +1888,7 @@ static void ravb_tx_timeout_work(struct work_struct *work)
}

ravb_ring_free(ndev, RAVB_BE);
if (info->nc_queue)
if (info->nc_queues)
ravb_ring_free(ndev, RAVB_NC);

/* Device init */
Expand Down Expand Up @@ -2088,7 +2088,7 @@ static struct net_device_stats *ravb_get_stats(struct net_device *ndev)
nstats->rx_length_errors = stats0->rx_length_errors;
nstats->rx_missed_errors = stats0->rx_missed_errors;
nstats->rx_over_errors = stats0->rx_over_errors;
if (info->nc_queue) {
if (info->nc_queues) {
stats1 = &priv->stats[RAVB_NC];

nstats->rx_packets += stats1->rx_packets;
Expand Down Expand Up @@ -2169,13 +2169,13 @@ static int ravb_close(struct net_device *ndev)
}
free_irq(ndev->irq, ndev);

if (info->nc_queue)
if (info->nc_queues)
napi_disable(&priv->napi[RAVB_NC]);
napi_disable(&priv->napi[RAVB_BE]);

/* Free all the skb's in the RX queue and the DMA buffers. */
ravb_ring_free(ndev, RAVB_BE);
if (info->nc_queue)
if (info->nc_queues)
ravb_ring_free(ndev, RAVB_NC);

return 0;
Expand Down Expand Up @@ -2415,7 +2415,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
.tx_counters = 1,
.multi_irqs = 1,
.ccc_gac = 1,
.nc_queue = 1,
.nc_queues = 1,
.magic_pkt = 1,
};

Expand All @@ -2438,7 +2438,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
.rx_max_buf_size = SZ_2K,
.aligned_tx = 1,
.gptp = 1,
.nc_queue = 1,
.nc_queues = 1,
.magic_pkt = 1,
};

Expand Down Expand Up @@ -2618,7 +2618,7 @@ static int ravb_probe(struct platform_device *pdev)
priv->pdev = pdev;
priv->num_tx_ring[RAVB_BE] = BE_TX_RING_SIZE;
priv->num_rx_ring[RAVB_BE] = BE_RX_RING_SIZE;
if (info->nc_queue) {
if (info->nc_queues) {
priv->num_tx_ring[RAVB_NC] = NC_TX_RING_SIZE;
priv->num_rx_ring[RAVB_NC] = NC_RX_RING_SIZE;
}
Expand Down Expand Up @@ -2754,7 +2754,7 @@ static int ravb_probe(struct platform_device *pdev)
}

netif_napi_add(ndev, &priv->napi[RAVB_BE], ravb_poll, 64);
if (info->nc_queue)
if (info->nc_queues)
netif_napi_add(ndev, &priv->napi[RAVB_NC], ravb_poll, 64);

/* Network device register */
Expand All @@ -2773,7 +2773,7 @@ static int ravb_probe(struct platform_device *pdev)
return 0;

out_napi_del:
if (info->nc_queue)
if (info->nc_queues)
netif_napi_del(&priv->napi[RAVB_NC]);

netif_napi_del(&priv->napi[RAVB_BE]);
Expand Down Expand Up @@ -2814,7 +2814,7 @@ static int ravb_remove(struct platform_device *pdev)
ravb_write(ndev, CCC_OPC_RESET, CCC);
pm_runtime_put_sync(&pdev->dev);
unregister_netdev(ndev);
if (info->nc_queue)
if (info->nc_queues)
netif_napi_del(&priv->napi[RAVB_NC]);
netif_napi_del(&priv->napi[RAVB_BE]);
ravb_mdio_release(priv);
Expand All @@ -2838,7 +2838,7 @@ static int ravb_wol_setup(struct net_device *ndev)

/* Only allow ECI interrupts */
synchronize_irq(priv->emac_irq);
if (info->nc_queue)
if (info->nc_queues)
napi_disable(&priv->napi[RAVB_NC]);
napi_disable(&priv->napi[RAVB_BE]);
ravb_write(ndev, ECSIPR_MPDIP, ECSIPR);
Expand All @@ -2855,7 +2855,7 @@ static int ravb_wol_restore(struct net_device *ndev)
const struct ravb_hw_info *info = priv->info;
int ret;

if (info->nc_queue)
if (info->nc_queues)
napi_enable(&priv->napi[RAVB_NC]);
napi_enable(&priv->napi[RAVB_BE]);

Expand Down

0 comments on commit 1091da5

Please sign in to comment.