net: lan966x: Add support for offloading default prio

Add support for offloading default prio.

Reviewed-by: Daniel Machon <daniel.machon@microchip.com>
Reviewed-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c b/drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c
index 17cec9e..273e3bf 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c
@@ -64,6 +64,11 @@ static void lan966x_dcb_app_update(struct net_device *dev)
                qos.dscp.map[i] = dcb_getapp(dev, &app_itr);
        }
 
+       /* Get default prio */
+       qos.default_prio = dcb_ieee_getapp_default_prio_mask(dev);
+       if (qos.default_prio)
+               qos.default_prio = fls(qos.default_prio) - 1;
+
        /* Enable use of pcp for queue classification */
        if (lan966x_dcb_apptrust_contains(port->chip_port, DCB_APP_SEL_PCP))
                qos.pcp.enable = true;
@@ -106,6 +111,13 @@ static int lan966x_dcb_app_validate(struct net_device *dev,
        int err = 0;
 
        switch (app->selector) {
+       /* Default priority checks */
+       case IEEE_8021QAZ_APP_SEL_ETHERTYPE:
+               if (app->protocol)
+                       err = -EINVAL;
+               else if (app->priority >= NUM_PRIO_QUEUES)
+                       err = -ERANGE;
+               break;
        /* Dscp checks */
        case IEEE_8021QAZ_APP_SEL_DSCP:
                if (app->protocol >= LAN966X_PORT_QOS_DSCP_COUNT)

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
index 8213440..53711d5 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
@@ -412,6 +412,7 @@ struct lan966x_port_qos_dscp {
 struct lan966x_port_qos {
        struct lan966x_port_qos_pcp pcp;
        struct lan966x_port_qos_dscp dscp;
+       u8 default_prio;
 };
 
 struct lan966x_port {

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_port.c b/drivers/net/ethernet/microchip/lan966x/lan966x_port.c
index 11c552e..a660887 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_port.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_port.c
@@ -443,11 +443,32 @@ static void lan966x_port_qos_dscp_set(struct lan966x_port *port,
                        lan966x, ANA_DSCP_CFG(i));
 }
 
+static int lan966x_port_qos_default_set(struct lan966x_port *port,
+                                       struct lan966x_port_qos *qos)
+{
+       /* Set default prio and dp level */
+       lan_rmw(ANA_QOS_CFG_DP_DEFAULT_VAL_SET(0) |
+               ANA_QOS_CFG_QOS_DEFAULT_VAL_SET(qos->default_prio),
+               ANA_QOS_CFG_DP_DEFAULT_VAL |
+               ANA_QOS_CFG_QOS_DEFAULT_VAL,
+               port->lan966x, ANA_QOS_CFG(port->chip_port));
+
+       /* Set default pcp and dei for untagged frames */
+       lan_rmw(ANA_VLAN_CFG_VLAN_DEI_SET(0) |
+               ANA_VLAN_CFG_VLAN_PCP_SET(0),
+               ANA_VLAN_CFG_VLAN_DEI |
+               ANA_VLAN_CFG_VLAN_PCP,
+               port->lan966x, ANA_VLAN_CFG(port->chip_port));
+
+       return 0;
+}
+
 void lan966x_port_qos_set(struct lan966x_port *port,
                          struct lan966x_port_qos *qos)
 {
        lan966x_port_qos_pcp_set(port, &qos->pcp);
        lan966x_port_qos_dscp_set(port, &qos->dscp);
+       lan966x_port_qos_default_set(port, qos);
 }
 
 void lan966x_port_init(struct lan966x_port *port)