Commit 12dfc9e0 authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Greg Kroah-Hartman

coresight: Properly address errors in sink::disable() functions

When disabling a sink the reference counter ensures the operation goes
through if nobody else is using it.  As such if drvdata::mode is already
set do CS_MODE_DISABLED, it is an error and should be reported as such.
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Tested-by: default avatarLeo Yan <leo.yan@linaro.org>
Tested-by: default avatarRobert Walker <robert.walker@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f973d88b
...@@ -333,11 +333,10 @@ static int etb_disable(struct coresight_device *csdev) ...@@ -333,11 +333,10 @@ static int etb_disable(struct coresight_device *csdev)
return -EBUSY; return -EBUSY;
} }
/* Disable the ETB only if it needs to */ /* Complain if we (somehow) got out of sync */
if (drvdata->mode != CS_MODE_DISABLED) { WARN_ON_ONCE(drvdata->mode == CS_MODE_DISABLED);
etb_disable_hw(drvdata); etb_disable_hw(drvdata);
drvdata->mode = CS_MODE_DISABLED; drvdata->mode = CS_MODE_DISABLED;
}
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_dbg(drvdata->dev, "ETB disabled\n"); dev_dbg(drvdata->dev, "ETB disabled\n");
......
...@@ -297,11 +297,10 @@ static int tmc_disable_etf_sink(struct coresight_device *csdev) ...@@ -297,11 +297,10 @@ static int tmc_disable_etf_sink(struct coresight_device *csdev)
return -EBUSY; return -EBUSY;
} }
/* Disable the TMC only if it needs to */ /* Complain if we (somehow) got out of sync */
if (drvdata->mode != CS_MODE_DISABLED) { WARN_ON_ONCE(drvdata->mode == CS_MODE_DISABLED);
tmc_etb_disable_hw(drvdata); tmc_etb_disable_hw(drvdata);
drvdata->mode = CS_MODE_DISABLED; drvdata->mode = CS_MODE_DISABLED;
}
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
......
...@@ -1417,11 +1417,10 @@ static int tmc_disable_etr_sink(struct coresight_device *csdev) ...@@ -1417,11 +1417,10 @@ static int tmc_disable_etr_sink(struct coresight_device *csdev)
return -EBUSY; return -EBUSY;
} }
/* Disable the TMC only if it needs to */ /* Complain if we (somehow) got out of sync */
if (drvdata->mode != CS_MODE_DISABLED) { WARN_ON_ONCE(drvdata->mode == CS_MODE_DISABLED);
tmc_etr_disable_hw(drvdata); tmc_etr_disable_hw(drvdata);
drvdata->mode = CS_MODE_DISABLED; drvdata->mode = CS_MODE_DISABLED;
}
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment