Commit ee2a3bde authored by Robert-Ionut Alexa's avatar Robert-Ionut Alexa Committed by David S. Miller
Browse files

net: dpaa2-eth: create and export the dpaa2_eth_receive_skb() function 



Carve out code from the dpaa2_eth_rx() function in order to create and
export the dpaa2_eth_receive_skb() function. Do this in order to reuse
this code also from the XSK path which will be introduced in a later
patch.

Signed-off-by: default avatarRobert-Ionut Alexa <robert-ionut.alexa@nxp.com>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 129902a3

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+47 −37
Original line number Diff line number Diff line
@@ -523,8 +523,50 @@ static struct sk_buff *dpaa2_eth_copybreak(struct dpaa2_eth_channel *ch, 
	return dpaa2_eth_alloc_skb(priv, ch, fd, fd_length, fd_vaddr);

}



void dpaa2_eth_receive_skb(struct dpaa2_eth_priv *priv,

			   struct dpaa2_eth_channel *ch,

			   const struct dpaa2_fd *fd, void *vaddr,

			   struct dpaa2_eth_fq *fq,

			   struct rtnl_link_stats64 *percpu_stats,

			   struct sk_buff *skb)

{

	struct dpaa2_fas *fas;

	u32 status = 0;



	fas = dpaa2_get_fas(vaddr, false);

	prefetch(fas);

	prefetch(skb->data);



	/* Get the timestamp value */

	if (priv->rx_tstamp) {

		struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);

		__le64 *ts = dpaa2_get_ts(vaddr, false);

		u64 ns;



		memset(shhwtstamps, 0, sizeof(*shhwtstamps));



		ns = DPAA2_PTP_CLK_PERIOD_NS * le64_to_cpup(ts);

		shhwtstamps->hwtstamp = ns_to_ktime(ns);

	}



	/* Check if we need to validate the L4 csum */

	if (likely(dpaa2_fd_get_frc(fd) & DPAA2_FD_FRC_FASV)) {

		status = le32_to_cpu(fas->status);

		dpaa2_eth_validate_rx_csum(priv, status, skb);

	}



	skb->protocol = eth_type_trans(skb, priv->net_dev);

	skb_record_rx_queue(skb, fq->flowid);



	percpu_stats->rx_packets++;

	percpu_stats->rx_bytes += dpaa2_fd_get_len(fd);

	ch->stats.bytes_per_cdan += dpaa2_fd_get_len(fd);



	list_add_tail(&skb->list, ch->rx_list);

}



/* Main Rx frame processing routine */

static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,

void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,

		  struct dpaa2_eth_channel *ch,

		  const struct dpaa2_fd *fd,

		  struct dpaa2_eth_fq *fq)
@@ -536,9 +578,7 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, 
	struct rtnl_link_stats64 *percpu_stats;

	struct dpaa2_eth_drv_stats *percpu_extras;

	struct device *dev = priv->net_dev->dev.parent;

	struct dpaa2_fas *fas;

	void *buf_data;

	u32 status = 0;

	u32 xdp_act;



	/* Tracing point */
@@ -548,8 +588,6 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, 
	dma_sync_single_for_cpu(dev, addr, priv->rx_buf_size,

				DMA_BIDIRECTIONAL);



	fas = dpaa2_get_fas(vaddr, false);

	prefetch(fas);

	buf_data = vaddr + dpaa2_fd_get_offset(fd);

	prefetch(buf_data);
@@ -587,35 +625,7 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, 
	if (unlikely(!skb))

		goto err_build_skb;



	prefetch(skb->data);



	/* Get the timestamp value */

	if (priv->rx_tstamp) {

		struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);

		__le64 *ts = dpaa2_get_ts(vaddr, false);

		u64 ns;



		memset(shhwtstamps, 0, sizeof(*shhwtstamps));



		ns = DPAA2_PTP_CLK_PERIOD_NS * le64_to_cpup(ts);

		shhwtstamps->hwtstamp = ns_to_ktime(ns);

	}



	/* Check if we need to validate the L4 csum */

	if (likely(dpaa2_fd_get_frc(fd) & DPAA2_FD_FRC_FASV)) {

		status = le32_to_cpu(fas->status);

		dpaa2_eth_validate_rx_csum(priv, status, skb);

	}



	skb->protocol = eth_type_trans(skb, priv->net_dev);

	skb_record_rx_queue(skb, fq->flowid);



	percpu_stats->rx_packets++;

	percpu_stats->rx_bytes += dpaa2_fd_get_len(fd);

	ch->stats.bytes_per_cdan += dpaa2_fd_get_len(fd);



	list_add_tail(&skb->list, ch->rx_list);



	dpaa2_eth_receive_skb(priv, ch, fd, vaddr, fq, percpu_stats, skb);

	return;



err_build_skb:

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h

+12 −0
Original line number Diff line number Diff line
@@ -796,4 +796,16 @@ struct sk_buff *dpaa2_eth_alloc_skb(struct dpaa2_eth_priv *priv, 
				    struct dpaa2_eth_channel *ch,

				    const struct dpaa2_fd *fd, u32 fd_length,

				    void *fd_vaddr);



void dpaa2_eth_receive_skb(struct dpaa2_eth_priv *priv,

			   struct dpaa2_eth_channel *ch,

			   const struct dpaa2_fd *fd, void *vaddr,

			   struct dpaa2_eth_fq *fq,

			   struct rtnl_link_stats64 *percpu_stats,

			   struct sk_buff *skb);



void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,

		  struct dpaa2_eth_channel *ch,

		  const struct dpaa2_fd *fd,

		  struct dpaa2_eth_fq *fq);

#endif	/* __DPAA2_H */