From patchwork Mon Feb 14 23:16:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Lane X-Patchwork-Id: 1592842 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=rZ5U70xa; 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 4JyKpz2WkLz9sFy for ; Tue, 15 Feb 2022 10:16:27 +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 1nJkZx-0002Yk-8I; Mon, 14 Feb 2022 23:16:21 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nJkZu-0002XQ-DQ for kernel-team@lists.ubuntu.com; Mon, 14 Feb 2022 23:16:18 +0000 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.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-0.canonical.com (Postfix) with ESMTPS id 3C3BE3F1B6 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=f/e3T803NIPxgQ+jrJln8I2ZCm3toi+aXZ7uqaAZTnE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rZ5U70xa72egjpOW0XB7ZXwHOHlIfqrdRCjEc2RO3OSX7QQRkjCszP3xmtH2RZjMA n1t3jox2plyyHLpw770y0vcsNoRY8K2yqfzXocrth4Xo2Czz3IvxfPseTvLqy4kG11 CN6d6k/IrdCQ4BnNw/7ljIqU48KwpYH9696VsTgQaHnEwzL42FAkOOfU4+BHsbNw1L Nw/f70KyosSyXiGb6urdfhw8osx/okgVQL/+YrhCCeAg1s29qeM7UsoMAzsJNp77LS f12kFZWCgIBLVV0HlJ8kgwIjjDpnCTO1kO9NMsBP6S203GX2gMmRJmhP2hBgbnuHWt gsB725zJomzZA== Received: by mail-qk1-f197.google.com with SMTP id g18-20020a05620a279200b005f173a00461so60738qkp.10 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=f/e3T803NIPxgQ+jrJln8I2ZCm3toi+aXZ7uqaAZTnE=; b=oOOsDLCqaA6zv0DeNDXXPmVinbzNQ6kLJ6PJvzzs0mG+U4NEDHPyfNdvXghub8BnhX utQjwaLLmNbOUyXaDrK+gany3fDSY220UVAI+5ffDyA5D6Hatji6Quimwg/5zhMfD1WU J7y7XyEmoTo+s2RkEgRlZPQr1ZLmD9E8y95iPm0jdcnnKs27tMxVCpIUebRVulF+39tc S379YHqBJ+ilgxrChKgAS4AWpE7rSd8M4Zwh/bsNESn8VPQFZbqRKVDC6nqgPQT4RHbj pIaU7SOA9QLNdIFvBFDtF79mgyJUAYxcJg7blnSD40iioWVDHYgHNdtsNEJvlDS6EcBZ XoVQ== X-Gm-Message-State: AOAM530PoqF1xst4Jxqa2tT2IUJk1CK2/YtnXXiqRy7nFGd0JZKX/MT6 kWiWWd8srolOCwvZ+gElXFmkSCCG11vmDcqX2qdNtHJpHgjHUashP3dFWooMIUSmg4I9wJwgVLV P9j6NsKZ9TtIVc5HPRUSdgYOlKGzgVzuGVN3n7dr3Qw== X-Received: by 2002:a05:6214:212b:: with SMTP id r11mr1063544qvc.18.1644880576774; Mon, 14 Feb 2022 15:16:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxF8CINiR2ZlfevqNs8oABZVGbnBulQDltg/gOrVEB4xERbihcvdSty4nMsa+tqUmcTprc0MA== X-Received: by 2002:a05:6214:212b:: with SMTP id r11mr1063525qvc.18.1644880576379; Mon, 14 Feb 2022 15:16:16 -0800 (PST) Received: from localhost.localdomain ([71.217.161.186]) by smtp.gmail.com with ESMTPSA id h13sm3389428qkm.38.2022.02.14.15.16.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 15:16:15 -0800 (PST) From: Jeff Lane To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] hwmon: (k10temp) Support up to 12 CCDs on AMD Family of processors Date: Mon, 14 Feb 2022 18:16:10 -0500 Message-Id: <20220214231611.4017202-3-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 The current driver can read the temperatures from upto 8 CCDs (Core-Complex Die). The newer AMD Family 19h Models 10h-1Fh and A0h-AFh can support up to 12 CCDs. Update the driver to read up to 12 CCDs. Signed-off-by: Babu Moger Link: https://lore.kernel.org/r/163776976762.904164.5618896687524494215.stgit@bmoger-ubuntu Signed-off-by: Guenter Roeck (cherry picked from commit 8bb050cd5cf494f3d0cb45a6b54a476af09edb8d) Signed-off-by: Jeff Lane --- drivers/hwmon/k10temp.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 662bad7ed0a2..59d9dfe9365b 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -171,6 +171,10 @@ static const char *k10temp_temp_label[] = { "Tccd6", "Tccd7", "Tccd8", + "Tccd9", + "Tccd10", + "Tccd11", + "Tccd12", }; static int k10temp_read_labels(struct device *dev, @@ -206,7 +210,7 @@ static int k10temp_read_temp(struct device *dev, u32 attr, int channel, if (*val < 0) *val = 0; break; - case 2 ... 9: /* Tccd{1-8} */ + case 2 ... 13: /* Tccd{1-12} */ amd_smn_read(amd_pci_dev_to_node_id(data->pdev), ZEN_CCD_TEMP(data->ccd_offset, channel - 2), ®val); @@ -341,6 +345,10 @@ static const struct hwmon_channel_info *k10temp_info[] = { HWMON_T_INPUT | HWMON_T_LABEL, HWMON_T_INPUT | HWMON_T_LABEL, HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, HWMON_T_INPUT | HWMON_T_LABEL), NULL }; @@ -437,6 +445,11 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) data->ccd_offset = 0x300; k10temp_get_ccd_support(pdev, data, 8); break; + case 0x10 ... 0x1f: + case 0xa0 ... 0xaf: + data->ccd_offset = 0x300; + k10temp_get_ccd_support(pdev, data, 12); + break; } } else { data->read_htcreg = read_htcreg_pci;