diff --git a/throttled.py b/throttled.py index 1590edf..ac1b037 100755 --- a/throttled.py +++ b/throttled.py @@ -86,85 +86,85 @@ thermal_status_bits = { } supported_cpus = { - (6, 26, 1): 'Nehalem', - (6, 26, 2): 'Nehalem-EP', - (6, 26, 4): 'Bloomfield', - (6, 28, 2): 'Silverthorne', - (6, 28, 10): 'PineView', - (6, 29, 0): 'Dunnington-6C', - (6, 29, 1): 'Dunnington', - (6, 30, 0): 'Lynnfield', - (6, 30, 5): 'Lynnfield_CPUID', - (6, 31, 1): 'Auburndale', - (6, 37, 2): 'Clarkdale', - (6, 38, 1): 'TunnelCreek', - (6, 39, 2): 'Medfield', - (6, 42, 2): 'SandyBridge', - (6, 42, 6): 'SandyBridge', - (6, 42, 7): 'Sandy Bridge-DT', - (6, 44, 1): 'Westmere-EP', - (6, 44, 2): 'Gulftown', - (6, 45, 5): 'Sandy Bridge-EP', - (6, 45, 6): 'Sandy Bridge-E', - (6, 46, 4): 'Beckton', - (6, 46, 5): 'Beckton', - (6, 46, 6): 'Beckton', - (6, 47, 2): 'Eagleton', - (6, 53, 1): 'Cloverview', - (6, 54, 1): 'Cedarview-D', - (6, 54, 9): 'Centerton', - (6, 55, 3): 'Bay Trail-D', - (6, 55, 8): 'Silvermont', - (6, 58, 9): 'Ivy Bridge-DT', - (6, 60, 3): 'Haswell-DT', - (6, 61, 4): 'Broadwell-U', - (6, 62, 3): 'IvyBridgeEP', - (6, 62, 4): 'Ivy Bridge-E', - (6, 63, 2): 'Haswell-EP', - (6, 69, 1): 'HaswellULT', - (6, 70, 1): 'Crystal Well-DT', - (6, 71, 1): 'Broadwell-H', - (6, 76, 3): 'Braswell', - (6, 77, 8): 'Avoton', - (6, 78, 3): 'Skylake', - (6, 79, 1): 'BroadwellE', - (6, 85, 4): 'SkylakeXeon', - (6, 85, 6): 'CascadeLakeSP', - (6, 85, 7): 'CascadeLakeXeon2', - (6, 86, 2): 'BroadwellDE', - (6, 86, 4): 'BroadwellDE', - (6, 87, 0): 'KnightsLanding', - (6, 87, 1): 'KnightsLanding', - (6, 90, 0): 'Moorefield', - (6, 92, 9): 'Apollo Lake', - (6, 93, 1): 'SoFIA', - (6, 94, 0): 'Skylake', - (6, 94, 3): 'Skylake-S', - (6, 95, 1): 'Denverton', - (6, 102, 3): 'Cannon Lake-U', - (6, 117, 10): 'Spreadtrum', - (6, 122, 1): 'Gemini Lake-D', - (6, 122, 8): 'GoldmontPlus', - (6, 126, 5): 'IceLakeY', - (6, 138, 1): 'Lakefield', - (6, 140, 1): 'TigerLake', - (6, 141, 1): 'TigerLake', - (6, 142, 9): 'Kabylake', - (6, 142, 10): 'Kabylake', - (6, 142, 11): 'WhiskeyLake', - (6, 142, 12): 'Comet Lake-U', + #(6, 26, 1): 'Nehalem', + #(6, 26, 2): 'Nehalem-EP', + #(6, 26, 4): 'Bloomfield', + #(6, 28, 2): 'Silverthorne', + #(6, 28, 10): 'PineView', + #(6, 29, 0): 'Dunnington-6C', + #(6, 29, 1): 'Dunnington', + #(6, 30, 0): 'Lynnfield', + #(6, 30, 5): 'Lynnfield_CPUID', + #(6, 31, 1): 'Auburndale', + #(6, 37, 2): 'Clarkdale', + #(6, 38, 1): 'TunnelCreek', + #(6, 39, 2): 'Medfield', + #(6, 42, 2): 'SandyBridge', + #(6, 42, 6): 'SandyBridge', + #(6, 42, 7): 'Sandy Bridge-DT', + #(6, 44, 1): 'Westmere-EP', + #(6, 44, 2): 'Gulftown', + #(6, 45, 5): 'Sandy Bridge-EP', + #(6, 45, 6): 'Sandy Bridge-E', + #(6, 46, 4): 'Beckton', + #(6, 46, 5): 'Beckton', + #(6, 46, 6): 'Beckton', + #(6, 47, 2): 'Eagleton', + #(6, 53, 1): 'Cloverview', + #(6, 54, 1): 'Cedarview-D', + #(6, 54, 9): 'Centerton', + #(6, 55, 3): 'Bay Trail-D', + #(6, 55, 8): 'Silvermont', + #(6, 58, 9): 'Ivy Bridge-DT', + #(6, 60, 3): 'Haswell-DT', + #(6, 61, 4): 'Broadwell-U', + #(6, 62, 3): 'IvyBridgeEP', + #(6, 62, 4): 'Ivy Bridge-E', + #(6, 63, 2): 'Haswell-EP', + #(6, 69, 1): 'HaswellULT', + #(6, 70, 1): 'Crystal Well-DT', + #(6, 71, 1): 'Broadwell-H', + #(6, 76, 3): 'Braswell', + #(6, 77, 8): 'Avoton', + #(6, 78, 3): 'Skylake', + #(6, 79, 1): 'BroadwellE', + #(6, 85, 4): 'SkylakeXeon', + #(6, 85, 6): 'CascadeLakeSP', + #(6, 85, 7): 'CascadeLakeXeon2', + #(6, 86, 2): 'BroadwellDE', + #(6, 86, 4): 'BroadwellDE', + #(6, 87, 0): 'KnightsLanding', + #(6, 87, 1): 'KnightsLanding', + #(6, 90, 0): 'Moorefield', + #(6, 92, 9): 'Apollo Lake', + #(6, 93, 1): 'SoFIA', + #(6, 94, 0): 'Skylake', + #(6, 94, 3): 'Skylake-S', + #(6, 95, 1): 'Denverton', + #(6, 102, 3): 'Cannon Lake-U', + #(6, 117, 10): 'Spreadtrum', + #(6, 122, 1): 'Gemini Lake-D', + #(6, 122, 8): 'GoldmontPlus', + #(6, 126, 5): 'IceLakeY', + #(6, 138, 1): 'Lakefield', + #(6, 140, 1): 'TigerLake', + #(6, 141, 1): 'TigerLake', + #(6, 142, 9): 'Kabylake', + #(6, 142, 10): 'Kabylake', + #(6, 142, 11): 'WhiskeyLake', + #(6, 142, 12): 'Comet Lake-U', (6, 154, 3): 'AlderLake', - (6, 156, 0): 'JasperLake', - (6, 158, 9): 'KabylakeG', - (6, 158, 10): 'Coffeelake', - (6, 158, 11): 'Coffeelake', - (6, 158, 12): 'CoffeeLake', - (6, 158, 13): 'CoffeeLake', - (6, 165, 2): 'CometLake', - (6, 165, 4): 'CometLake', - (6, 165, 5): 'Comet Lake-S', - (6, 166, 0): 'CometLake', - (6, 167, 1): 'RocketLake', + #(6, 156, 0): 'JasperLake', + #(6, 158, 9): 'KabylakeG', + #(6, 158, 10): 'Coffeelake', + #(6, 158, 11): 'Coffeelake', + #(6, 158, 12): 'CoffeeLake', + #(6, 158, 13): 'CoffeeLake', + #(6, 165, 2): 'CometLake', + #(6, 165, 4): 'CometLake', + #(6, 165, 5): 'Comet Lake-S', + #(6, 166, 0): 'CometLake', + #(6, 167, 1): 'RocketLake', } TESTMSR = False @@ -682,7 +682,7 @@ def reload_config(): def power_thread(config, regs, exit_event): try: - mchbar_mmio = MMIO(0xFED159A0, 8) + mchbar_mmio = MMIO(0xFEDC59A0, 8) #0xFEDC0000 is the correct offfset for 12th gen CPUs except MMIOError: warning('Unable to open /dev/mem. TDP override might not work correctly.') warning('Try to disable Secure Boot and/or enable CONFIG_DEVMEM in kernel config.')