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

References: bsc#1012628

Patch-mainline: 6.2.11

Git-commit: bf84937e882009075f57fd213836256fc65d96bc

commit bf84937e882009075f57fd213836256fc65d96bc upstream.

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.1677540079.git.scclevenger@os.amperecomputing.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c

index d6e2f5b9..a65b4101 100644

--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c

+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c

@@ -454,7 +454,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));

 	}

-- 

2.35.3