net: dsa: sja1105: dynamically choose the number of static config table entries

Due to the fact that the port count is different, some static config
tables have a different number of elements in SJA1105 compared to
SJA1110. Such an example is the L2 Policing table, which has 45 entries
in SJA1105 (one per port x traffic class, and one broadcast policer per
port) and 110 entries in SJA1110 (one per port x traffic class, one
broadcast and one multicast policer per port).

Similarly, the MAC Configuration Table, the L2 Forwarding table, all
have a different number of elements simply because the port count is
different, and although this can be accounted for by looking at
ds->ports, the policing table can't because of the presence of the extra
multicast policers.

The common denominator for the static config initializers for these
tables is that they must set up all the entries within that table.
So the simplest way to account for these differences in a uniform manner
is to look at struct sja1105_table_ops::max_entry_count. For the sake of
uniformity, this patch makes that change also for tables whose number of
elements did not change in SJA1110, like the xMII Mode Parameters, the
L2 Lookup Parameters, General Parameters, AVB Parameters (all of these
are singleton tables with a single entry).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index be48e45079f2c145ddc058215066d41af1c54473..cd9359722e5f9e8309553b0312e7fab4146e508f 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -118,12 +118,12 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(ds->num_ports,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = ds->num_ports;
+       table->entry_count = table->ops->max_entry_count;
 
        mac = table->entries;
 
@@ -174,13 +174,13 @@ static int sja1105_init_mii_settings(struct sja1105_private *priv,
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_XMII_PARAMS_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
        /* Override table based on PHYLINK DT bindings */
-       table->entry_count = SJA1105_MAX_XMII_PARAMS_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        mii = table->entries;
 
@@ -322,12 +322,12 @@ static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        /* This table only has a single entry */
        ((struct sja1105_l2_lookup_params_entry *)table->entries)[0] =
@@ -414,12 +414,12 @@ static int sja1105_init_l2_forwarding(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_L2_FORWARDING_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = SJA1105_MAX_L2_FORWARDING_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        l2fwd = table->entries;
 
@@ -484,12 +484,12 @@ static int sja1105_init_l2_forwarding_params(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        /* This table only has a single entry */
        ((struct sja1105_l2_forwarding_params_entry *)table->entries)[0] =
@@ -597,12 +597,12 @@ static int sja1105_init_general_params(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_GENERAL_PARAMS_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        /* This table only has a single entry */
        ((struct sja1105_general_params_entry *)table->entries)[0] =
@@ -624,12 +624,12 @@ static int sja1105_init_avb_params(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_AVB_PARAMS_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = SJA1105_MAX_AVB_PARAMS_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        avb = table->entries;
 
@@ -708,12 +708,12 @@ static int sja1105_init_l2_policing(struct sja1105_private *priv)
                table->entry_count = 0;
        }
 
-       table->entries = kcalloc(SJA1105_MAX_L2_POLICING_COUNT,
+       table->entries = kcalloc(table->ops->max_entry_count,
                                 table->ops->unpacked_entry_size, GFP_KERNEL);
        if (!table->entries)
                return -ENOMEM;
 
-       table->entry_count = SJA1105_MAX_L2_POLICING_COUNT;
+       table->entry_count = table->ops->max_entry_count;
 
        policing = table->entries;