From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E14AC76196 for ; Tue, 11 Apr 2023 11:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229513AbjDKLEO (ORCPT ); Tue, 11 Apr 2023 07:04:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229642AbjDKLEN (ORCPT ); Tue, 11 Apr 2023 07:04:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 498834228 for ; Tue, 11 Apr 2023 04:03:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 90D0E6240E for ; Tue, 11 Apr 2023 11:02:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1B80C433A7; Tue, 11 Apr 2023 11:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681210958; bh=ICVX4bQcu+vzlnrCB2qTfHWxxpWXLK9tZCf1lJ1QTC0=; h=Subject:To:Cc:From:Date:From; b=fkxU4EFeRe1QZmLYdPqZXZR32L0Ey8EDwC0DtQpyyw4moCdHrqxIRDiiCU3SEQFW0 Q1SU0rqWYEWJKPiN/sM7gyfiMt4c0rQb1AEuIzOKbpYcOLb4X1cHJB4ES0BhZyOZ9E RB+E1M5c25Qwv1jJEJ8Pk5r2u2yLA5GWjQGVHTAw= Subject: FAILED: patch "[PATCH] coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug" failed to apply to 5.4-stable tree To: scclevenger@os.amperecomputing.com, james.clark@arm.com, suzuki.poulose@arm.com Cc: From: Date: Tue, 11 Apr 2023 13:02:27 +0200 Message-ID: <2023041127-facedown-bonehead-4f10@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . 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 # git commit -s git send-email --to '' --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 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 Reviewed-by: James Clark Signed-off-by: Suzuki K Poulose Link: https://lore.kernel.org/r/4a4ee61ce8ef402615a4528b21a051de3444fb7b.1677540079.git.scclevenger@os.amperecomputing.com 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)); }