Patch "Coresight: Set correct cs_mode for TPDM to fix disable issue" has been added to the 6.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    Coresight: Set correct cs_mode for TPDM to fix disable issue

to the 6.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     coresight-set-correct-cs_mode-for-tpdm-to-fix-disabl.patch
and it can be found in the queue-6.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 83c6de515b8c677a6a23550e3efa1878d7d258c5
Author: Jie Gan <quic_jiegan@xxxxxxxxxxx>
Date:   Mon Aug 12 12:30:43 2024 +0800

    Coresight: Set correct cs_mode for TPDM to fix disable issue
    
    [ Upstream commit 14f5fa9b5fcbe2b3d5098893aba6ad62254d2ef6 ]
    
    The coresight_disable_source_sysfs function should verify the
    mode of the coresight device before disabling the source.
    
    However, the mode for the TPDM device is always set to
    CS_MODE_DISABLED, resulting in the check consistently failing.
    As a result, TPDM cannot be properly disabled.
    
    Configure CS_MODE_SYSFS/CS_MODE_PERF during the enablement.
    Configure CS_MODE_DISABLED during the disablement.
    
    Fixes: b3c71626a933 ("Coresight: Add coresight TPDM source driver")
    Signed-off-by: Jie Gan <quic_jiegan@xxxxxxxxxxx>
    Signed-off-by: Suzuki K Poulose <suzuki.poulose@xxxxxxx>
    Link: https://lore.kernel.org/r/20240812043043.2890694-1-quic_jiegan@xxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c
index 0726f8842552c..5c5a4b3fe6871 100644
--- a/drivers/hwtracing/coresight/coresight-tpdm.c
+++ b/drivers/hwtracing/coresight/coresight-tpdm.c
@@ -449,6 +449,11 @@ static int tpdm_enable(struct coresight_device *csdev, struct perf_event *event,
 		return -EBUSY;
 	}
 
+	if (!coresight_take_mode(csdev, mode)) {
+		spin_unlock(&drvdata->spinlock);
+		return -EBUSY;
+	}
+
 	__tpdm_enable(drvdata);
 	drvdata->enable = true;
 	spin_unlock(&drvdata->spinlock);
@@ -506,6 +511,7 @@ static void tpdm_disable(struct coresight_device *csdev,
 	}
 
 	__tpdm_disable(drvdata);
+	coresight_set_mode(csdev, CS_MODE_DISABLED);
 	drvdata->enable = false;
 	spin_unlock(&drvdata->spinlock);