diff --git a/patches.kernel.org/6.2.12-089-hwmon-peci-cputemp-Fix-miscalculated-DTS-for-S.patch b/patches.kernel.org/6.2.12-089-hwmon-peci-cputemp-Fix-miscalculated-DTS-for-S.patch new file mode 100644 index 0000000..7c0df4b --- /dev/null +++ b/patches.kernel.org/6.2.12-089-hwmon-peci-cputemp-Fix-miscalculated-DTS-for-S.patch @@ -0,0 +1,52 @@ +From: Iwona Winiarska +Date: Tue, 21 Mar 2023 10:04:10 +0100 +Subject: [PATCH] hwmon: (peci/cputemp) Fix miscalculated DTS for SKX +References: bsc#1012628 +Patch-mainline: 6.2.12 +Git-commit: 2b91c4a870c9830eaf95e744454c9c218cccb736 + +[ Upstream commit 2b91c4a870c9830eaf95e744454c9c218cccb736 ] + +For Skylake, DTS temperature of the CPU is reported in S10.6 format +instead of S8.8. + +Reported-by: Paul Fertser +Link: https://lore.kernel.org/lkml/ZBhHS7v+98NK56is@home.paul.comp/ +Signed-off-by: Iwona Winiarska +Link: https://lore.kernel.org/r/20230321090410.866766-1-iwona.winiarska@intel.com +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +Signed-off-by: Jiri Slaby +--- + drivers/hwmon/peci/cputemp.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/hwmon/peci/cputemp.c b/drivers/hwmon/peci/cputemp.c +index 30850a47..87d56f0f 100644 +--- a/drivers/hwmon/peci/cputemp.c ++++ b/drivers/hwmon/peci/cputemp.c +@@ -537,6 +537,12 @@ static const struct cpu_info cpu_hsx = { + .thermal_margin_to_millidegree = &dts_eight_dot_eight_to_millidegree, + }; + ++static const struct cpu_info cpu_skx = { ++ .reg = &resolved_cores_reg_hsx, ++ .min_peci_revision = 0x33, ++ .thermal_margin_to_millidegree = &dts_ten_dot_six_to_millidegree, ++}; ++ + static const struct cpu_info cpu_icx = { + .reg = &resolved_cores_reg_icx, + .min_peci_revision = 0x40, +@@ -558,7 +564,7 @@ static const struct auxiliary_device_id peci_cputemp_ids[] = { + }, + { + .name = "peci_cpu.cputemp.skx", +- .driver_data = (kernel_ulong_t)&cpu_hsx, ++ .driver_data = (kernel_ulong_t)&cpu_skx, + }, + { + .name = "peci_cpu.cputemp.icx", +-- +2.35.3 + diff --git a/series.conf b/series.conf index 221ce4a..2b25de9 100644 --- a/series.conf +++ b/series.conf @@ -2316,6 +2316,7 @@ patches.kernel.org/6.2.12-086-block-ublk_drv-mark-device-as-LIVE-before-addi.patch patches.kernel.org/6.2.12-087-ACPI-video-Add-backlight-native-DMI-quirk-for-.patch patches.kernel.org/6.2.12-088-drm-panel-orientation-quirks-Add-quirk-for-Len.patch + patches.kernel.org/6.2.12-089-hwmon-peci-cputemp-Fix-miscalculated-DTS-for-S.patch ######################################################## # Build fixes that apply to the vanilla kernel too.