* [PATCH v2] hwmon: (k10temp) Support up to 12 CCDs on AMD Family of processors
@ 2021-11-24 16:03 Babu Moger
2021-11-24 20:34 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Babu Moger @ 2021-11-24 16:03 UTC (permalink / raw)
To: clemens, jdelvare, linux; +Cc: linux-hwmon, linux-kernel
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 <babu.moger@amd.com>
---
v2:
Removed the date structure changes based on comment from Guenter.
v1:
https://lore.kernel.org/lkml/163770219414.777059.5794961910830381329.stgit@bmoger-ubuntu/
drivers/hwmon/k10temp.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 880990fa4795..4e239bd75b1d 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
};
@@ -433,12 +441,15 @@ 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;
+ 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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] hwmon: (k10temp) Support up to 12 CCDs on AMD Family of processors
2021-11-24 16:03 [PATCH v2] hwmon: (k10temp) Support up to 12 CCDs on AMD Family of processors Babu Moger
@ 2021-11-24 20:34 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2021-11-24 20:34 UTC (permalink / raw)
To: Babu Moger; +Cc: clemens, jdelvare, linux-hwmon, linux-kernel
On Wed, Nov 24, 2021 at 10:03:13AM -0600, Babu Moger wrote:
> 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 <babu.moger@amd.com>
Applied to hwmon-next.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-24 20:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-24 16:03 [PATCH v2] hwmon: (k10temp) Support up to 12 CCDs on AMD Family of processors Babu Moger
2021-11-24 20:34 ` Guenter Roeck
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).