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

Commit 58ad0d02 authored by Horia Geantă's avatar Horia Geantă Committed by Li Yang
Browse files

staging: fsl-dpaa2: eth: move generic FD defines to DPIO 



Previous commits:
commit 6e2387e8 ("staging: fsl-dpaa2/eth: Add Freescale DPAA2
Ethernet driver")
commit 39163c0c ("staging: fsl-dpaa2/eth: Errors checking update")

have added bits that are not specific to the WRIOP accelerator.

Move these where they belong (in DPIO) such that other accelerators
can make use of them.

Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Acked-by: default avatarIoana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent 1c0b7df5

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, 
	dpaa2_fd_set_format(fd, dpaa2_fd_sg);

	dpaa2_fd_set_addr(fd, addr);

	dpaa2_fd_set_len(fd, skb->len);

	dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);

	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);



	if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)

		enable_tx_tstamp(fd, sgt_buf);
@@ -508,7 +508,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv, 
	dpaa2_fd_set_offset(fd, (u16)(skb->data - buffer_start));

	dpaa2_fd_set_len(fd, skb->len);

	dpaa2_fd_set_format(fd, dpaa2_fd_single);

	dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);

	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);



	if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)

		enable_tx_tstamp(fd, buffer_start);

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h

+5 −13
Original line number Diff line number Diff line
@@ -124,21 +124,13 @@ struct dpaa2_eth_swa { 
#define DPAA2_FD_FRC_FAICFDV		0x0400



/* Error bits in FD CTRL */

#define DPAA2_FD_CTRL_UFD		0x00000004

#define DPAA2_FD_CTRL_SBE		0x00000008

#define DPAA2_FD_CTRL_FSE		0x00000020

#define DPAA2_FD_CTRL_FAERR		0x00000040



#define DPAA2_FD_RX_ERR_MASK		(DPAA2_FD_CTRL_SBE	| \

					 DPAA2_FD_CTRL_FAERR)

#define DPAA2_FD_TX_ERR_MASK		(DPAA2_FD_CTRL_UFD	| \

					 DPAA2_FD_CTRL_SBE	| \

					 DPAA2_FD_CTRL_FSE	| \

					 DPAA2_FD_CTRL_FAERR)

#define DPAA2_FD_RX_ERR_MASK		(FD_CTRL_SBE | FD_CTRL_FAERR)

#define DPAA2_FD_TX_ERR_MASK		(FD_CTRL_UFD	| \

					 FD_CTRL_SBE	| \

					 FD_CTRL_FSE	| \

					 FD_CTRL_FAERR)



/* Annotation bits in FD CTRL */

#define DPAA2_FD_CTRL_PTA		0x00800000

#define DPAA2_FD_CTRL_PTV1		0x00400000

#define DPAA2_FD_CTRL_ASAL		0x00020000	/* ASAL = 128B */



/* Frame annotation status */

drivers/staging/fsl-mc/include/dpaa2-fd.h

+12 −0
Original line number Diff line number Diff line
@@ -67,6 +67,18 @@ struct dpaa2_fd { 
#define SG_FINAL_FLAG_MASK	0x1

#define SG_FINAL_FLAG_SHIFT	15



/* Error bits in FD CTRL */

#define FD_CTRL_ERR_MASK	0x000000FF

#define FD_CTRL_UFD		0x00000004

#define FD_CTRL_SBE		0x00000008

#define FD_CTRL_FLC		0x00000010

#define FD_CTRL_FSE		0x00000020

#define FD_CTRL_FAERR		0x00000040



/* Annotation bits in FD CTRL */

#define FD_CTRL_PTA		0x00800000

#define FD_CTRL_PTV1		0x00400000



enum dpaa2_fd_format {

	dpaa2_fd_single = 0,

	dpaa2_fd_list,