net: stmmac: add mutex lock to protect est parameters

Add a mutex lock to protect est structure parameters so that the
EST parameters can be updated by other threads.

Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c

@@ -796,14 +796,18 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
  GFP_KERNEL);
  if (!plat->est)
  return -ENOMEM;
+
+ mutex_init(&priv->plat->est->lock);
  } else {
  memset(plat->est, 0, sizeof(*plat->est));
  }
 
  size = qopt->num_entries;
 
+ mutex_lock(&priv->plat->est->lock);
  priv->plat->est->gcl_size = size;
  priv->plat->est->enable = qopt->enable;
+ mutex_unlock(&priv->plat->est->lock);
 
  for (i = 0; i < size; i++) {
  s64 delta_ns = qopt->entries[i].interval;
@@ -834,6 +838,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
  priv->plat->est->gcl[i] = delta_ns | (gates << wid);
  }
 
+ mutex_lock(&priv->plat->est->lock);
  /* Adjust for real system time */
  priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, &current_time);
  current_time_ns = timespec64_to_ktime(current_time);
@@ -847,8 +852,10 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
  priv->plat->est->ctr[0] = do_div(ctr, NSEC_PER_SEC);
  priv->plat->est->ctr[1] = (u32)ctr;
 
- if (fpe && !priv->dma_cap.fpesel)
+ if (fpe && !priv->dma_cap.fpesel) {
+ mutex_unlock(&priv->plat->est->lock);
  return -EOPNOTSUPP;
+ }
 
  /* Actual FPE register configuration will be done after FPE handshake
  * is success.
@@ -857,6 +864,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
 
  ret = stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
  priv->plat->clk_ptp_rate);
+ mutex_unlock(&priv->plat->est->lock);
  if (ret) {
  netdev_err(priv->dev, "failed to configure EST\n");
  goto disable;
@@ -872,9 +880,11 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
  return 0;
 
 disable:
+ mutex_lock(&priv->plat->est->lock);
  priv->plat->est->enable = false;
  stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
  priv->plat->clk_ptp_rate);
+ mutex_unlock(&priv->plat->est->lock);
 
  priv->plat->fpe_cfg->enable = false;
  stmmac_fpe_configure(priv, priv->ioaddr,

include/linux/stmmac.h

@@ -115,6 +115,7 @@ struct stmmac_axi {
 
 #define EST_GCL 1024
 struct stmmac_est {
+ struct mutex lock;
  int enable;
  u32 btr_offset[2];
  u32 btr[2];