net: dsa: sja1105: make sure the retagging port is enabled for SJA1110

The SJA1110 has an extra configuration in the General Parameters Table
through which the user can select the buffer reservation config.

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 2b3b6c402b34ff62c275fbe11ceb58c434aebff3..801cf47d957284da639574e7717b48b1b9ae2e1a 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -565,6 +565,60 @@ void sja1105_frame_memory_partitioning(struct sja1105_private *priv)
        vl_fwd_params->partspc[0] = SJA1105_VL_FRAME_MEMORY;
 }
 
+/* SJA1110 TDMACONFIGIDX values:
+ *
+ *      | 100 Mbps ports |  1Gbps ports  | 2.5Gbps ports | Disabled ports
+ * -----+----------------+---------------+---------------+---------------
+ *   0  |   0, [5:10]    |     [1:2]     |     [3:4]     |     retag
+ *   1  |0, [5:10], retag|     [1:2]     |     [3:4]     |       -
+ *   2  |   0, [5:10]    |  [1:3], retag |       4       |       -
+ *   3  |   0, [5:10]    |[1:2], 4, retag|       3       |       -
+ *   4  |  0, 2, [5:10]  |    1, retag   |     [3:4]     |       -
+ *   5  |  0, 1, [5:10]  |    2, retag   |     [3:4]     |       -
+ *  14  |   0, [5:10]    | [1:4], retag  |       -       |       -
+ *  15  |     [5:10]     | [0:4], retag  |       -       |       -
+ */
+static void sja1110_select_tdmaconfigidx(struct sja1105_private *priv)
+{
+       struct sja1105_general_params_entry *general_params;
+       struct sja1105_table *table;
+       bool port_1_is_base_tx;
+       bool port_3_is_2500;
+       bool port_4_is_2500;
+       u64 tdmaconfigidx;
+
+       if (priv->info->device_id != SJA1110_DEVICE_ID)
+               return;
+
+       table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS];
+       general_params = table->entries;
+
+       /* All the settings below are "as opposed to SGMII", which is the
+        * other pinmuxing option.
+        */
+       port_1_is_base_tx = priv->phy_mode[1] == PHY_INTERFACE_MODE_INTERNAL;
+       port_3_is_2500 = priv->phy_mode[3] == PHY_INTERFACE_MODE_2500BASEX;
+       port_4_is_2500 = priv->phy_mode[4] == PHY_INTERFACE_MODE_2500BASEX;
+
+       if (port_1_is_base_tx)
+               /* Retagging port will operate at 1 Gbps */
+               tdmaconfigidx = 5;
+       else if (port_3_is_2500 && port_4_is_2500)
+               /* Retagging port will operate at 100 Mbps */
+               tdmaconfigidx = 1;
+       else if (port_3_is_2500)
+               /* Retagging port will operate at 1 Gbps */
+               tdmaconfigidx = 3;
+       else if (port_4_is_2500)
+               /* Retagging port will operate at 1 Gbps */
+               tdmaconfigidx = 2;
+       else
+               /* Retagging port will operate at 1 Gbps */
+               tdmaconfigidx = 14;
+
+       general_params->tdmaconfigidx = tdmaconfigidx;
+}
+
 static int sja1105_init_general_params(struct sja1105_private *priv)
 {
        struct sja1105_general_params_entry default_general_params = {
@@ -640,6 +694,8 @@ static int sja1105_init_general_params(struct sja1105_private *priv)
        ((struct sja1105_general_params_entry *)table->entries)[0] =
                                default_general_params;
 
+       sja1110_select_tdmaconfigidx(priv);
+
        return 0;
 }
 

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c
index 4eba79bdedbf6251d61843e8bbb90e91c0a676a4..eda571819d4560e61b0f03779cef8bc9866cbf72 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_static_config.c
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.c
@@ -211,6 +211,7 @@ size_t sja1110_general_params_entry_packing(void *buf, void *entry_ptr,
        sja1105_packing(buf, &entry->egrmirrpcp,   113, 111, size, op);
        sja1105_packing(buf, &entry->egrmirrdei,   110, 110, size, op);
        sja1105_packing(buf, &entry->replay_port,  109, 106, size, op);
+       sja1105_packing(buf, &entry->tdmaconfigidx, 70,  67, size, op);
        sja1105_packing(buf, &entry->tte_en,        16,  16, size, op);
        return size;
 }

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.h b/drivers/net/dsa/sja1105/sja1105_static_config.h
index d24227f78a7288be043b6f5bf25ce48a9f38594a..9bef51791bff25b4f305e0baa0d6fa416d1408d3 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_static_config.h
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.h
@@ -216,6 +216,7 @@ struct sja1105_general_params_entry {
        u64 replay_port;
        /* SJA1110 only */
        u64 tte_en;
+       u64 tdmaconfigidx;
 };
 
 struct sja1105_schedule_entry_points_entry {