From patchwork Mon Feb 14 23:16:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Lane X-Patchwork-Id: 1592843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=V7uFkSUD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JyKq055Lgz9sG1 for ; Tue, 15 Feb 2022 10:16:28 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nJkZy-0002a9-Go; Mon, 14 Feb 2022 23:16:22 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nJkZv-0002Xg-5O for kernel-team@lists.ubuntu.com; Mon, 14 Feb 2022 23:16:19 +0000 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D9C843F1D0 for ; Mon, 14 Feb 2022 23:16:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644880578; bh=84ml7sw8qxS1GyNDRW4T3WgWbx28sQq+DiCVC3IYXi0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V7uFkSUD7HIKaEtVCYc2SagtAp1cwAdnizpKUhHjAZd0u1f8KarS+iyPtSmZe3fua roEKzTWQizu9D7TFmlM/qworCVyQnlcFsjb536Sm03SVK3bOdsnyNSxITkfvyWhIhh 7SlA0PamQBp/yE7VwU3i/5iU1uCLOFwnZqtASiskK490f509+f1rNQrxEEpuBzrw7V vTpVdxDcspYJTJQjXEZcBNpHnBjK9cVB2TIeLNJdNMBs9qWKfchCHWWic8zVEKZLFS QzlqN/tY91xi1M0m9EpjyfKxTm+ODpjou3GxaCRIYMFHq3nSAdcOWhmZ6dRCQ/0Xya s78pdeFG3GPWw== Received: by mail-qt1-f197.google.com with SMTP id x5-20020ac84d45000000b002cf826b1a18so13725233qtv.2 for ; Mon, 14 Feb 2022 15:16:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=84ml7sw8qxS1GyNDRW4T3WgWbx28sQq+DiCVC3IYXi0=; b=WKiXLkGn09XpPa+nXihD2zv2dT4jEtQTBDw6EKeu9r/2QYK0t6wZO7PekJPtrZlP3m IxQuN/c6Gr3J8M/a5Z2FHutxcb8k2mZQa1h5qrExJQkE/uvdRCJfm/9rag4lx6uieMh0 oLzO2gWimFbtwrvQk25whXBMxYCS13uP9bqVEG7v7y6vf5DidKiLI0hIDowNHyCFkeZd i2MWhi1HNselWl6RGnL/T88YGgwWN32dkYSrtH8pw33A/MwuNOqg3PuGI77zzb4WXn6I nMcMysk/0/lwCK4L/BZELsp6ZWANRv+QqgjnWQOlyGKZGLrGJ2jf1Y4ElrDTRnYRpgSU Xw4A== X-Gm-Message-State: AOAM532x9LbXgGoiujqyL+3WkAHXid7fB8rDSnLYsph9kiF6DTZKsLjA I/3uOp1qxIEqqAgqlSiYDjpxtLGSdvyqc0j46dJnxik6pRXfc6AVP2fnSEkgn7URboa/fAOSyuc nZQW8aC53axq7ZReLiief0pGJlXbMkdkwKljBv8LSeg== X-Received: by 2002:ac8:5fce:: with SMTP id k14mr945152qta.645.1644880577629; Mon, 14 Feb 2022 15:16:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/0yR2j8eOKiBYpcxhYcZVZG36/X4axAROCqCan1A5HFepI5kyqMjYHsTAT9/BNeC3gXX2YA== X-Received: by 2002:ac8:5fce:: with SMTP id k14mr945131qta.645.1644880577279; Mon, 14 Feb 2022 15:16:17 -0800 (PST) Received: from localhost.localdomain ([71.217.161.186]) by smtp.gmail.com with ESMTPSA id h13sm3389428qkm.38.2022.02.14.15.16.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 15:16:16 -0800 (PST) From: Jeff Lane To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3] hwmon: (k10temp) Add support for AMD Family 19h Models 10h-1Fh and A0h-AFh Date: Mon, 14 Feb 2022 18:16:11 -0500 Message-Id: <20220214231611.4017202-4-jeffrey.lane@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220214231611.4017202-1-jeffrey.lane@canonical.com> References: <20220214231611.4017202-1-jeffrey.lane@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Babu Moger BugLink: http://bugs.launchpad.net/bugs/1960361 Add thermal info support for AMD Family 19h Models 10h-1Fh and A0h-AFh. Thermal info is supported via a new PCI device ID at offset 0x300h. Signed-off-by: Babu Moger Link: https://lore.kernel.org/r/163640829419.955062.12539219969781039915.stgit@bmoger-ubuntu Signed-off-by: Guenter Roeck (cherry picked from commit 3cf90efa13678d2de2f9f7e44e26353996db842a) Signed-off-by: Jeff Lane --- drivers/hwmon/k10temp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 59d9dfe9365b..4a2be86bc3bb 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -441,7 +441,9 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) data->ccd_offset = 0x154; k10temp_get_ccd_support(pdev, data, 8); break; + case 0x10 ... 0x1f: case 0x40 ... 0x4f: /* Yellow Carp */ + case 0xa0 ... 0xaf: data->ccd_offset = 0x300; k10temp_get_ccd_support(pdev, data, 8); break; @@ -490,6 +492,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },