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

Commit 0fab782a authored by Yangbo Lu's avatar Yangbo Lu Committed by David S. Miller
Browse files

fsl/fman: add set_tstamp interface 



This patch is to add set_tstamp interface for memac,
dtsec, and 10GEC controllers to configure HW timestamping.

Signed-off-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Acked-by: default avatarMadalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cd19b52

drivers/net/ethernet/freescale/fman/fman_dtsec.c

+27 −0
Original line number Diff line number Diff line
@@ -123,11 +123,13 @@ 
#define DTSEC_ECNTRL_R100M		0x00000008

#define DTSEC_ECNTRL_QSGMIIM		0x00000001



#define TCTRL_TTSE			0x00000040

#define TCTRL_GTS			0x00000020



#define RCTRL_PAL_MASK			0x001f0000

#define RCTRL_PAL_SHIFT			16

#define RCTRL_GHTX			0x00000400

#define RCTRL_RTSE			0x00000040

#define RCTRL_GRS			0x00000020

#define RCTRL_MPROM			0x00000008

#define RCTRL_RSF			0x00000004
@@ -1136,6 +1138,31 @@ int dtsec_set_allmulti(struct fman_mac *dtsec, bool enable) 
	return 0;

}



int dtsec_set_tstamp(struct fman_mac *dtsec, bool enable)

{

	struct dtsec_regs __iomem *regs = dtsec->regs;

	u32 rctrl, tctrl;



	if (!is_init_done(dtsec->dtsec_drv_param))

		return -EINVAL;



	rctrl = ioread32be(&regs->rctrl);

	tctrl = ioread32be(&regs->tctrl);



	if (enable) {

		rctrl |= RCTRL_RTSE;

		tctrl |= TCTRL_TTSE;

	} else {

		rctrl &= ~RCTRL_RTSE;

		tctrl &= ~TCTRL_TTSE;

	}



	iowrite32be(rctrl, &regs->rctrl);

	iowrite32be(tctrl, &regs->tctrl);



	return 0;

}



int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr)

{

	struct dtsec_regs __iomem *regs = dtsec->regs;

drivers/net/ethernet/freescale/fman/fman_dtsec.h

+1 −0
Original line number Diff line number Diff line
@@ -56,5 +56,6 @@ int dtsec_add_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr); 
int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr);

int dtsec_get_version(struct fman_mac *dtsec, u32 *mac_version);

int dtsec_set_allmulti(struct fman_mac *dtsec, bool enable);

int dtsec_set_tstamp(struct fman_mac *dtsec, bool enable);



#endif /* __DTSEC_H */

drivers/net/ethernet/freescale/fman/fman_memac.c

+5 −0
Original line number Diff line number Diff line
@@ -964,6 +964,11 @@ int memac_set_allmulti(struct fman_mac *memac, bool enable) 
	return 0;

}



int memac_set_tstamp(struct fman_mac *memac, bool enable)

{

	return 0; /* Always enabled. */

}



int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)

{

	struct memac_regs __iomem *regs = memac->regs;

drivers/net/ethernet/freescale/fman/fman_memac.h

+1 −0
Original line number Diff line number Diff line
@@ -58,5 +58,6 @@ int memac_set_exception(struct fman_mac *memac, 
int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr);

int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr);

int memac_set_allmulti(struct fman_mac *memac, bool enable);

int memac_set_tstamp(struct fman_mac *memac, bool enable);



#endif /* __MEMAC_H */

drivers/net/ethernet/freescale/fman/fman_tgec.c

+21 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define TGEC_TX_IPG_LENGTH_MASK	0x000003ff



/* Command and Configuration Register (COMMAND_CONFIG) */

#define CMD_CFG_EN_TIMESTAMP		0x00100000

#define CMD_CFG_NO_LEN_CHK		0x00020000

#define CMD_CFG_PAUSE_IGNORE		0x00000100

#define CMF_CFG_CRC_FWD			0x00000040
@@ -588,6 +589,26 @@ int tgec_set_allmulti(struct fman_mac *tgec, bool enable) 
	return 0;

}



int tgec_set_tstamp(struct fman_mac *tgec, bool enable)

{

	struct tgec_regs __iomem *regs = tgec->regs;

	u32 tmp;



	if (!is_init_done(tgec->cfg))

		return -EINVAL;



	tmp = ioread32be(&regs->command_config);



	if (enable)

		tmp |= CMD_CFG_EN_TIMESTAMP;

	else

		tmp &= ~CMD_CFG_EN_TIMESTAMP;



	iowrite32be(tmp, &regs->command_config);



	return 0;

}



int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr)

{

	struct tgec_regs __iomem *regs = tgec->regs;