Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp908071ybt; Fri, 19 Jun 2020 17:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxId2cJjuYzj/aRrdY3RdkBEeSujcUAGkeRRzzgRh/xi47J5dJG+2HcdL8JH7qDKKSt4GRp X-Received: by 2002:a17:906:b817:: with SMTP id dv23mr5957399ejb.185.1592613956590; Fri, 19 Jun 2020 17:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592613956; cv=none; d=google.com; s=arc-20160816; b=qXeGhdT4Ogta92GA9OormBFRpI/1i+QuSsxzv+UEVuk57BnYmNJk92JTcPlwKVhJb2 /8tMvvyzJYYX5ogAv99AOvb46bSeNXHfD02Q+5SroE9c6zS8sf37K5VfiI0fJXbKo3fl rVd2P7C3klLL0Qze7ZgrL6LxYrDah7SmZ9U/YY0+E3CUyRt7qk6xmcJBUVIjFErHNu5I 0zTwOJohxJhbZ5F2vyV7asfge6AZU3eQvbrCDAe4jzQVxkSQoVcAEkxlHkIE48YnOS/T twmBMbdFuvTaYTGAjrXbOAa2ur50PZqBeaWLhs9+wFVsQwEKK1vS/1qn5ZtDqZ+KvE46 N/FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cYBQtc/U0hzKBRjqpBOpDpxGJI3yBccPsTAMzaSzqIU=; b=sCJQgq4/ekwhzMGAFJYGmhR5SOzEWbrgomzKj8Hq0tHXvDukv9akn7YwqwGeJxjLFX v6yzTc35AoCHy/eW9egWv8Iw+cAWoWYCxq/FaopErCRxp9EZYPDibpC9vzVgAvsvziLX hOePYNG9jSN5PrVRIkV//7VMk9vSQqF6Js5JdPRiMpfT4sQ35j5zqsgXfHmIYEujuU6h rmht46K7Vlfb3iG5KbmXTI21G+CUOU8c0T/WrnkldJ1K+D82JLs9J9mLZ+5BJ/FZ7KDH 2vNSA3CYbIjH8am5+v3p3CLwPn5mgsaR0/j+jHnHryZKr3JHEeYu9BPfgHnXoycrku7l SkRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nSi+w3nf; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a9si4689527eju.26.2020.06.19.17.45.34; Fri, 19 Jun 2020 17:45:56 -0700 (PDT) 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=@kernel.org header.s=default header.b=nSi+w3nf; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405117AbgFSPhF (ORCPT + 99 others); Fri, 19 Jun 2020 11:37:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:34736 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393751AbgFSPaq (ORCPT ); Fri, 19 Jun 2020 11:30:46 -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 58C752166E; Fri, 19 Jun 2020 15:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580645; bh=3InnyeHOfX2HAI/p9Sw6CicKSt7MLeeAttZJ9oB0KQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nSi+w3nfriKAqeUCmGxxhVjCBQvGA4Ya1AbhttyotbzTtecFDKv5u6gp9KxMhIgO+ IqcF52eYZgVFAOFRS+iR7sfI8gxeg4fO7oZtQQIFLTjgHROY1+ecJK6adpU3ujvZGH E9hKoVOnF0ae6YjnaLnhAzRhxDp95khbBKwRwWvg= 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.7 311/376] hwmon: (k10temp) Add AMD family 17h model 60h PCI match Date: Fri, 19 Jun 2020 16:33:49 +0200 Message-Id: <20200619141725.056898543@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@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 @@ -632,6 +632,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) }, {}