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

[linux-2.6-microblaze.git] / drivers / net / ethernet / mscc / ocelot.c

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 7106d9e..699b0c1 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -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;