Commit 15a22950 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ionic-updates-for-v6-11' 

Shannon Nelson says:

====================
ionic: updates for v6.11

These are a few minor fixes for the ionic driver to clean
up a some little things that have been waiting for attention.
These were originally sent for net, but now respun for net-next.

v1: https://lore.kernel.org/netdev/20240521013715.12098-1-shannon.nelson@amd.com/
====================

Link: https://lore.kernel.org/r/20240529000259.25775-1-shannon.nelson@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e3bbb994 a54e2a36

drivers/net/ethernet/pensando/ionic/ionic_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int netdev_show(struct seq_file *seq, void *v) 
{

	struct net_device *netdev = seq->private;



	seq_printf(seq, "%s\n", netdev->name);

	seq_printf(seq, "%s\n", netdev_name(netdev));



	return 0;

}

drivers/net/ethernet/pensando/ionic/ionic_if.h

+181 −56

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+4 −3
Original line number Diff line number Diff line
@@ -237,12 +237,12 @@ static int ionic_request_irq(struct ionic_lif *lif, struct ionic_qcq *qcq) 
	const char *name;



	if (lif->registered)

		name = lif->netdev->name;

		name = netdev_name(lif->netdev);

	else

		name = dev_name(dev);



	snprintf(intr->name, sizeof(intr->name),

		 "%s-%s-%s", IONIC_DRV_NAME, name, q->name);

		 "%.5s-%.16s-%.8s", IONIC_DRV_NAME, name, q->name);



	return devm_request_irq(dev, intr->vector, ionic_isr,

				0, intr->name, &qcq->napi);
@@ -3388,6 +3388,7 @@ static void ionic_lif_handle_fw_up(struct ionic_lif *lif) 
	 * just need to reanimate it.

	 */

	ionic_init_devinfo(ionic);

	ionic_reset(ionic);

	err = ionic_identify(ionic);

	if (err)

		goto err_out;
