From: Guenter Roeck <linux@roeck-us.net>
To: Avadhut Naik <avadhut.naik@amd.com>,
bp@alien8.de, x86@kernel.org, linux-hwmon@vger.kernel.org,
linux-edac@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, mario.limonciello@amd.com,
yazen.ghannam@amd.com, avadnaik@amd.com
Subject: Re: [PATCH v1 2/3] hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models
Date: Thu, 6 Jul 2023 10:31:13 -0700 [thread overview]
Message-ID: <364e0970-e047-59e6-7b75-c5b43b32270a@roeck-us.net> (raw)
In-Reply-To: <20230706171323.3722900-3-avadhut.naik@amd.com>
On 7/6/23 10:13, Avadhut Naik wrote:
> From: Avadhut Naik <Avadhut.Naik@amd.com>
>
> Add thermal info support for AMD Family 1Ah-based models. Support is
> provided on a per-socket granularity.
>
> Co-developed-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/hwmon/k10temp.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index 7b177b9fbb09..c61837fbc315 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);
> #define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET 0xd8200c64
> #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET 0xd8200ca4
>
> -/* Common for Zen CPU families (Family 17h and 18h and 19h) */
> +/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */
> #define ZEN_REPORTED_TEMP_CTRL_BASE 0x00059800
>
> #define ZEN_CCD_TEMP(offset, x) (ZEN_REPORTED_TEMP_CTRL_BASE + \
> @@ -462,6 +462,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> k10temp_get_ccd_support(pdev, data, 12);
> break;
> }
> + } else if (boot_cpu_data.x86 == 0x1a) {
> + data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;
> + data->read_tempreg = read_tempreg_nb_zen;
> + data->is_zen = true;
> } else {
> data->read_htcreg = read_htcreg_pci;
> data->read_tempreg = read_tempreg_pci;
> @@ -508,6 +512,8 @@ static const struct pci_device_id k10temp_id_table[] = {
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
> { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
> {}
> };
next prev parent reply other threads:[~2023-07-06 17:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 17:13 [PATCH v1 0/3] Updates for AMD Family 1Ah-based Models Avadhut Naik
2023-07-06 17:13 ` [PATCH v1 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik
2023-07-06 17:13 ` [PATCH v1 2/3] hwmon: (k10temp) Add thermal support " Avadhut Naik
2023-07-06 17:31 ` Guenter Roeck [this message]
2023-07-06 17:13 ` [PATCH v1 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh Avadhut Naik
2023-08-04 0:25 ` Yazen Ghannam
2023-08-04 16:03 ` Limonciello, Mario
2023-08-07 13:48 ` Yazen Ghannam
2023-08-08 22:08 ` Avadhut Naik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=364e0970-e047-59e6-7b75-c5b43b32270a@roeck-us.net \
--to=linux@roeck-us.net \
--cc=avadhut.naik@amd.com \
--cc=avadnaik@amd.com \
--cc=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=x86@kernel.org \
--cc=yazen.ghannam@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).