net: dsa: felix: qos classified based on pcp

Set the default QoS Classification based on PCP and DEI of vlan tag,
after that, frames can be Classified to different Qos based on PCP tag.
If there is no vlan tag or vlan ignored, use port default Qos.

Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index a2dfd73f8a1a09546e06cf877176dcc1a331118a..58d6b0f454e567838f4afce8fd16c6c62c15eda8 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -289,6 +289,27 @@ static void felix_phylink_mac_link_up(struct dsa_switch *ds, int port,
                         QSYS_SWITCH_PORT_MODE, port);
 }
 
+static void felix_port_qos_map_init(struct ocelot *ocelot, int port)
+{
+       int i;
+
+       ocelot_rmw_gix(ocelot,
+                      ANA_PORT_QOS_CFG_QOS_PCP_ENA,
+                      ANA_PORT_QOS_CFG_QOS_PCP_ENA,
+                      ANA_PORT_QOS_CFG,
+                      port);
+
+       for (i = 0; i < FELIX_NUM_TC * 2; i++) {
+               ocelot_rmw_ix(ocelot,
+                             (ANA_PORT_PCP_DEI_MAP_DP_PCP_DEI_VAL & i) |
+                             ANA_PORT_PCP_DEI_MAP_QOS_PCP_DEI_VAL(i),
+                             ANA_PORT_PCP_DEI_MAP_DP_PCP_DEI_VAL |
+                             ANA_PORT_PCP_DEI_MAP_QOS_PCP_DEI_VAL_M,
+                             ANA_PORT_PCP_DEI_MAP,
+                             port, i);
+       }
+}
+
 static void felix_get_strings(struct dsa_switch *ds, int port,
                              u32 stringset, u8 *data)
 {
@@ -547,6 +568,11 @@ static int felix_setup(struct dsa_switch *ds)
                        ocelot_configure_cpu(ocelot, port,
                                             OCELOT_TAG_PREFIX_NONE,
                                             OCELOT_TAG_PREFIX_LONG);
+
+               /* Set the default QoS Classification based on PCP and DEI
+                * bits of vlan tag.
+                */
+               felix_port_qos_map_init(ocelot, port);
        }
 
        /* Include the CPU port module in the forwarding mask for unknown