From: Karol Jurczenia Add missing Traffic Control (TC) offload for flower filters matching the IP EtherType (ETH_P_IP). Reviewed-by: Sebastian Basierski Reviewed-by: Cezary Rojewski Signed-off-by: Karol Jurczenia Signed-off-by: Konrad Leszczynski --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 78d6b3737a26..77f900a328aa 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -206,6 +206,7 @@ enum stmmac_rfs_type { STMMAC_RFS_T_VLAN, STMMAC_RFS_T_LLDP, STMMAC_RFS_T_1588, + STMMAC_RFS_T_IP, STMMAC_RFS_T_MAX, }; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 694d6ee14381..c5577652d6ed 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -239,6 +239,7 @@ static int tc_rfs_init(struct stmmac_priv *priv) priv->rfs_entries_max[STMMAC_RFS_T_VLAN] = 8; priv->rfs_entries_max[STMMAC_RFS_T_LLDP] = 1; priv->rfs_entries_max[STMMAC_RFS_T_1588] = 1; + priv->rfs_entries_max[STMMAC_RFS_T_IP] = 32; for (i = 0; i < STMMAC_RFS_T_MAX; i++) priv->rfs_entries_total += priv->rfs_entries_max[i]; @@ -777,6 +778,17 @@ static int tc_add_ethtype_flow(struct stmmac_priv *priv, stmmac_rx_queue_routing(priv, priv->hw, PACKET_PTPQ, tc); break; + case ETH_P_IP: + if (priv->rfs_entries_cnt[STMMAC_RFS_T_IP] >= + priv->rfs_entries_max[STMMAC_RFS_T_IP]) + return -ENOENT; + + entry->type = STMMAC_RFS_T_IP; + priv->rfs_entries_cnt[STMMAC_RFS_T_IP]++; + + stmmac_rx_queue_routing(priv, priv->hw, + PACKET_UPQ, tc); + break; default: netdev_err(priv->dev, "EthType(0x%x) is not supported", etype); return -EINVAL; @@ -800,7 +812,7 @@ static int tc_del_ethtype_flow(struct stmmac_priv *priv, if (!entry || !entry->in_use || entry->type < STMMAC_RFS_T_LLDP || - entry->type > STMMAC_RFS_T_1588) + entry->type > STMMAC_RFS_T_IP) return -ENOENT; switch (entry->etype) { @@ -814,6 +826,11 @@ static int tc_del_ethtype_flow(struct stmmac_priv *priv, PACKET_PTPQ, 0); priv->rfs_entries_cnt[STMMAC_RFS_T_1588]--; break; + case ETH_P_IP: + stmmac_rx_queue_routing(priv, priv->hw, + PACKET_UPQ, 0); + priv->rfs_entries_cnt[STMMAC_RFS_T_IP]--; + break; default: netdev_err(priv->dev, "EthType(0x%x) is not supported", entry->etype); -- 2.34.1