Commit 40d3f295 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: mscc: ocelot: use common tag parsing code with DSA 



The Injection Frame Header and Extraction Frame Header that the switch
prepends to frames over the NPI port is also prepended to frames
delivered over the CPU port module's queues.

Let's unify the handling of the frame headers by making the ocelot
driver call some helpers exported by the DSA tagger. Among other things,
this allows us to get rid of the strange cpu_to_be32 when transmitting
the Injection Frame Header on ocelot, since the packing API uses
network byte order natively (when "quirks" is 0).

The comments above ocelot_gen_ifh talk about setting pop_cnt to 3, and
the cpu extraction queue mask to something, but the code doesn't do it,
so we don't do it either.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a678bb2

drivers/net/dsa/ocelot/felix.c

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <soc/mscc/ocelot_ptp.h>

#include <soc/mscc/ocelot.h>

#include <linux/dsa/8021q.h>

#include <linux/dsa/ocelot.h>

#include <linux/platform_device.h>

#include <linux/packing.h>

#include <linux/module.h>

#include <linux/of_net.h>

#include <linux/pci.h>
@@ -1161,9 +1161,9 @@ static int felix_hwtstamp_set(struct dsa_switch *ds, int port, 
static bool felix_rxtstamp(struct dsa_switch *ds, int port,

			   struct sk_buff *skb, unsigned int type)

{

	u8 *extraction = skb->data - ETH_HLEN - OCELOT_TAG_LEN;

	struct skb_shared_hwtstamps *shhwtstamps;

	struct ocelot *ocelot = ds->priv;

	u8 *extraction = skb->data - ETH_HLEN - OCELOT_TAG_LEN;

	u32 tstamp_lo, tstamp_hi;

	struct timespec64 ts;

	u64 tstamp, val;
@@ -1171,7 +1171,7 @@ static bool felix_rxtstamp(struct dsa_switch *ds, int port, 
	ocelot_ptp_gettime64(&ocelot->ptp_info, &ts);

	tstamp = ktime_set(ts.tv_sec, ts.tv_nsec);



	packing(extraction, &val,  116, 85, OCELOT_TAG_LEN, UNPACK, 0);

	ocelot_xfh_get_rew_val(extraction, &val);

	tstamp_lo = (u32)val;



	tstamp_hi = tstamp >> 32;

drivers/net/dsa/ocelot/felix_vsc9959.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <soc/mscc/ocelot_ptp.h>

#include <soc/mscc/ocelot_sys.h>

#include <soc/mscc/ocelot.h>

#include <linux/packing.h>

#include <linux/dsa/ocelot.h>

#include <linux/pcs-lynx.h>

#include <net/pkt_sched.h>

#include <linux/iopoll.h>

drivers/net/dsa/ocelot/seville_vsc9953.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <soc/mscc/ocelot.h>

#include <linux/of_platform.h>

#include <linux/pcs-lynx.h>

#include <linux/packing.h>

#include <linux/dsa/ocelot.h>

#include <linux/iopoll.h>

#include "felix.h"

drivers/net/ethernet/mscc/ocelot.c

+8 −30
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *

 * Copyright (c) 2017 Microsemi Corporation

 */

#include <linux/dsa/ocelot.h>

#include <linux/if_bridge.h>

#include <soc/mscc/ocelot_vcap.h>

#include "ocelot.h"
@@ -628,26 +629,6 @@ void ocelot_get_txtstamp(struct ocelot *ocelot) 
}

EXPORT_SYMBOL(ocelot_get_txtstamp);



/* Generate the IFH for frame injection

 *

 * The IFH is a 128bit-value

 * bit 127: bypass the analyzer processing

 * bit 56-67: destination mask

 * bit 28-29: pop_cnt: 3 disables all rewriting of the frame

 * bit 20-27: cpu extraction queue mask

 * bit 16: tag type 0: C-tag, 1: S-tag

 * bit 0-11: VID

 */

static int ocelot_gen_ifh(u32 *ifh, struct frame_info *info)

{

	ifh[0] = IFH_INJ_BYPASS | ((0x1ff & info->rew_op) << 21);

	ifh[1] = (0xf00 & info->port) >> 8;

	ifh[2] = (0xff & info->port) << 24;

	ifh[3] = (info->tag_type << 16) | info->vid;



	return 0;

}



bool ocelot_can_inject(struct ocelot *ocelot, int grp)

{

	u32 val = ocelot_read(ocelot, QS_INJ_STATUS);
@@ -664,23 +645,20 @@ EXPORT_SYMBOL(ocelot_can_inject); 
void ocelot_port_inject_frame(struct ocelot *ocelot, int port, int grp,

			      u32 rew_op, struct sk_buff *skb)

{

	struct frame_info info = {};

	u32 ifh[OCELOT_TAG_LEN / 4];

	u32 ifh[OCELOT_TAG_LEN / 4] = {0};

	unsigned int i, count, last;



	ocelot_write_rix(ocelot, QS_INJ_CTRL_GAP_SIZE(1) |

			 QS_INJ_CTRL_SOF, QS_INJ_CTRL, grp);



	info.port = BIT(port);

	info.tag_type = IFH_TAG_TYPE_C;

	info.vid = skb_vlan_tag_get(skb);

	info.rew_op = rew_op;



	ocelot_gen_ifh(ifh, &info);

	ocelot_ifh_set_bypass(ifh, 1);

	ocelot_ifh_set_dest(ifh, BIT(port));

	ocelot_ifh_set_tag_type(ifh, IFH_TAG_TYPE_C);

	ocelot_ifh_set_vid(ifh, skb_vlan_tag_get(skb));

	ocelot_ifh_set_rew_op(ifh, rew_op);



	for (i = 0; i < OCELOT_TAG_LEN / 4; i++)

		ocelot_write_rix(ocelot, (__force u32)cpu_to_be32(ifh[i]),

				 QS_INJ_WR, grp);

		ocelot_write_rix(ocelot, ifh[i], QS_INJ_WR, grp);



	count = DIV_ROUND_UP(skb->len, 4);

	last = skb->len % 4;

drivers/net/ethernet/mscc/ocelot.h

+0 −9
Original line number Diff line number Diff line
@@ -32,15 +32,6 @@ 


#define OCELOT_PTP_QUEUE_SZ	128



struct frame_info {

	u32 len;

	u16 port;

	u16 vid;

	u8 tag_type;

	u16 rew_op;

	u32 timestamp;	/* rew_val */

};



struct ocelot_port_tc {

	bool block_shared;

	unsigned long offload_cnt;