From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E994D227E94; Mon, 2 Jun 2025 14:25:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874310; cv=none; b=FpFgNUyrojbZ0yajX77mGPiEXMSB4D8uAVAvQN4orcCKDVJwpSu+T9/Vs+6xxkfNQ1l6Iwah9YLsXmc11Oto51sig0w5x2rXQoDVpfCikZmhKvPgyKYfo01H1b+H6umLI6Ihr+6IHUTQB/qrOiy67/agbEJJvRHbJ2tY067ZxDs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874310; c=relaxed/simple; bh=rAannaRrsFJIXNfrlFjUHUnMS26qFazvXYg+aDIkmL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gzcfGB7C+HYTfSsA8VNeJvrn28RFFvsGmGdqruGGUMyaOzRAUAgk7+72vettzk0R9PAWUcHJ+SQVlVmDl5DKx91Ja7qQcyH4OH7mPykBg7CRmSPMDX2C/Re54q0iMznjcyUeIp7v0O2JtEDTqVbPqUigG1LfAnadVwNkhwDGBO8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U7N+QNfN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="U7N+QNfN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 685FBC4CEEB; Mon, 2 Jun 2025 14:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748874309; bh=rAannaRrsFJIXNfrlFjUHUnMS26qFazvXYg+aDIkmL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U7N+QNfN0dAixY5PrUNn3fVSz0TWjf0gCp2+BHIw2tvGZcCZJH+rS7VMaW78koqvS 3twd2Pkod0g2+q1Q9oILMKa0IQv7q7KRgAlQW0wmkWPT0OUTZx3xi4YiFMRH7YIxwM MHpoIwFIcr6yrI5MNzTAKBhyUj1Z++UJYmyGnDXQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Robin Murphy , Will Deacon Subject: [PATCH 6.6 427/444] perf/arm-cmn: Fix REQ2/SNP2 mixup Date: Mon, 2 Jun 2025 15:48:11 +0200 Message-ID: <20250602134358.274062742@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134340.906731340@linuxfoundation.org> References: <20250602134340.906731340@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robin Murphy commit 11b0f576e0cbde6a12258f2af6753b17b8df342b upstream. Somehow the encodings for REQ2/SNP2 channels in XP events got mixed up... Unmix them. CC: stable@vger.kernel.org Fixes: 23760a014417 ("perf/arm-cmn: Add CMN-700 support") Signed-off-by: Robin Murphy Link: https://lore.kernel.org/r/087023e9737ac93d7ec7a841da904758c254cb01.1746717400.git.robin.murphy@arm.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- drivers/perf/arm-cmn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -684,8 +684,8 @@ static umode_t arm_cmn_event_attr_is_vis if ((chan == 5 && cmn->rsp_vc_num < 2) || (chan == 6 && cmn->dat_vc_num < 2) || - (chan == 7 && cmn->snp_vc_num < 2) || - (chan == 8 && cmn->req_vc_num < 2)) + (chan == 7 && cmn->req_vc_num < 2) || + (chan == 8 && cmn->snp_vc_num < 2)) return 0; } @@ -841,8 +841,8 @@ static umode_t arm_cmn_event_attr_is_vis _CMN_EVENT_XP(pub_##_name, (_event) | (4 << 5)), \ _CMN_EVENT_XP(rsp2_##_name, (_event) | (5 << 5)), \ _CMN_EVENT_XP(dat2_##_name, (_event) | (6 << 5)), \ - _CMN_EVENT_XP(snp2_##_name, (_event) | (7 << 5)), \ - _CMN_EVENT_XP(req2_##_name, (_event) | (8 << 5)) + _CMN_EVENT_XP(req2_##_name, (_event) | (7 << 5)), \ + _CMN_EVENT_XP(snp2_##_name, (_event) | (8 << 5)) #define CMN_EVENT_XP_DAT(_name, _event) \ _CMN_EVENT_XP_PORT(dat_##_name, (_event) | (3 << 5)), \