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 6C6E1C433EF for ; Thu, 24 Mar 2022 20:34:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346584AbiCXUfk (ORCPT ); Thu, 24 Mar 2022 16:35:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244145AbiCXUfi (ORCPT ); Thu, 24 Mar 2022 16:35:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5EA97B55D for ; Thu, 24 Mar 2022 13:34:05 -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 6082560F27 for ; Thu, 24 Mar 2022 20:34:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97E16C340EC; Thu, 24 Mar 2022 20:34:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648154044; bh=Hke9uijvJjLH+sMjuC7Gd22j8kyXtDr8eWCu19CgugQ=; h=Date:From:Cc:Subject:From; b=VMyQlL3kUfwrvYNxhv9HC9vK4q/qHFfqhHV03J9LyO/HnFe+yhOcaY3cYsTcFQ9z1 vix37R6s1N+ZqGgHNnASFY3ijUPWu2nG4JEUSaXY4P58yUhjlhrPCl4P0gaSVxzGtY yvBG7OVp65+qxAKuXurUirPM4AW2BYadpHtfrYXF5CBB39qQhQgwfrG27d1FcPVzCQ xMNi8NEHxyj8RR0hXJ2qY4YdnvCoW6RBEX2dSlK+1JozFaIcYCAS35Z9NZ4RE/yRK0 rZeD5oFFp1cZAB6oaSzXpk08t5p9dR+C57K3AoXm7XEV+TCiReo/0Gl7QoB7Ra9LP0 dFNTMeviU/0nA== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id CC50840407; Thu, 24 Mar 2022 17:33:59 -0300 (-03) Date: Thu, 24 Mar 2022 17:33:59 -0300 From: Arnaldo Carvalho de Melo Cc: "Rafael J. Wysocki" , Ricardo Neri , Linux Kernel Mailing List Subject: [PATCH 1/1] tools arch x86: Sync the msr-index.h copy with the kernel sources Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just FYI, I'm carrying this on the perf tools tree: --------- To pick up the changes from these csets: 7b8f40b3de75c971 ("x86/cpu: Add definitions for the Intel Hardware Feedback Interface") That cause no changes to tooling: $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > before $ cp arch/x86/include/asm/msr-index.h tools/arch/x86/include/asm/msr-index.h $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after $ diff -u before after $ Just silences this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h' diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h Cc: Rafael J. Wysocki Cc: Ricardo Neri Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/x86/include/asm/msr-index.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h index a4a39c3e0f196747..0e7f303542bf35d6 100644 --- a/tools/arch/x86/include/asm/msr-index.h +++ b/tools/arch/x86/include/asm/msr-index.h @@ -705,12 +705,14 @@ #define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) #define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) +#define PACKAGE_THERM_STATUS_HFI_UPDATED (1 << 26) #define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 #define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) #define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) #define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) +#define PACKAGE_THERM_INT_HFI_ENABLE (1 << 25) /* Thermal Thresholds Support */ #define THERM_INT_THRESHOLD0_ENABLE (1 << 15) @@ -959,4 +961,8 @@ #define MSR_VM_IGNNE 0xc0010115 #define MSR_VM_HSAVE_PA 0xc0010117 +/* Hardware Feedback Interface */ +#define MSR_IA32_HW_FEEDBACK_PTR 0x17d0 +#define MSR_IA32_HW_FEEDBACK_CONFIG 0x17d1 + #endif /* _ASM_X86_MSR_INDEX_H */ -- 2.35.1