net: dsa: move sja1110_process_meta_tstamp inside the tagging protocol driver

[mirror_ubuntu-jammy-kernel.git] / drivers / net / dsa / sja1105 / sja1105_ptp.c

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index 691f6dd7e669738e3316b0909ba578dfed78bcd4..54396992a9199c39b1abcabced620e5c6b4e9c58 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -64,6 +64,7 @@ enum sja1105_ptp_clk_mode {
 static int sja1105_change_rxtstamping(struct sja1105_private *priv,
                                      bool on)
 {
+       struct sja1105_tagger_data *tagger_data = &priv->tagger_data;
        struct sja1105_ptp_data *ptp_data = &priv->ptp_data;
        struct sja1105_general_params_entry *general_params;
        struct sja1105_table *table;
@@ -79,7 +80,7 @@ static int sja1105_change_rxtstamping(struct sja1105_private *priv,
                priv->tagger_data.stampable_skb = NULL;
        }
        ptp_cancel_worker_sync(ptp_data->clock);
-       skb_queue_purge(&ptp_data->skb_txtstamp_queue);
+       skb_queue_purge(&tagger_data->skb_txtstamp_queue);
        skb_queue_purge(&ptp_data->skb_rxtstamp_queue);
 
        return sja1105_static_config_reload(priv, SJA1105_RX_HWTSTAMPING);
@@ -452,40 +453,6 @@ bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,
        return priv->info->rxtstamp(ds, port, skb);
 }
 
-void sja1110_process_meta_tstamp(struct dsa_switch *ds, int port, u8 ts_id,
-                                enum sja1110_meta_tstamp dir, u64 tstamp)
-{
-       struct sja1105_private *priv = ds->priv;
-       struct sja1105_ptp_data *ptp_data = &priv->ptp_data;
-       struct sk_buff *skb, *skb_tmp, *skb_match = NULL;
-       struct skb_shared_hwtstamps shwt = {0};
-
-       /* We don't care about RX timestamps on the CPU port */
-       if (dir == SJA1110_META_TSTAMP_RX)
-               return;
-
-       spin_lock(&ptp_data->skb_txtstamp_queue.lock);
-
-       skb_queue_walk_safe(&ptp_data->skb_txtstamp_queue, skb, skb_tmp) {
-               if (SJA1105_SKB_CB(skb)->ts_id != ts_id)
-                       continue;
-
-               __skb_unlink(skb, &ptp_data->skb_txtstamp_queue);
-               skb_match = skb;
-
-               break;
-       }
-
-       spin_unlock(&ptp_data->skb_txtstamp_queue.lock);
-
-       if (WARN_ON(!skb_match))
-               return;
-
-       shwt.hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(tstamp));
-       skb_complete_tx_timestamp(skb_match, &shwt);
-}
-EXPORT_SYMBOL_GPL(sja1110_process_meta_tstamp);
-
 /* In addition to cloning the skb which is done by the common
  * sja1105_port_txtstamp, we need to generate a timestamp ID and save the
  * packet to the TX timestamping queue.
@@ -494,7 +461,6 @@ void sja1110_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)
 {
        struct sk_buff *clone = SJA1105_SKB_CB(skb)->clone;
        struct sja1105_private *priv = ds->priv;
-       struct sja1105_ptp_data *ptp_data = &priv->ptp_data;
        struct sja1105_port *sp = &priv->ports[port];
        u8 ts_id;
 
@@ -510,7 +476,7 @@ void sja1110_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)
 
        spin_unlock(&sp->data->meta_lock);
 
-       skb_queue_tail(&ptp_data->skb_txtstamp_queue, clone);
+       skb_queue_tail(&sp->data->skb_txtstamp_queue, clone);
 }
 
 /* Called from dsa_skb_tx_timestamp. This callback is just to clone
@@ -953,7 +919,7 @@ int sja1105_ptp_clock_register(struct dsa_switch *ds)
        /* Only used on SJA1105 */
        skb_queue_head_init(&ptp_data->skb_rxtstamp_queue);
        /* Only used on SJA1110 */
-       skb_queue_head_init(&ptp_data->skb_txtstamp_queue);
+       skb_queue_head_init(&tagger_data->skb_txtstamp_queue);
        spin_lock_init(&tagger_data->meta_lock);
 
        ptp_data->clock = ptp_clock_register(&ptp_data->caps, ds->dev);
@@ -971,6 +937,7 @@ int sja1105_ptp_clock_register(struct dsa_switch *ds)
 void sja1105_ptp_clock_unregister(struct dsa_switch *ds)
 {
        struct sja1105_private *priv = ds->priv;
+       struct sja1105_tagger_data *tagger_data = &priv->tagger_data;
        struct sja1105_ptp_data *ptp_data = &priv->ptp_data;
 
        if (IS_ERR_OR_NULL(ptp_data->clock))
@@ -978,7 +945,7 @@ void sja1105_ptp_clock_unregister(struct dsa_switch *ds)
 
        del_timer_sync(&ptp_data->extts_timer);
        ptp_cancel_worker_sync(ptp_data->clock);
-       skb_queue_purge(&ptp_data->skb_txtstamp_queue);
+       skb_queue_purge(&tagger_data->skb_txtstamp_queue);
        skb_queue_purge(&ptp_data->skb_rxtstamp_queue);
        ptp_clock_unregister(ptp_data->clock);
        ptp_data->clock = NULL;