Re: [PATCH v4 02/10] coresight-tpdm: Optimize the useage of tpdm_has_dsb_dataset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 1/19/2024 7:35 PM, Suzuki K Poulose wrote:
On 19/01/2024 03:22, Tao Zhang wrote:
Since the function tpdm_has_dsb_dataset will be called by TPDA
driver in subsequent patches, it is moved to the header file.
And move this judgement form the function __tpdm_{enable/disable}
to the beginning of the function tpdm_{enable/disable}_dsb.

Signed-off-by: Tao Zhang <quic_taozha@xxxxxxxxxxx>
---
  drivers/hwtracing/coresight/coresight-tpdm.c | 82 ++++++++++----------
  drivers/hwtracing/coresight/coresight-tpdm.h |  4 +
  2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c
index 0427c0fc0bf3..6549f71ba150 100644
--- a/drivers/hwtracing/coresight/coresight-tpdm.c
+++ b/drivers/hwtracing/coresight/coresight-tpdm.c
@@ -125,11 +125,6 @@ static ssize_t tpdm_simple_dataset_store(struct device *dev,
      return ret;
  }
  -static bool tpdm_has_dsb_dataset(struct tpdm_drvdata *drvdata)
-{
-    return (drvdata->datasets & TPDM_PIDR0_DS_DSB);
-}
-
  static umode_t tpdm_dsb_is_visible(struct kobject *kobj,
                     struct attribute *attr, int n)
  {
@@ -232,38 +227,39 @@ static void tpdm_enable_dsb(struct tpdm_drvdata *drvdata)
  {
      u32 val, i;
  -    for (i = 0; i < TPDM_DSB_MAX_EDCR; i++)
-        writel_relaxed(drvdata->dsb->edge_ctrl[i],
-               drvdata->base + TPDM_DSB_EDCR(i));
-    for (i = 0; i < TPDM_DSB_MAX_EDCMR; i++)
-        writel_relaxed(drvdata->dsb->edge_ctrl_mask[i],
-               drvdata->base + TPDM_DSB_EDCMR(i));
-    for (i = 0; i < TPDM_DSB_MAX_PATT; i++) {
-        writel_relaxed(drvdata->dsb->patt_val[i],
-               drvdata->base + TPDM_DSB_TPR(i));
-        writel_relaxed(drvdata->dsb->patt_mask[i],
-               drvdata->base + TPDM_DSB_TPMR(i));
-        writel_relaxed(drvdata->dsb->trig_patt[i],
-               drvdata->base + TPDM_DSB_XPR(i));
-        writel_relaxed(drvdata->dsb->trig_patt_mask[i],
-               drvdata->base + TPDM_DSB_XPMR(i));
-    }
-
-    set_dsb_tier(drvdata);
+    if (tpdm_has_dsb_dataset(drvdata)) {

Minor nit: If you do :

    if (!tpdm_has_dsb_dataset(drvdata))
        return;

You don't need any of these additional churns of moving them.
Sure,I will update in the next patch series.

+        for (i = 0; i < TPDM_DSB_MAX_EDCR; i++)
+            writel_relaxed(drvdata->dsb->edge_ctrl[i],
+                       drvdata->base + TPDM_DSB_EDCR(i));
+        for (i = 0; i < TPDM_DSB_MAX_EDCMR; i++)
+ writel_relaxed(drvdata->dsb->edge_ctrl_mask[i],
+                       drvdata->base + TPDM_DSB_EDCMR(i));
+        for (i = 0; i < TPDM_DSB_MAX_PATT; i++) {
+            writel_relaxed(drvdata->dsb->patt_val[i],
+                       drvdata->base + TPDM_DSB_TPR(i));
+            writel_relaxed(drvdata->dsb->patt_mask[i],
+                       drvdata->base + TPDM_DSB_TPMR(i));
+            writel_relaxed(drvdata->dsb->trig_patt[i],
+                       drvdata->base + TPDM_DSB_XPR(i));
+ writel_relaxed(drvdata->dsb->trig_patt_mask[i],
+                       drvdata->base + TPDM_DSB_XPMR(i));
+        }
  -    set_dsb_msr(drvdata);
+        set_dsb_tier(drvdata);
+        set_dsb_msr(drvdata);
  -    val = readl_relaxed(drvdata->base + TPDM_DSB_CR);
-    /* Set the mode of DSB dataset */
-    set_dsb_mode(drvdata, &val);
-    /* Set trigger type */
-    if (drvdata->dsb->trig_type)
-        val |= TPDM_DSB_CR_TRIG_TYPE;
-    else
-        val &= ~TPDM_DSB_CR_TRIG_TYPE;
-    /* Set the enable bit of DSB control register to 1 */
-    val |= TPDM_DSB_CR_ENA;
-    writel_relaxed(val, drvdata->base + TPDM_DSB_CR);
+        val = readl_relaxed(drvdata->base + TPDM_DSB_CR);
+        /* Set the mode of DSB dataset */
+        set_dsb_mode(drvdata, &val);
+        /* Set trigger type */
+        if (drvdata->dsb->trig_type)
+            val |= TPDM_DSB_CR_TRIG_TYPE;
+        else
+            val &= ~TPDM_DSB_CR_TRIG_TYPE;
+        /* Set the enable bit of DSB control register to 1 */
+        val |= TPDM_DSB_CR_ENA;
+        writel_relaxed(val, drvdata->base + TPDM_DSB_CR);
+    }
  }
    /*
@@ -278,8 +274,7 @@ static void __tpdm_enable(struct tpdm_drvdata *drvdata)
  {
      CS_UNLOCK(drvdata->base);
  -    if (tpdm_has_dsb_dataset(drvdata))
-        tpdm_enable_dsb(drvdata);
+    tpdm_enable_dsb(drvdata);
        CS_LOCK(drvdata->base);
  }
@@ -307,10 +302,12 @@ static void tpdm_disable_dsb(struct tpdm_drvdata *drvdata)
  {
      u32 val;
  -    /* Set the enable bit of DSB control register to 0 */
-    val = readl_relaxed(drvdata->base + TPDM_DSB_CR);
-    val &= ~TPDM_DSB_CR_ENA;
-    writel_relaxed(val, drvdata->base + TPDM_DSB_CR);
+    if (tpdm_has_dsb_dataset(drvdata)) {
+        /* Set the enable bit of DSB control register to 0 */
+        val = readl_relaxed(drvdata->base + TPDM_DSB_CR);
+        val &= ~TPDM_DSB_CR_ENA;
+        writel_relaxed(val, drvdata->base + TPDM_DSB_CR);
+    }

Same suggestion as above:

    if (!tpdm_has...)
        return;

Sure,I will update in the next patch series.


Best,

Tao


  }
    /* TPDM disable operations */
@@ -318,8 +315,7 @@ static void __tpdm_disable(struct tpdm_drvdata *drvdata)
  {
      CS_UNLOCK(drvdata->base);
  -    if (tpdm_has_dsb_dataset(drvdata))
-        tpdm_disable_dsb(drvdata);
+    tpdm_disable_dsb(drvdata);
        CS_LOCK(drvdata->base);
  }
diff --git a/drivers/hwtracing/coresight/coresight-tpdm.h b/drivers/hwtracing/coresight/coresight-tpdm.h
index 4115b2a17b8d..ddaf333fa1c2 100644
--- a/drivers/hwtracing/coresight/coresight-tpdm.h
+++ b/drivers/hwtracing/coresight/coresight-tpdm.h
@@ -220,4 +220,8 @@ struct tpdm_dataset_attribute {
      u32 idx;
  };
  +static bool tpdm_has_dsb_dataset(struct tpdm_drvdata *drvdata)
+{
+    return (drvdata->datasets & TPDM_PIDR0_DS_DSB);
+}
  #endif  /* _CORESIGHT_CORESIGHT_TPDM_H */


Suzuki




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux