Drop revert-coresight-cti-fix-hang-in-cti_disable_hw.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.0/revert-coresight-cti-fix-hang-in-cti_disable_hw.patch b/queue-6.0/revert-coresight-cti-fix-hang-in-cti_disable_hw.patch
deleted file mode 100644 (file)
index aa19e19..0000000
--- a/queue-6.0/revert-coresight-cti-fix-hang-in-cti_disable_hw.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3a2f7fc63430e869b49c05738eb23e7b95f6bfff Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 24 Oct 2022 08:32:39 +0200
-Subject: Revert "coresight: cti: Fix hang in cti_disable_hw()"
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-[ Upstream commit d76308f03ee1574b0deffde45604252a51c77f6d ]
-
-This reverts commit 665c157e0204176023860b51a46528ba0ba62c33.
-
-It causes reported build warnings:
-
-drivers/hwtracing/coresight/coresight-cti-core.c: In functio
-n 'cti_enable_hw':
-drivers/hwtracing/coresight/coresight-cti-core.c:93:24: warning: unused variable 'dev' [-Wunused-variable]
-   93 |         struct device *dev = &drvdata->csdev->dev;
-      |                        ^~~
-drivers/hwtracing/coresight/coresight-cti-core.c: In function 'cti_disable_hw':
-drivers/hwtracing/coresight/coresight-cti-core.c:154:24: warning: unused variable 'dev' [-Wunused-variable]
-  154 |         struct device *dev = &drvdata->csdev->dev;
-      |                        ^~~
-
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Cc: Aishwarya TCV <Aishwarya.TCV@arm.com>
-Cc: Cristian Marussi <Cristian.Marussi@arm.com>
-Cc: Suzuki Poulose <Suzuki.Poulose@arm.com>
-Cc: James Clark <james.clark@arm.com>
-Cc: Mike Leach <mike.leach@linaro.org>
-Cc: Mike Leach <mike.leach@linaro.org>
-Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
-Fixes: 665c157e0204 ("coresight: cti: Fix hang in cti_disable_hw()")
-Link: https://lore.kernel.org/r/20221024135752.2b83af97@canb.auug.org.au
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hwtracing/coresight/coresight-cti-core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/hwtracing/coresight/coresight-cti-core.c b/drivers/hwtracing/coresight/coresight-cti-core.c
-index dcd607a0c41a..5c2ebb5323a5 100644
---- a/drivers/hwtracing/coresight/coresight-cti-core.c
-+++ b/drivers/hwtracing/coresight/coresight-cti-core.c
-@@ -93,6 +93,7 @@ static int cti_enable_hw(struct cti_drvdata *drvdata)
-       unsigned long flags;
-       int rc = 0;
- 
-+      pm_runtime_get_sync(dev->parent);
-       spin_lock_irqsave(&drvdata->spinlock, flags);
- 
-       /* no need to do anything if enabled or unpowered*/
-@@ -117,6 +118,7 @@ static int cti_enable_hw(struct cti_drvdata *drvdata)
-       /* cannot enable due to error */
- cti_err_not_enabled:
-       spin_unlock_irqrestore(&drvdata->spinlock, flags);
-+      pm_runtime_put(dev->parent);
-       return rc;
- }
- 
-@@ -171,6 +173,7 @@ static int cti_disable_hw(struct cti_drvdata *drvdata)
-       coresight_disclaim_device_unlocked(csdev);
-       CS_LOCK(drvdata->base);
-       spin_unlock(&drvdata->spinlock);
-+      pm_runtime_put(dev->parent);
-       return 0;
- 
-       /* not disabled this call */
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 1f342552cc45929005751646f1b221f9747e890d..7d55b81053f053b1087ab0140c86417b6d5a4838 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -48,7 +48,6 @@ crypto-ccp-add-a-quirk-to-firmware-update.patch
 soundwire-dmi-quirks-add-remapping-for-hp-omen-16-k0.patch
 platform-x86-asus-wmi-adjust-tablet-lidflip-handling.patch
 platform-x86-asus-wmi-add-support-for-rog-x13-tablet.patch
-revert-coresight-cti-fix-hang-in-cti_disable_hw.patch
 xen-netback-ensure-protocol-headers-don-t-fall-in-th.patch
 xen-netback-don-t-call-kfree_skb-with-interrupts-dis.patch
 media-videobuf2-core-take-mmap_lock-in-vb2_get_unmap.patch