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;
From:   Kim Phillips <kim.phillips@amd.com>
To:     Borislav Petkov <bp@alien8.de>, Borislav Petkov <bp@suse.de>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@kernel.org>, Ingo Molnar <mingo@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>, kim.phillips@amd.com
Cc:     Stephane Eranian <eranian@google.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        "H. Peter Anvin" <hpa@zytor.com>, Jiri Olsa <jolsa@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Michael Petlan <mpetlan@redhat.com>,
        Namhyung Kim <namhyung@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>, x86 <x86@kernel.org>
Subject: [PATCH v2 7/7] perf/x86/rapl: Add AMD Fam19h RAPL support
Date:   Tue,  8 Sep 2020 16:47:40 -0500
Message-Id: <20200908214740.18097-8-kim.phillips@amd.com>
In-Reply-To: <20200908214740.18097-1-kim.phillips@amd.com>
References: <20200908214740.18097-1-kim.phillips@amd.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from fritz.amd.com (165.204.77.11) by DM5PR1401CA0018.namprd14.prod.outlook.com (2603:10b6:4:4a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Tue, 8 Sep 2020 21:49:29 +0000
X-Mailer: git-send-email 2.27.0
X-Originating-IP: [165.204.77.11]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 84df05b8-315a-4090-aa20-08d854411138
X-MS-TrafficTypeDiagnostic: BN8PR12MB2881:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BN8PR12MB2881C2C151DEE1C8EF46C3B487290@BN8PR12MB2881.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:1332;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 0aRB4NEN7kTkI5WkHuD5epwIDm/lPEM9f+a/eKWeWQFMr6J9zvb/sGcuMd8HCaYg5GFV1QVwJV+CgR1FUfouJVJ24nzEThtqx6MrTupNl/ioCO4XhonUcvOj42K9lwWmY4iK3pjDrY94QtZPRotrNYjDKkWh63gshdPMLeJlokSYtlVtLAgLRpqlicSgiPGkjctyMDrCA8HsfmHdJAcNwjpk6Er6Stk6kRzWZGHleYJjk2tXotIloNbREUGMoN+NhFH/TBsOImJzc1Wd9OGURH/Hy4p8rBKH67m738VOWXXPSpKZlBV+k8rMwH4MgytGZRuuyfaXCZOofji0CCiuMg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN8PR12MB2946.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(396003)(136003)(376002)(366004)(2616005)(54906003)(110136005)(4326008)(6666004)(36756003)(8676002)(1076003)(66946007)(66476007)(44832011)(66556008)(6486002)(86362001)(7696005)(52116002)(956004)(316002)(186003)(7416002)(478600001)(26005)(8936002)(2906002)(16526019)(5660300002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: /qLmwdvrKjhXPwXJ4BT7hF6FDPRDdD8QTJMw7LPH3P65pJYZ2/Uyddqwque2dco7nCOzUEo+7ZxGZPgHE9wp2VLFZyxjcpcRW8k8mqobwDSJGQC9x5lYrmzPZBazvRJpDtklEEQ5E6VvtUE16xAcFaSp5hnyUB+hrCvfF0QMQN2HhwpIkCw2ZrT8L9j+fAQFgk8BHzXGs9l2a6DL/4Vz9yQjRvXVNFG9KcVxMIsiIselGs1f479zErLsakQCrfB2umL033hSr1ZQmDkKPfD3IBA3pExOdFf1L4PPevyn9OfkwsHaKkn58z2qePN984TSZvAZloQ4iGbH2KB4x9kQjFu9qqi3Id9nBSTRtN8y3Y+5nlk0N/QGZWuNv8kCPMMpghjiMZ8Mkty7DFQxEhHo6gqlthhXOuJxSCmLEbyvBlrVAfEsGzFgOTtQcnPW3Yo+HsWjPnruaWU0FaU4gQ7deJFrohhlMJABYpnDWg2WHXtoOoObtSzVUCeZBDP0YHriJjdDORPZmKVCcGzniKtQTtkpnctrX73Xxy2Zw4DWF2g6HsZKZfX6phqjUq8OEKIj62k9RH0WpBsKVu+9NI4wp791JKaHKyhz1sqRPsUWsvEfwJsERSX31WwEY8OgyRQ4a22gqtnETT8muckTnVHjEA==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 84df05b8-315a-4090-aa20-08d854411138
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB2946.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2020 21:49:31.3447
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oiNv+weOk7mCvmdzgdJL7jQOlqGf/RfYK6nlE4c/RNUPet9xVK6eOsrBjttNqZlSyPXd60YwaFOm8NRXKpzg7g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB2881
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Family 19h RAPL support did not change from Family 17h; extend
the existing Fam17h support to work on Family 19h too.

Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: x86 <x86@kernel.org>
---
v2: no changes.

 arch/x86/events/rapl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 67b411f7e8c4..7c0120e2e957 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -815,6 +815,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&model_spr),
 	X86_MATCH_VENDOR_FAM(AMD,	0x17,		&model_amd_fam17h),
 	X86_MATCH_VENDOR_FAM(HYGON,	0x18,		&model_amd_fam17h),
+	X86_MATCH_VENDOR_FAM(AMD,	0x19,		&model_amd_fam17h),
 	{},
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
-- 
2.27.0