• Vladimir Oltean's avatar
    net: dsa: sja1105: complete tc-cbs offload support on SJA1110 · 180a7419
    Vladimir Oltean authored
    The blamed commit left this delta behind:
    
      struct sja1105_cbs_entry {
     -	u64 port;
     -	u64 prio;
     +	u64 port; /* Not used for SJA1110 */
     +	u64 prio; /* Not used for SJA1110 */
      	u64 credit_hi;
      	u64 credit_lo;
      	u64 send_slope;
      	u64 idle_slope;
      };
    
    but did not actually implement tc-cbs offload fully for the new switch.
    The offload is accepted, but it doesn't work.
    
    The difference compared to earlier switch generations is that now, the
    table of CBS shapers is sparse, because there are many more shapers, so
    the mapping between a {port, prio} and a table index is static, rather
    than requiring us to store the port and prio into the sja1105_cbs_entry.
    
    So, the problem is that the code programs the CBS shaper parameters at a
    dynamic table index which is incorrect.
    
    All that needs to be done for SJA1110 CBS shapers to work is to bypass
    the logic which allocates shapers in a dense manner, as for SJA1105, and
    use the fixed mapping instead.
    
    Fixes: 3e77e59b ("net: dsa: sja1105: add support for the SJA1110 switch family")
    Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    180a7419
sja1105.h 12.4 KB