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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81544C433E2 for ; Fri, 19 Jun 2020 15:14:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 542A2206FA for ; Fri, 19 Jun 2020 15:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579651; bh=6dlfhMDiTIOqM6oSKc5//nrjyKHgttEV6bGZ9zGRW/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n8uIan8t2PU+nyIVtczosH72OrTqrOSJF1XGyLVGlx8E8c2uDkYHA6KyPAwBukMLM cgciN7LWImJuqnCBqvrURtAtu6a/KaaUpjIWz2hKUdqlALLcLm5N6hVcnWkhftPwmW kEi6Q62+PcIINZ77izN/ecLHtwsepofjgUgr7fBM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403923AbgFSPOJ (ORCPT ); Fri, 19 Jun 2020 11:14:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:44498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392047AbgFSPN5 (ORCPT ); Fri, 19 Jun 2020 11:13:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6A67720776; Fri, 19 Jun 2020 15:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579636; bh=6dlfhMDiTIOqM6oSKc5//nrjyKHgttEV6bGZ9zGRW/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r5dE+yhc5M4y8SW1S5xAvwZXOrhCxLrXN7BrooajbNZZxXH+JFYWMV+ZHwQwNajQ2 +Or9lqWqy+1umMM4MWqmmpeQe1VzeGRPh7l9+voI7T1/BqZyvbZmDa+UO5rXLTlH1X T2sZKLe9RSCp5+WZ6IixPNN2qnQmQF1h6XKpY+xw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Monakov , Borislav Petkov , Guenter Roeck Subject: [PATCH 5.4 209/261] hwmon: (k10temp) Add AMD family 17h model 60h PCI match Date: Fri, 19 Jun 2020 16:33:40 +0200 Message-Id: <20200619141659.914108514@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Monakov commit 279f0b3a4b80660fba6faadc2ca2fa426bf3f7e9 upstream. Add support for retrieving Tdie and Tctl on AMD Renoir (4000-series Ryzen CPUs). It appears SMU offsets for reading current/voltage and CCD temperature have changed for this generation (reads from currently used offsets yield zeros), so those features cannot be enabled so trivially. Signed-off-by: Alexander Monakov Signed-off-by: Borislav Petkov Acked-by: Guenter Roeck Link: https://lkml.kernel.org/r/20200510204842.2603-3-amonakov@ispras.ru Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/k10temp.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -349,6 +349,7 @@ static const struct pci_device_id k10tem { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {}