Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9104864pxu; Mon, 28 Dec 2020 06:45:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwr/lN770HdFXbcRTbAcsfp8NGRtt/QTfCFC9oVC/dCLuYtURnuVUcrfnKwKevhgQaYdhV6 X-Received: by 2002:a17:906:2984:: with SMTP id x4mr42157889eje.239.1609166737794; Mon, 28 Dec 2020 06:45:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609166737; cv=none; d=google.com; s=arc-20160816; b=bOa3hLUQQR/YFq6fWC/Z25BTYkmGXBFIvPgO2/0WZmg9gvIpC8S9ljzORGpjJC9aUH 6D3MVgLBfo2DuW/jaWbZC5NGp/ZQW0OW0mSfB+wpEn1dCd3x48FJSm9hGqzxeT4aP7a5 d19OQESu4umBeByaLRG/tpWMs99VPw/UD3MpXvWhy2vBgCVxVqPqFqESATxuoRdwR+kg EgcPGKiCRxIyZz4Z263nTqWjdg4FW3go1/gFa1152hSzBicWmVGakXDEBMjBLu0fvdBS PNiaUh3ki26IRaWPwhAFWwrTEkodHDGXWZZZUrC6Qu4Mg8NO9hXyIo+H42wFfK9XR05v IvIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yOvaqT+3jP8gMku4DzZmgWXkFrn72f9825A9FJQ0juM=; b=frJ8b+xSyZZHYSn6GZMwf/fMSnViatbd/dTgf3DH4JZB19gUu2PuoDHF72IVs4/6sK RfMjsdzKmY5s2vp7819UsAKI1m+yRlwAqkofE5EWmPTZZmlOH2bufO3qktD/dD+pOaKd fNUjv8NCOgNJSysj3qWI5jJI6oR4HQyqZyPHcbgB+fO89Nozw+SuBp2Xa6NK/19sb9Jl Swx8khDV77wTORP6lG4fVGx0NwOD3izREMmINWE8uINEw9aPHhUaVyUUpyhwJLypK6lg scHyoUwwTx4pG5X6XEXSAcsdjxw93zxCf4VE20yyvdgUVtXSgSOpaKoU0Kknc3CSsUc7 fN4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a1mosDMt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o16si19887162ejx.217.2020.12.28.06.45.15; Mon, 28 Dec 2020 06:45:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a1mosDMt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502181AbgL1O1K (ORCPT + 99 others); Mon, 28 Dec 2020 09:27:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:60270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503333AbgL1OZy (ORCPT ); Mon, 28 Dec 2020 09:25:54 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E819E207B2; Mon, 28 Dec 2020 14:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609165539; bh=sHRTlPOkrSFBIDafdngq/slEC7jkGCdrz9KNv3Til88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a1mosDMt2Nv9d8TMfalZP9DtLRPzJ36NpZaD+AnBOnb82qJ7Ju0zwVvW7wjuTlLB4 4LODEVdweLFZqU15wKWk3W3+VxkYzdFV+LkVGYRewFV7RMXHlR1W/Xha7ox2Lt5HA2 HgS0+qcrx+s6eUpvU0WWxU8SAepRsYp9lr828lXc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kan Liang , "Peter Zijlstra (Intel)" Subject: [PATCH 5.10 567/717] perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake Date: Mon, 28 Dec 2020 13:49:25 +0100 Message-Id: <20201228125048.077008967@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang commit 46b72e1bf4fc571da0c29c6fb3e5b2a2107a4c26 upstream. According to the event list from icelake_core_v1.09.json, the encoding of the RTM_RETIRED.ABORTED event on Ice Lake should be, "EventCode": "0xc9", "UMask": "0x04", "EventName": "RTM_RETIRED.ABORTED", Correct the wrong encoding. Fixes: 6017608936c1 ("perf/x86/intel: Add Icelake support") Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20201125213720.15692-1-kan.liang@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -5465,7 +5465,7 @@ __init int intel_pmu_init(void) mem_attr = icl_events_attrs; td_attr = icl_td_events_attrs; tsx_attr = icl_tsx_events_attrs; - x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xca, .umask=0x02); + x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xc9, .umask=0x04); x86_pmu.lbr_pt_coexist = true; intel_pmu_pebs_data_source_skl(pmem); x86_pmu.update_topdown_event = icl_update_topdown_event;