Commit 5e8c5adf authored by Bailey Forrest's avatar Bailey Forrest Committed by David S. Miller
Browse files

gve: DQO: Add core netdev features 



Add napi netdev device registration, interrupt handling and initial tx
and rx polling stubs. The stubs will be filled in follow-on patches.

Also:
- LRO feature advertisement and handling
- Also update ethtool logic

Signed-off-by: default avatarBailey Forrest <bcf@google.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarCatherine Sullivan <csully@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f6228e4

drivers/net/ethernet/google/gve/Makefile

+1 −1
Original line number Diff line number Diff line 
# Makefile for the Google virtual Ethernet (gve) driver



obj-$(CONFIG_GVE) += gve.o

gve-objs := gve_main.o gve_tx.o gve_rx.o gve_ethtool.o gve_adminq.o gve_utils.o
 
gve-objs := gve_main.o gve_tx.o gve_tx_dqo.o gve_rx.o gve_rx_dqo.o gve_ethtool.o gve_adminq.o gve_utils.o

drivers/net/ethernet/google/gve/gve.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
/* PTYPEs are always 10 bits. */

#define GVE_NUM_PTYPES	1024



#define GVE_RX_BUFFER_SIZE_DQO 2048



/* Each slot in the desc ring has a 1:1 mapping to a slot in the data ring */

struct gve_rx_desc_queue {

	struct gve_rx_desc *desc_ring; /* the descriptor ring */

drivers/net/ethernet/google/gve/gve_adminq.c

+2 −0
Original line number Diff line number Diff line
@@ -714,6 +714,8 @@ int gve_adminq_describe_device(struct gve_priv *priv) 
	if (gve_is_gqi(priv)) {

		err = gve_set_desc_cnt(priv, descriptor);

	} else {

		/* DQO supports LRO. */

		priv->dev->hw_features |= NETIF_F_LRO;

		err = gve_set_desc_cnt_dqo(priv, descriptor, dev_op_dqo_rda);

	}

	if (err)

drivers/net/ethernet/google/gve/gve_dqo.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT)

 * Google virtual Ethernet (gve) driver

 *

 * Copyright (C) 2015-2021 Google, Inc.

 */



#ifndef _GVE_DQO_H_

#define _GVE_DQO_H_



#include "gve_adminq.h"



#define GVE_ITR_ENABLE_BIT_DQO BIT(0)

#define GVE_ITR_CLEAR_PBA_BIT_DQO BIT(1)

#define GVE_ITR_NO_UPDATE_DQO (3 << 3)



#define GVE_TX_IRQ_RATELIMIT_US_DQO 50

#define GVE_RX_IRQ_RATELIMIT_US_DQO 20



netdev_tx_t gve_tx_dqo(struct sk_buff *skb, struct net_device *dev);

bool gve_tx_poll_dqo(struct gve_notify_block *block, bool do_clean);

int gve_rx_poll_dqo(struct gve_notify_block *block, int budget);



static inline void

gve_write_irq_doorbell_dqo(const struct gve_priv *priv,

			   const struct gve_notify_block *block, u32 val)

{

	u32 index = be32_to_cpu(block->irq_db_index);



	iowrite32(val, &priv->db_bar2[index]);

}



#endif /* _GVE_DQO_H_ */

drivers/net/ethernet/google/gve/gve_ethtool.c

+10 −2
Original line number Diff line number Diff line
@@ -311,8 +311,16 @@ gve_get_ethtool_stats(struct net_device *netdev, 
		for (ring = 0; ring < priv->tx_cfg.num_queues; ring++) {

			struct gve_tx_ring *tx = &priv->tx[ring];



			if (gve_is_gqi(priv)) {

				data[i++] = tx->req;

				data[i++] = tx->done;

			} else {

				/* DQO doesn't currently support

				 * posted/completed descriptor counts;

				 */

				data[i++] = 0;

				data[i++] = 0;

			}

			do {

				start =

				  u64_stats_fetch_begin(&priv->tx[ring].statss);