@@ -3731,7 +3732,7 @@ static void ionic_lif_set_netdev_info(struct ionic_lif *lif) 
		},

	};



	strscpy(ctx.cmd.lif_setattr.name, lif->netdev->name,

	strscpy(ctx.cmd.lif_setattr.name, netdev_name(lif->netdev),

		sizeof(ctx.cmd.lif_setattr.name));



	ionic_adminq_post_wait(lif, &ctx);

drivers/net/ethernet/pensando/ionic/ionic_txrx.c

+15 −17
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static bool ionic_run_xdp(struct ionic_rx_stats *stats, 
			 XDP_PACKET_HEADROOM, frag_len, false);



	dma_sync_single_range_for_cpu(rxq->dev, ionic_rx_buf_pa(buf_info),

				      XDP_PACKET_HEADROOM, len,

				      XDP_PACKET_HEADROOM, frag_len,

				      DMA_FROM_DEVICE);



	prefetchw(&xdp_buf.data_hard_start);
@@ -582,7 +582,7 @@ static bool ionic_run_xdp(struct ionic_rx_stats *stats, 
					   buf_info->page_offset,

					   true);

		__netif_tx_unlock(nq);

		if (err) {

		if (unlikely(err)) {

			netdev_dbg(netdev, "tx ionic_xdp_post_frame err %d\n", err);

			goto out_xdp_abort;

		}
@@ -597,7 +597,7 @@ static bool ionic_run_xdp(struct ionic_rx_stats *stats, 
			       IONIC_PAGE_SIZE, DMA_FROM_DEVICE);



		err = xdp_do_redirect(netdev, &xdp_buf, xdp_prog);

		if (err) {

		if (unlikely(err)) {

			netdev_dbg(netdev, "xdp_do_redirect err %d\n", err);

			goto out_xdp_abort;

		}
@@ -1058,7 +1058,7 @@ static dma_addr_t ionic_tx_map_single(struct ionic_queue *q, 
	dma_addr_t dma_addr;



	dma_addr = dma_map_single(dev, data, len, DMA_TO_DEVICE);

	if (dma_mapping_error(dev, dma_addr)) {

	if (unlikely(dma_mapping_error(dev, dma_addr))) {

		net_warn_ratelimited("%s: DMA single map failed on %s!\n",

				     dev_name(dev), q->name);

		q_to_tx_stats(q)->dma_map_err++;
@@ -1075,7 +1075,7 @@ static dma_addr_t ionic_tx_map_frag(struct ionic_queue *q, 
	dma_addr_t dma_addr;



	dma_addr = skb_frag_dma_map(dev, frag, offset, len, DMA_TO_DEVICE);

	if (dma_mapping_error(dev, dma_addr)) {

	if (unlikely(dma_mapping_error(dev, dma_addr))) {

		net_warn_ratelimited("%s: DMA frag map failed on %s!\n",

				     dev_name(dev), q->name);

		q_to_tx_stats(q)->dma_map_err++;
@@ -1316,7 +1316,7 @@ static int ionic_tx_tcp_inner_pseudo_csum(struct sk_buff *skb) 
	int err;



	err = skb_cow_head(skb, 0);

	if (err)

	if (unlikely(err))

		return err;



	if (skb->protocol == cpu_to_be16(ETH_P_IP)) {
@@ -1340,7 +1340,7 @@ static int ionic_tx_tcp_pseudo_csum(struct sk_buff *skb) 
	int err;



	err = skb_cow_head(skb, 0);

	if (err)

	if (unlikely(err))

		return err;



	if (skb->protocol == cpu_to_be16(ETH_P_IP)) {
@@ -1357,7 +1357,7 @@ static int ionic_tx_tcp_pseudo_csum(struct sk_buff *skb) 
}



static void ionic_tx_tso_post(struct net_device *netdev, struct ionic_queue *q,

			      struct ionic_tx_desc_info *desc_info,

			      struct ionic_txq_desc *desc,

			      struct sk_buff *skb,

			      dma_addr_t addr, u8 nsge, u16 len,

			      unsigned int hdrlen, unsigned int mss,
@@ -1365,7 +1365,6 @@ static void ionic_tx_tso_post(struct net_device *netdev, struct ionic_queue *q, 
			      u16 vlan_tci, bool has_vlan,

			      bool start, bool done)

{

	struct ionic_txq_desc *desc = &q->txq[q->head_idx];

	u8 flags = 0;

	u64 cmd;
@@ -1445,7 +1444,7 @@ static int ionic_tx_tso(struct net_device *netdev, struct ionic_queue *q, 
		err = ionic_tx_tcp_inner_pseudo_csum(skb);

	else

		err = ionic_tx_tcp_pseudo_csum(skb);

	if (err) {

	if (unlikely(err)) {

		/* clean up mapping from ionic_tx_map_skb */

		ionic_tx_desc_unmap_bufs(q, desc_info);

		return err;
@@ -1503,10 +1502,9 @@ static int ionic_tx_tso(struct net_device *netdev, struct ionic_queue *q, 
		seg_rem = min(tso_rem, mss);

		done = (tso_rem == 0);

		/* post descriptor */

		ionic_tx_tso_post(netdev, q, desc_info, skb,

				  desc_addr, desc_nsge, desc_len,

				  hdrlen, mss, outer_csum, vlan_tci, has_vlan,

				  start, done);

		ionic_tx_tso_post(netdev, q, desc, skb, desc_addr, desc_nsge,

				  desc_len, hdrlen, mss, outer_csum, vlan_tci,

				  has_vlan, start, done);

		start = false;

		/* Buffer information is stored with the first tso descriptor */

		desc_info = &q->tx_info[q->head_idx];
@@ -1731,7 +1729,7 @@ static int ionic_tx_descs_needed(struct ionic_queue *q, struct sk_buff *skb) 
linearize:

	if (too_many_frags) {

		err = skb_linearize(skb);

		if (err)

		if (unlikely(err))

			return err;

		q_to_tx_stats(q)->linearize++;

	}
@@ -1765,7 +1763,7 @@ static netdev_tx_t ionic_start_hwstamp_xmit(struct sk_buff *skb, 
	else

		err = ionic_tx(netdev, q, skb);



	if (err)

	if (unlikely(err))

		goto err_out_drop;



	return NETDEV_TX_OK;
@@ -1811,7 +1809,7 @@ netdev_tx_t ionic_start_xmit(struct sk_buff *skb, struct net_device *netdev) 
	else

		err = ionic_tx(netdev, q, skb);



	if (err)

	if (unlikely(err))

		goto err_out_drop;



	return NETDEV_TX_OK;