net: dsa: sja1105: Add a global sja1105_tagger_data structure

This will be used to keep state for RX timestamping. It is global
because the switch serializes timestampable and meta frames when
trapping them towards the CPU port (lower port indices have higher
priority) and therefore having one state machine per port would create
unnecessary complications.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h
index 5a4f83a3417be7c1f5ff85584c0f3705a5f0ef95..0fc6fe9ada87eb1f4a11b4289216fdbe1a8c389f 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -103,6 +103,7 @@ struct sja1105_private {
         * the switch doesn't confuse them with one another.
         */
        struct mutex mgmt_lock;
+       struct sja1105_tagger_data tagger_data;
 };
 
 #include "sja1105_dynamic_config.h"

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index d129997174bb28f07afb35ef8883542433aa3817..3c11142f1c673560b57328b069903c98de4b7bd8 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1828,6 +1828,7 @@ static int sja1105_check_device_id(struct sja1105_private *priv)
 
 static int sja1105_probe(struct spi_device *spi)
 {
+       struct sja1105_tagger_data *tagger_data;
        struct device *dev = &spi->dev;
        struct sja1105_private *priv;
        struct dsa_switch *ds;
@@ -1882,12 +1883,16 @@ static int sja1105_probe(struct spi_device *spi)
        ds->priv = priv;
        priv->ds = ds;
 
+       tagger_data = &priv->tagger_data;
+       skb_queue_head_init(&tagger_data->skb_rxtstamp_queue);
+
        /* Connections between dsa_port and sja1105_port */
        for (i = 0; i < SJA1105_NUM_PORTS; i++) {
                struct sja1105_port *sp = &priv->ports[i];
 
                ds->ports[i].priv = sp;
                sp->dp = &ds->ports[i];
+               sp->data = tagger_data;
        }
        mutex_init(&priv->mgmt_lock);
 

diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h
index cc4a909d1007daf92017cce803acd2256494f349..2c4fce4eaf0df617d3bb68561d81adb2fa95ca4e 100644 (file)
--- a/include/linux/dsa/sja1105.h
+++ b/include/linux/dsa/sja1105.h
@@ -31,7 +31,22 @@
 #define SJA1105_META_SMAC                      0x222222222222ull
 #define SJA1105_META_DMAC                      0x0180C200000Eull
 
+/* Global tagger data: each struct sja1105_port has a reference to
+ * the structure defined in struct sja1105_private.
+ */
+struct sja1105_tagger_data {
+       struct sk_buff_head skb_rxtstamp_queue;
+       struct work_struct rxtstamp_work;
+       struct sk_buff *stampable_skb;
+       /* Protects concurrent access to the meta state machine
+        * from taggers running on multiple ports on SMP systems
+        */
+       spinlock_t meta_lock;
+       bool hwts_rx_en;
+};
+
 struct sja1105_port {
+       struct sja1105_tagger_data *data;
        struct dsa_port *dp;
        bool hwts_tx_en;
        int mgmt_slot;