From patchwork Thu Feb 8 01:34:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hojin Nam X-Patchwork-Id: 13549218 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6E9EC4828F for ; Thu, 8 Feb 2024 01:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:Date:Message-ID:CC :To:From:Subject:Mime-Version:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: List-Owner; bh=HvuVeuXOfsLzGhgolgFe16UTNR38MvUSDmQ1fEbt4f0=; b=QptzZ/xsq/Knok OGAyOQORr5+dJnkpkyg8vovc6UX4FC314nqH68Fn3D7MVh3QdKPZq90hE03mhj3QPOXZc1x0/ibz5 2EFsdXfqpl9MvJ60ggb0wr7w/v6wAgE9aysOasHDWQ+RfIhApHmTM6gll1C73Sg7XfkZUXa45A4Tr NlkDF/2mnFZkTAZ2KOwzk9JGsEiv4nSuCoswm2zxbDzLNARcSUIDuXE6r2KmKksuY+7Uw2ySmRfY/ Sr9mI5a/en6rwQcZHjWUoNgg0RcCVqOA+zn6axiKAdis4ke2G8uNd77Txkl+Fb/vc2aSMREKNw43f I4E6+gcasyzrxYoOnvgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXtJ8-0000000CPI7-282H; Thu, 08 Feb 2024 01:34:30 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXtJ4-0000000CPHM-3U4O for linux-arm-kernel@lists.infradead.org; Thu, 08 Feb 2024 01:34:29 +0000 Received: from epcas2p3.samsung.com (unknown [182.195.41.55]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20240208013417epoutp03927775e8a5b2997aec862683037fef3b~xv0m0J4Uc2286922869epoutp03V for ; Thu, 8 Feb 2024 01:34:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20240208013417epoutp03927775e8a5b2997aec862683037fef3b~xv0m0J4Uc2286922869epoutp03V DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1707356057; bh=86gvZtSeCMNrCtsyk+Iz52UnueTtZaTSI0sib+SSIOM=; h=Subject:Reply-To:From:To:CC:Date:References:From; b=B7OATkgi9RlVqG4IS09GIORiRFUhI5bujI9qSkA+WZb9+apvDD6MqQWdYBwoa3IQF VZ1BDJHczpkj3sJjwEieqplF6DjwOx3AQHWgJF4CeotLBd2OWl6ilZCHj6AyLLQ00W ZWILLM5jgC8pMGln4fz29M1Gje9w8xvKNohjEgiI= Received: from epsnrtp4.localdomain (unknown [182.195.42.165]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20240208013416epcas2p3098460d3a4f49fec0cd61a62bbb14441~xv0maZaAL1717617176epcas2p39; Thu, 8 Feb 2024 01:34:16 +0000 (GMT) Received: from epsmgec2p1-new.samsung.com (unknown [182.195.36.98]) by epsnrtp4.localdomain (Postfix) with ESMTP id 4TVffJ02Xnz4x9QH; Thu, 8 Feb 2024 01:34:16 +0000 (GMT) X-AuditID: b6c32a4d-743ff70000004a32-6f-65c42f976809 Received: from epcas2p2.samsung.com ( [182.195.41.54]) by epsmgec2p1-new.samsung.com (Symantec Messaging Gateway) with SMTP id 21.B6.18994.79F24C56; Thu, 8 Feb 2024 10:34:15 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH v3] perf: CXL: fix mismatched cpmu event opcode From: Hojin Nam To: "linux-cxl@vger.kernel.org" , "jonathan.cameron@huawei.com" CC: Wonjae Lee , KyungSan Kim , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "will@kernel.org" , "mark.rutland@arm.com" X-Priority: 3 X-Content-Kind-Code: NORMAL X-CPGS-Detection: blocking_info_exchange X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20240208013415epcms2p2904187c8a863f4d0d2adc980fb91a2dc@epcms2p2> Date: Thu, 08 Feb 2024 10:34:15 +0900 X-CMS-MailID: 20240208013415epcms2p2904187c8a863f4d0d2adc980fb91a2dc X-Sendblock-Type: AUTO_CONFIDENTIAL CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnk+LIzCtJLcpLzFFi42LZdljTTHe6/pFUg11HTS1WLbzGZnF0D4fF psfXWC3OzzrFYnF51xw2i6XXLzJZtNwxtdh4/x2bA4fHmnlrGD1ajrxl9di0qpPNY/OSeo++ LasYPT5vkgtgi8q2yUhNTEktUkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ 0HXLzAG6RkmhLDGnFCgUkFhcrKRvZ1OUX1qSqpCRX1xiq5RakJJTYF6gV5yYW1yal66Xl1pi ZWhgYGQKVJiQnbGi5QRTwV6eivYzx5kbGK9wdjFyckgImEg8ubGBrYuRi0NIYA+jREPzK9Yu Rg4OXgFBib87hEFqhAXsJY5ufc0IYgsJyEnsOXGeBSKuIbH2+2F2EJtNQE1i4f1LzCC2iECV xPX3T5lAZjILbGOS+PtwKSPEMl6JGe1PWSBsaYnty7dCxTUkfizrZYawRSVurn7LDmO/PzYf qkZEovXeWagaQYkHP3dDxaUkPt3dBBUvlpi9fxlUvEBixY9FULv0JRqvv2cDsXkFfCVW3zsL Np9FQFWi5eNnRpB/JQRcJHbvDwEJMwvIS2x/O4cZJMwsoCmxfpc+RIWyxJFbLBAVfBIdh/+y wzy1Y94TJghbSWJ/RyvUMRISd05chhruIdF5VAUSgIESNx92M09gVJiFCOZZSNbOQli7gJF5 FaNUakFxbnpqslGBoW5eajk8dpPzczcxglOmlu8Oxtfr/+odYmTiYDzEKMHBrCTCa7bjQKoQ b0piZVVqUX58UWlOavEhRlOgnycyS4km5wOTdl5JvKGJpYGJmZmhuZGpgbmSOO+91rkpQgLp iSWp2ampBalFMH1MHJxSDUwqG0Ji3Tabfo7s/WRyeNLWt3/POqoyTix0Zt5xeqt3l7RF6bYp +T9Vlu3IFUr913n0OI/Cs52zt06cZDq3iK3XOSUix8lJYOIcx9gXZlH/Cw5kbeBMVJ8pyq73 uWCny9tVp02Tb0rreoYutJ9ToP7iu4CR/bt0/f2/pz2wL3w1/WKmiDq7P88yPcEbu4TWV/rp NR3i9Zu0favwfbffRxm9/0uERvda3Xn2mPHZkonVocXP5jg9mc0eLOZkXWVuzvjrIP81WZXf sU2zNj84LnDjw+LTDO2qYV+P8x40Ps/07Xy+9/vN5SsWn19nfXjbwecyAsfY9kXXa89wVK91 zFiutPzrPO2LhTObJh79MumYEktxRqKhFnNRcSIAY/aUkCIEAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20240208013415epcms2p2904187c8a863f4d0d2adc980fb91a2dc References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240207_173427_579424_2134BCF6 X-CRM114-Status: GOOD ( 19.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: hj96.nam@samsung.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org S2M NDR BI-ConflictAck opcode is described as 4 in the CXL r3.0 3.3.9 Table 3.43. However, it is defined as 3 in macro definition. Fixes: 5d7107c72796 ("perf: CXL Performance Monitoring Unit driver") Signed-off-by: Hojin Nam Reviewed-by: Jonathan Cameron --- Hi Jonathan, Sorry, I misunderstood your guide. I roll-backed to v1 patch keeping fixes tag. Thank you! Changes since v2: - Remove s2m_ndr_cmpm attribute and referecne added at v2 (Jonathan) Changes since v1: - Add s2m_ndr_cmpm event attribute - Add fixes tag (Jonathan) drivers/perf/cxl_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.1 diff --git a/drivers/perf/cxl_pmu.c b/drivers/perf/cxl_pmu.c index 365d964b0f6a..bc0d414a6aff 100644 --- a/drivers/perf/cxl_pmu.c +++ b/drivers/perf/cxl_pmu.c @@ -419,7 +419,7 @@ static struct attribute *cxl_pmu_event_attrs[] = { CXL_PMU_EVENT_CXL_ATTR(s2m_ndr_cmp, CXL_PMU_GID_S2M_NDR, BIT(0)), CXL_PMU_EVENT_CXL_ATTR(s2m_ndr_cmps, CXL_PMU_GID_S2M_NDR, BIT(1)), CXL_PMU_EVENT_CXL_ATTR(s2m_ndr_cmpe, CXL_PMU_GID_S2M_NDR, BIT(2)), - CXL_PMU_EVENT_CXL_ATTR(s2m_ndr_biconflictack, CXL_PMU_GID_S2M_NDR, BIT(3)), + CXL_PMU_EVENT_CXL_ATTR(s2m_ndr_biconflictack, CXL_PMU_GID_S2M_NDR, BIT(4)), /* CXL rev 3.0 Table 3-46 S2M DRS opcodes */ CXL_PMU_EVENT_CXL_ATTR(s2m_drs_memdata, CXL_PMU_GID_S2M_DRS, BIT(0)), CXL_PMU_EVENT_CXL_ATTR(s2m_drs_memdatanxm, CXL_PMU_GID_S2M_DRS, BIT(1)),