mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-14 06:35:12 +00:00
233697b3b3
The added value of this function is that it can deal with both the case where the VLAN header is in the skb head, as well as in the offload field. This is something I was not able to do using other functions in the network stack. Since both ocelot-8021q and sja1105 need to do the same stuff, let's make it a common service provided by tag_8021q. This is done as refactoring for the new SJA1110 tagger, which partly uses tag_8021q as well (just like SJA1105), and will be the third caller. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright 2020-2021 NXP Semiconductors
|
|
*
|
|
* An implementation of the software-defined tag_8021q.c tagger format, which
|
|
* also preserves full functionality under a vlan_filtering bridge. It does
|
|
* this by using the TCAM engines for:
|
|
* - pushing the RX VLAN as a second, outer tag, on egress towards the CPU port
|
|
* - redirecting towards the correct front port based on TX VLAN and popping
|
|
* that on egress
|
|
*/
|
|
#include <linux/dsa/8021q.h>
|
|
#include <soc/mscc/ocelot.h>
|
|
#include <soc/mscc/ocelot_ptp.h>
|
|
#include "dsa_priv.h"
|
|
|
|
static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
|
|
struct net_device *netdev)
|
|
{
|
|
struct dsa_port *dp = dsa_slave_to_port(netdev);
|
|
u16 tx_vid = dsa_8021q_tx_vid(dp->ds, dp->index);
|
|
u16 queue_mapping = skb_get_queue_mapping(skb);
|
|
u8 pcp = netdev_txq_to_tc(netdev, queue_mapping);
|
|
struct ocelot *ocelot = dp->ds->priv;
|
|
int port = dp->index;
|
|
u32 rew_op = 0;
|
|
|
|
rew_op = ocelot_ptp_rew_op(skb);
|
|
if (rew_op) {
|
|
if (!ocelot_can_inject(ocelot, 0))
|
|
return NULL;
|
|
|
|
ocelot_port_inject_frame(ocelot, port, 0, rew_op, skb);
|
|
return NULL;
|
|
}
|
|
|
|
return dsa_8021q_xmit(skb, netdev, ETH_P_8021Q,
|
|
((pcp << VLAN_PRIO_SHIFT) | tx_vid));
|
|
}
|
|
|
|
static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
|
|
struct net_device *netdev,
|
|
struct packet_type *pt)
|
|
{
|
|
int src_port, switch_id, subvlan;
|
|
|
|
dsa_8021q_rcv(skb, &src_port, &switch_id, &subvlan);
|
|
|
|
skb->dev = dsa_master_find_slave(netdev, switch_id, src_port);
|
|
if (!skb->dev)
|
|
return NULL;
|
|
|
|
skb->offload_fwd_mark = 1;
|
|
|
|
return skb;
|
|
}
|
|
|
|
static const struct dsa_device_ops ocelot_8021q_netdev_ops = {
|
|
.name = "ocelot-8021q",
|
|
.proto = DSA_TAG_PROTO_OCELOT_8021Q,
|
|
.xmit = ocelot_xmit,
|
|
.rcv = ocelot_rcv,
|
|
.needed_headroom = VLAN_HLEN,
|
|
.promisc_on_master = true,
|
|
};
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_OCELOT_8021Q);
|
|
|
|
module_dsa_tag_driver(ocelot_8021q_netdev_ops);
|