Skip to content

Commit d2d71bf

Browse files
committed
Merge: Update amd-hsmp driver
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4506 JIRA: https://issues.redhat.com/browse/RHEL-43368 Signed-off-by: David Arcari <darcari@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Prarit Bhargava <prarit@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 49c2cfd + 35c038e commit d2d71bf

File tree

3 files changed

+508
-128
lines changed

3 files changed

+508
-128
lines changed

arch/x86/include/uapi/asm/amd_hsmp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static const struct hsmp_msg_desc hsmp_msg_desc_table[] = {
238238
/*
239239
* HSMP_GET_DIMM_THERMAL, num_args = 1, response_sz = 1
240240
* input: args[0] = DIMM address[7:0]
241-
* output: args[0] = temperature in degree celcius[31:21] + update rate in ms[16:8] +
241+
* output: args[0] = temperature in degree celsius[31:21] + update rate in ms[16:8] +
242242
* DIMM address[7:0]
243243
*/
244244
{1, 1, HSMP_GET},

drivers/platform/x86/amd/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source "drivers/platform/x86/amd/pmc/Kconfig"
88

99
config AMD_HSMP
1010
tristate "AMD HSMP Driver"
11-
depends on AMD_NB && X86_64
11+
depends on AMD_NB && X86_64 && ACPI
1212
help
1313
The driver provides a way for user space tools to monitor and manage
1414
system management functionality on EPYC server CPUs from AMD.

0 commit comments

Comments
 (0)