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

Commit 1ebb2446 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: allow vlan tagged packets to be timestamped 



Allow vlan tagged packets to be timestamped, as no any restrictions
for this.

Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9423120

drivers/net/ethernet/ti/cpsw.c

+3 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ struct cpsw_ss_regs { 


#define CTRL_V2_TS_BITS \

	(TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\

	 TS_TTL_NONZERO  | TS_ANNEX_D_EN | TS_LTYPE1_EN)

	 TS_TTL_NONZERO  | TS_ANNEX_D_EN | TS_LTYPE1_EN | VLAN_LTYPE1_EN)



#define CTRL_V2_ALL_TS_MASK (CTRL_V2_TS_BITS | TS_TX_EN | TS_RX_EN)

#define CTRL_V2_TX_TS_BITS  (CTRL_V2_TS_BITS | TS_TX_EN)
@@ -293,7 +293,7 @@ struct cpsw_ss_regs { 
#define CTRL_V3_TS_BITS \

	(TS_107 | TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\

	 TS_TTL_NONZERO | TS_ANNEX_F_EN | TS_ANNEX_D_EN |\

	 TS_LTYPE1_EN)

	 TS_LTYPE1_EN | VLAN_LTYPE1_EN)



#define CTRL_V3_ALL_TS_MASK (CTRL_V3_TS_BITS | TS_TX_EN | TS_RX_EN)

#define CTRL_V3_TX_TS_BITS  (CTRL_V3_TS_BITS | TS_TX_EN)
@@ -2235,6 +2235,7 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv) 
	slave_write(slave, mtype, CPSW2_TS_SEQ_MTYPE);

	slave_write(slave, ctrl, CPSW2_CONTROL);

	writel_relaxed(ETH_P_1588, &cpsw->regs->ts_ltype);

	writel_relaxed(ETH_P_8021Q, &cpsw->regs->vlan_ltype);

}



static int cpsw_hwtstamp_set(struct net_device *dev, struct ifreq *ifr)