The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x bf84937e882009075f57fd213836256fc65d96bc # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023041127-facedown-bonehead-4f10@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
bf84937e8820 ("coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug") f5bd523690d2 ("coresight: etm4x: Convert all register accesses") df81b43802f4 ("coresight: etm4x: Skip accessing TRCPDCR in save/restore") f6a18f354c58 ("coresight: etm4x: Handle access to TRCSSPCICRn") 60c519c5d362 ("coresight: etm4x: Handle TRCVIPCSSCTLR accesses") 6288b4ceca86 ("coresight: etm4x: Fix accesses to TRCPROCSELR") f2603b22e3d2 ("coresight: etm4x: Fix accesses to TRCCIDCTLR1") 93dd64404cbe ("coresight: etm4x: Fix accesses to TRCVMIDCTLR1") 347732627745 ("coresight: etm4x: Fix save and restore of TRCVMIDCCTLR1 register") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface") 685d84a7862e ("coresight: etm4x: Fix mis-usage of nr_resource in sysfs interface")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From bf84937e882009075f57fd213836256fc65d96bc Mon Sep 17 00:00:00 2001 From: Steve Clevenger scclevenger@os.amperecomputing.com Date: Mon, 27 Feb 2023 16:54:32 -0700 Subject: [PATCH] coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug
In etm4_enable_hw, fix for() loop range to represent address comparator pairs.
Fixes: 2e1cdfe184b5 ("coresight-etm4x: Adding CoreSight ETM4x driver") Cc: stable@vger.kernel.org Signed-off-by: Steve Clevenger scclevenger@os.amperecomputing.com Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com Link: https://lore.kernel.org/r/4a4ee61ce8ef402615a4528b21a051de3444fb7b.167754007...
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 1ea8f173cca0..104333c2c8a3 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -472,7 +472,7 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) if (etm4x_sspcicrn_present(drvdata, i)) etm4x_relaxed_write32(csa, config->ss_pe_cmp[i], TRCSSPCICRn(i)); } - for (i = 0; i < drvdata->nr_addr_cmp; i++) { + for (i = 0; i < drvdata->nr_addr_cmp * 2; i++) { etm4x_relaxed_write64(csa, config->addr_val[i], TRCACVRn(i)); etm4x_relaxed_write64(csa, config->addr_acc[i], TRCACATRn(i)); }