coresight: etm4x: Improve usability of sysfs - include/exclude addr.

Setting include / exclude on a range had to be done by setting
the bit in 'mode' before setting the range. However, setting this
bit also had the effect of altering the current range as well.

Changed to only set include / exclude setting of a range at the point of
setting that range. Either use a 3rd input parameter as the include exclude
value, or if not present use the current value of 'mode'. Do not change
current range when 'mode' changes.

Signed-off-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20191104181251.26732-9-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
index ea1e034809a0749359a9552547431ffe7943bda8..8c056dd1a55ee2e2a3d61f00d1572cc5b125add7 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
@@ -297,8 +297,6 @@ static ssize_t mode_store(struct device *dev,
 
        spin_lock(&drvdata->spinlock);
        config->mode = val & ETMv4_MODE_ALL;
-       etm4_set_mode_exclude(drvdata,
-                             config->mode & ETM_MODE_EXCLUDE ? true : false);
 
        if (drvdata->instrp0 == true) {
                /* start by clearing instruction P0 field */
@@ -972,8 +970,12 @@ static ssize_t addr_range_store(struct device *dev,
        unsigned long val1, val2;
        struct etmv4_drvdata *drvdata = dev_get_drvdata(dev->parent);
        struct etmv4_config *config = &drvdata->config;
+       int elements, exclude;
 
-       if (sscanf(buf, "%lx %lx", &val1, &val2) != 2)
+       elements = sscanf(buf, "%lx %lx %x", &val1, &val2, &exclude);
+
+       /*  exclude is optional, but need at least two parameter */
+       if (elements < 2)
                return -EINVAL;
        /* lower address comparator cannot have a higher address value */
        if (val1 > val2)
@@ -1001,9 +1003,11 @@ static ssize_t addr_range_store(struct device *dev,
        /*
         * Program include or exclude control bits for vinst or vdata
         * whenever we change addr comparators to ETM_ADDR_TYPE_RANGE
+        * use supplied value, or default to bit set in 'mode'
         */
-       etm4_set_mode_exclude(drvdata,
-                             config->mode & ETM_MODE_EXCLUDE ? true : false);
+       if (elements != 3)
+               exclude = config->mode & ETM_MODE_EXCLUDE;
+       etm4_set_mode_exclude(drvdata, exclude ? true : false);
 
        spin_unlock(&drvdata->spinlock);
        return size;