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

Commit 0e4c9f13 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-concurrency' 



Jakub Kicinski says:

====================
nfp: allow concurrency in core and minor fixes

The first 10 patches of this series prepare nfpcore for concurrent
accesses.  This will be needed by upcoming hwmon and devlink patches.
Most locking is already in place, the patches in this series iron out
a few bugs.

Last 5 patches are fixes and cleanups to the netdev code, including
removal of doorbell pointers used only on old versions of the chip,
removal of unnecessarily defensive code and flushing xmit_more more
carefully on error paths.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 31c7ba9e ac0488ef

drivers/net/ethernet/netronome/nfp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ nfp-objs := \ 
	    nfpcore/nfp_cpplib.o \

	    nfpcore/nfp_hwinfo.o \

	    nfpcore/nfp_mip.o \

	    nfpcore/nfp_mutex.o \

	    nfpcore/nfp_nffw.o \

	    nfpcore/nfp_nsp.o \

	    nfpcore/nfp_nsp_eth.o \

drivers/net/ethernet/netronome/nfp/nfp_net.h

+2 −6
Original line number Diff line number Diff line
@@ -307,9 +307,7 @@ struct nfp_net_rx_buf { 
 * @rd_p:       FL/RX ring read pointer (free running)

 * @idx:        Ring index from Linux's perspective

 * @fl_qcidx:   Queue Controller Peripheral (QCP) queue index for the freelist

 * @rx_qcidx:   Queue Controller Peripheral (QCP) queue index for the RX queue

 * @qcp_fl:     Pointer to base of the QCP freelist queue

 * @qcp_rx:     Pointer to base of the QCP RX queue

 * @wr_ptr_add: Accumulated number of buffers to add to QCP write pointer

 *              (used for free list batching)

 * @rxbufs:     Array of transmitted FL/RX buffers
@@ -324,13 +322,11 @@ struct nfp_net_rx_ring { 
	u32 wr_p;

	u32 rd_p;



	u16 idx;

	u16 wr_ptr_add;

	u32 idx;

	u32 wr_ptr_add;



	int fl_qcidx;

	int rx_qcidx;

	u8 __iomem *qcp_fl;

	u8 __iomem *qcp_rx;



	struct nfp_net_rx_buf *rxbufs;

	struct nfp_net_rx_desc *rxds;

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+16 −34
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ nfp_net_irqs_assign(struct nfp_net *nn, struct msix_entry *irq_entries, 


	if (dp->num_rx_rings > dp->num_r_vecs ||

	    dp->num_tx_rings > dp->num_r_vecs)

		nn_warn(nn, "More rings (%d,%d) than vectors (%d).\n",

		dev_warn(nn->dp.dev, "More rings (%d,%d) than vectors (%d).\n",

			 dp->num_rx_rings, dp->num_tx_rings,

			 dp->num_r_vecs);
@@ -479,10 +479,7 @@ nfp_net_rx_ring_init(struct nfp_net_rx_ring *rx_ring, 
	rx_ring->r_vec = r_vec;



	rx_ring->fl_qcidx = rx_ring->idx * nn->stride_rx;

	rx_ring->rx_qcidx = rx_ring->fl_qcidx + (nn->stride_rx - 1);



	rx_ring->qcp_fl = nn->rx_bar + NFP_QCP_QUEUE_OFF(rx_ring->fl_qcidx);

	rx_ring->qcp_rx = nn->rx_bar + NFP_QCP_QUEUE_OFF(rx_ring->rx_qcidx);

}



/**
@@ -762,6 +759,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
		nn_dp_warn(dp, "TX ring %d busy. wrp=%u rdp=%u\n",

			   qidx, tx_ring->wr_p, tx_ring->rd_p);

		netif_tx_stop_queue(nd_q);

		nfp_net_tx_xmit_more_flush(tx_ring);

		u64_stats_update_begin(&r_vec->tx_sync);

		r_vec->tx_busy++;

		u64_stats_update_end(&r_vec->tx_sync);
@@ -870,6 +868,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
	tx_ring->txbufs[wr_idx].fidx = -2;

err_free:

	nn_dp_warn(dp, "Failed to map DMA TX buffer\n");

	nfp_net_tx_xmit_more_flush(tx_ring);

	u64_stats_update_begin(&r_vec->tx_sync);

	r_vec->tx_errors++;

	u64_stats_update_end(&r_vec->tx_sync);
@@ -2128,7 +2127,11 @@ nfp_net_tx_ring_hw_cfg_write(struct nfp_net *nn, 
	nn_writeb(nn, NFP_NET_CFG_TXR_VEC(idx), tx_ring->r_vec->irq_entry);

}



static int __nfp_net_set_config_and_enable(struct nfp_net *nn)

/**

 * nfp_net_set_config_and_enable() - Write control BAR and enable NFP

 * @nn:      NFP Net device to reconfigure

 */

static int nfp_net_set_config_and_enable(struct nfp_net *nn)

{

	u32 new_ctrl, update = 0;

	unsigned int r;
@@ -2177,6 +2180,10 @@ static int __nfp_net_set_config_and_enable(struct nfp_net *nn) 


	nn_writel(nn, NFP_NET_CFG_CTRL, new_ctrl);

	err = nfp_net_reconfig(nn, update);

	if (err) {

		nfp_net_clear_config_and_disable(nn);

		return err;

	}



	nn->dp.ctrl = new_ctrl;
@@ -2192,22 +2199,7 @@ static int __nfp_net_set_config_and_enable(struct nfp_net *nn) 
		udp_tunnel_get_rx_info(nn->dp.netdev);

	}



	return err;

}



/**

 * nfp_net_set_config_and_enable() - Write control BAR and enable NFP

 * @nn:      NFP Net device to reconfigure

 */

static int nfp_net_set_config_and_enable(struct nfp_net *nn)

{

	int err;



	err = __nfp_net_set_config_and_enable(nn);

	if (err)

		nfp_net_clear_config_and_disable(nn);



	return err;

	return 0;

}



/**
@@ -2234,11 +2226,6 @@ static int nfp_net_netdev_open(struct net_device *netdev) 
	struct nfp_net *nn = netdev_priv(netdev);

	int err, r;



	if (nn->dp.ctrl & NFP_NET_CFG_CTRL_ENABLE) {

		nn_err(nn, "Dev is already enabled: 0x%08x\n", nn->dp.ctrl);

		return -EBUSY;

	}



	/* Step 1: Allocate resources for rings and the like

	 * - Request interrupts

	 * - Allocate RX and TX ring resources
@@ -2369,11 +2356,6 @@ static int nfp_net_netdev_close(struct net_device *netdev) 
{

	struct nfp_net *nn = netdev_priv(netdev);



	if (!(nn->dp.ctrl & NFP_NET_CFG_CTRL_ENABLE)) {

		nn_err(nn, "Dev is not up: 0x%08x\n", nn->dp.ctrl);

		return 0;

	}



	/* Step 1: Disable RX and TX rings from the Linux kernel perspective

	 */

	nfp_net_close_stack(nn);
@@ -2458,7 +2440,7 @@ static int nfp_net_dp_swap_enable(struct nfp_net *nn, struct nfp_net_dp *dp) 
			return err;

	}



	return __nfp_net_set_config_and_enable(nn);

	return nfp_net_set_config_and_enable(nn);

}



struct nfp_net_dp *nfp_net_clone_dp(struct nfp_net *nn)

drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c

+4 −11
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ static struct dentry *nfp_dir; 


static int nfp_net_debugfs_rx_q_read(struct seq_file *file, void *data)

{

	int fl_rd_p, fl_wr_p, rx_rd_p, rx_wr_p, rxd_cnt;

	struct nfp_net_r_vector *r_vec = file->private;

	struct nfp_net_rx_ring *rx_ring;

	int fl_rd_p, fl_wr_p, rxd_cnt;

	struct nfp_net_rx_desc *rxd;

	struct nfp_net *nn;

	void *frag;
@@ -61,14 +61,11 @@ static int nfp_net_debugfs_rx_q_read(struct seq_file *file, void *data) 


	fl_rd_p = nfp_qcp_rd_ptr_read(rx_ring->qcp_fl);

	fl_wr_p = nfp_qcp_wr_ptr_read(rx_ring->qcp_fl);

	rx_rd_p = nfp_qcp_rd_ptr_read(rx_ring->qcp_rx);

	rx_wr_p = nfp_qcp_wr_ptr_read(rx_ring->qcp_rx);



	seq_printf(file, "RX[%02d,%02d,%02d]: cnt=%d dma=%pad host=%p   H_RD=%d H_WR=%d FL_RD=%d FL_WR=%d RX_RD=%d RX_WR=%d\n",

		   rx_ring->idx, rx_ring->fl_qcidx, rx_ring->rx_qcidx,

	seq_printf(file, "RX[%02d,%02d]: cnt=%d dma=%pad host=%p   H_RD=%d H_WR=%d FL_RD=%d FL_WR=%d\n",

		   rx_ring->idx, rx_ring->fl_qcidx,

		   rx_ring->cnt, &rx_ring->dma, rx_ring->rxds,

		   rx_ring->rd_p, rx_ring->wr_p,

		   fl_rd_p, fl_wr_p, rx_rd_p, rx_wr_p);

		   rx_ring->rd_p, rx_ring->wr_p, fl_rd_p, fl_wr_p);



	for (i = 0; i < rxd_cnt; i++) {

		rxd = &rx_ring->rxds[i];
@@ -91,10 +88,6 @@ static int nfp_net_debugfs_rx_q_read(struct seq_file *file, void *data) 
			seq_puts(file, " FL_RD");

		if (i == fl_wr_p % rxd_cnt)

			seq_puts(file, " FL_WR");

		if (i == rx_rd_p % rxd_cnt)

			seq_puts(file, " RX_RD");

		if (i == rx_wr_p % rxd_cnt)

			seq_puts(file, " RX_WR");



		seq_putc(file, '\n');

	}

drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h

+1 −8
Original line number Diff line number Diff line
@@ -66,14 +66,7 @@ int nfp_nsp_write_eth_table(struct nfp_nsp *state, 


/* Implemented in nfp_resource.c */



#define NFP_RESOURCE_TBL_TARGET		NFP_CPP_TARGET_MU

#define NFP_RESOURCE_TBL_BASE		0x8100000000ULL



/* NFP Resource Table self-identifier */

#define NFP_RESOURCE_TBL_NAME		"nfp.res"

#define NFP_RESOURCE_TBL_KEY		0x00000000 /* Special key for entry 0 */



/* All other keys are CRC32-POSIX of the 8-byte identification string */

/* All keys are CRC32-POSIX of the 8-byte identification string */



/* ARM/PCI vNIC Interfaces 0..3 */

#define NFP_RESOURCE_VNIC_PCI_0		"vnic.p0"