erpalma/throttled
1
0
Fork 0
mirror of https://github.com/erpalma/throttled.git synced 2026-01-03 07:09:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MSR string to int conversion in fatal method call in writemsr and readmsr (fix #252)

Browse source
This commit is contained in:
Francesco Palmarini 2021-05-10 20:46:45 +02:00 committed by GitHub
parent dbcef1e91a
commit 1f4f5525e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lenovo_fix.py
View file

@ -223,11 +223,11 @@ def writemsr(msr, val):
except (IOError, OSError) as e:
if e.errno == EPERM or e.errno == EACCES:
fatal(
'Unable to write to MSR {:x}. Try to disable Secure Boot '
'and check if your kernel does not restrict access to MSR.'.format(msr)
'Unable to write to MSR {} ({:x}). Try to disable Secure Boot '
'and check if your kernel does not restrict access to MSR.'.format(msr, MSR_DICT[msr])
)
elif e.errno == EIO:
fatal('Unable to write to MSR {:x}. Unknown error.'.format(msr))
fatal('Unable to write to MSR {} ({:x}). Unknown error.'.format(msr, MSR_DICT[msr]))
else:
raise e
@ -253,14 +253,14 @@ def readmsr(msr, from_bit=0, to_bit=63, cpu=None, flatten=False):
output.append(get_value_for_bits(val, from_bit, to_bit))
if flatten:
if len(set(output)) > 1:
warning('Found multiple values for {:s} (0x{:x}). This should never happen.')
warning('Found multiple values for {:s} ({:x}). This should never happen.'.format(msr, MSR_DICT[msr]))
return output[0]
return output[cpu] if cpu is not None else output
except (IOError, OSError) as e:
if e.errno == EPERM or e.errno == EACCES:
fatal('Unable to read from MSR {:x}. Try to disable Secure Boot.'.format(msr))
fatal('Unable to read from MSR {} ({:x}). Try to disable Secure Boot.'.format(msr, MSR_DICT[msr]))
elif e.errno == EIO:
fatal('Unable to read to MSR {:x}. Unknown error.'.format(msr))
fatal('Unable to read to MSR {} ({:x}). Unknown error.'.format(msr, MSR_DICT[msr]))
else:
raise e