From 2145dd835be9778d8e660e0d5f23d2b65ae80987 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 11 Oct 2022 11:03:58 -0600 Subject: [PATCH] SMBIOS: Sync data for Ventura --- data/smbios_data.py | 91 +++++++++++++++++++----------------- resources/generate_smbios.py | 24 +++------- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/data/smbios_data.py b/data/smbios_data.py index 531cd1b7d..91d597789 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -14,6 +14,9 @@ # Switchable GPUs: If model uses a GMUX # Stock GPUs: GPUs variations shipped +# Reference: +# https://github.com/acidanthera/OpenCorePkg/blob/master/Library/OcMacInfoLib/AutoGenerated.c + from resources import device_probe from data import cpu_data, os_data, bluetooth_data @@ -225,7 +228,7 @@ smbios_dictionary = { }, "MacBook9,1": { "Board ID": "Mac-9AE82516C7C6B903", - "FirmwareFeatures": "0xFC0FE13F", + "FirmwareFeatures": "0x8FC0FE13F", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -242,7 +245,7 @@ smbios_dictionary = { }, "MacBook10,1": { "Board ID": "Mac-EE2EBD4B90B839A8", - "FirmwareFeatures": "0xFC0FE13F", + "FirmwareFeatures": "0x8FC0FE13F", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -432,7 +435,7 @@ smbios_dictionary = { }, "MacBookAir7,1": { "Board ID": "Mac-9F18E312C5C2BF0B", - "FirmwareFeatures": "0xFF0FF576", + "FirmwareFeatures": "0x8FF0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, "Max OS Supported": os_data.os_data.monterey, @@ -449,7 +452,7 @@ smbios_dictionary = { }, "MacBookAir7,2": { "Board ID": "Mac-937CB26E2E02BB01", - "FirmwareFeatures": "0xFF0FF576", + "FirmwareFeatures": "0x8FF0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, "Max OS Supported": os_data.os_data.monterey, @@ -466,7 +469,7 @@ smbios_dictionary = { }, "MacBookAir8,1": { "Board ID": "Mac-827FAC58A8FDFA22", - "FirmwareFeatures": "0xFD8FF42E", + "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "j140k", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -483,7 +486,7 @@ smbios_dictionary = { }, "MacBookAir8,1_v2": { "Board ID": "Mac-112818653D3AABFC", - "FirmwareFeatures": "0xFD8FF42E", + "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "j140k", # TODO: Verify "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -502,7 +505,7 @@ smbios_dictionary = { # AppleInternal MacBookAir8,1 # True Model unknown "Board ID": "Mac-827FAC58A8FDFA22", - "FirmwareFeatures": "0xFD8FF42E", + "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "x589amlu", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -519,7 +522,7 @@ smbios_dictionary = { }, "MacBookAir8,2": { "Board ID": "Mac-226CB3C6A851A671", - "FirmwareFeatures": "0xFD8FF42E", + "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "j140a", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -536,7 +539,7 @@ smbios_dictionary = { }, "MacBookAir9,1": { "Board ID": "Mac-0CFF9C7C2B63DF8D", - "FirmwareFeatures": "0xFFAFF06E", + "FirmwareFeatures": "0x8FFAFF06E", "SecureBootModel": "j230k", "CPU Generation": cpu_data.cpu_data.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -555,7 +558,7 @@ smbios_dictionary = { # AppleInternal MacBookAir9,1 # True Model unknown "Board ID": "Mac-0CFF9C7C2B63DF8D", - "FirmwareFeatures": "0xFFAFF06E", + "FirmwareFeatures": "0x8FFAFF06E", "SecureBootModel": "x589icly", "CPU Generation": cpu_data.cpu_data.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1111,7 +1114,7 @@ smbios_dictionary = { }, "MacBookPro11,4": { "Board ID": "Mac-06F11FD93F0323C5", - "FirmwareFeatures": "0xEB0FF577", + "FirmwareFeatures": "0x8EB0FF577", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.haswell.value, "Max OS Supported": os_data.os_data.monterey, @@ -1128,7 +1131,7 @@ smbios_dictionary = { }, "MacBookPro11,5": { "Board ID": "Mac-06F11F11946D27C5", - "FirmwareFeatures": "0xEB0FF577", + "FirmwareFeatures": "0x8EB0FF577", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.haswell.value, "Max OS Supported": os_data.os_data.monterey, @@ -1147,7 +1150,7 @@ smbios_dictionary = { }, "MacBookPro12,1": { "Board ID": "Mac-E43C1C25D4880AD6", - "FirmwareFeatures": "0xFD0FF576", + "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, "Max OS Supported": os_data.os_data.monterey, @@ -1164,7 +1167,7 @@ smbios_dictionary = { }, "MacBookPro13,1": { "Board ID": "Mac-473D31EABEB93F9B", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -1181,7 +1184,7 @@ smbios_dictionary = { }, "MacBookPro13,2": { "Board ID": "Mac-66E35819EE2D0D05", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -1198,7 +1201,7 @@ smbios_dictionary = { }, "MacBookPro13,3": { "Board ID": "Mac-A5C67F76ED83108C", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -1217,7 +1220,7 @@ smbios_dictionary = { }, "MacBookPro14,1": { "Board ID": "Mac-B4831CEBD52A0C4C", - "FirmwareFeatures": "0xFF0FF57E", + "FirmwareFeatures": "0x8FF0FF57E", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1234,7 +1237,7 @@ smbios_dictionary = { }, "MacBookPro14,2": { "Board ID": "Mac-CAD6701F7CEA0921", - "FirmwareFeatures": "0xFF0FF57E", + "FirmwareFeatures": "0x8FF0FF57E", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1251,7 +1254,7 @@ smbios_dictionary = { }, "MacBookPro14,3": { "Board ID": "Mac-551B86E5744E2388", - "FirmwareFeatures": "0xFF0FF57E", + "FirmwareFeatures": "0x8FF0FF57E", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1270,7 +1273,7 @@ smbios_dictionary = { }, "MacBookPro15,1": { "Board ID": "Mac-937A206F2EE63C01", - "FirmwareFeatures": "0xFD8FF426", + "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j680", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1289,7 +1292,7 @@ smbios_dictionary = { }, "MacBookPro15,2": { "Board ID": "Mac-827FB448E656EC26", - "FirmwareFeatures": "0xFD8FF426", + "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j132", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1306,7 +1309,7 @@ smbios_dictionary = { }, "MacBookPro15,3": { "Board ID": "Mac-1E7E29AD0135F9BC", - "FirmwareFeatures": "0xFD8FF426", + "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j780", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1325,7 +1328,7 @@ smbios_dictionary = { }, "MacBookPro15,4": { "Board ID": "Mac-53FDB3D8DB8CA971", - "FirmwareFeatures": "0xFD8FF426", + "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j213", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1342,7 +1345,7 @@ smbios_dictionary = { }, "MacBookPro16,1": { "Board ID": "Mac-E1008331FDC96864", - "FirmwareFeatures": "0xFDAFF066", + "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j152f", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1361,7 +1364,7 @@ smbios_dictionary = { }, "MacBookPro16,2": { "Board ID": "Mac-5F9802EFE386AA28", - "FirmwareFeatures": "0xFFAFF06E", + "FirmwareFeatures": "0x8FFFFFF7F", "SecureBootModel": "j214k", "CPU Generation": cpu_data.cpu_data.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1378,7 +1381,7 @@ smbios_dictionary = { }, "MacBookPro16,3": { "Board ID": "Mac-E7203C0F68AA0004", - "FirmwareFeatures": "0xFDAFF066", + "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j223", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1395,7 +1398,7 @@ smbios_dictionary = { }, "MacBookPro16,4": { "Board ID": "Mac-A61BADE1FDAD7B05", - "FirmwareFeatures": "0xFDAFF066", + "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j215", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -1638,7 +1641,7 @@ smbios_dictionary = { }, "Macmini7,1": { "Board ID": "Mac-35C5E08120C7EEAF", - "FirmwareFeatures": "0xE00DE137", + "FirmwareFeatures": "0x8E00DE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.haswell.value, "Max OS Supported": os_data.os_data.monterey, @@ -1655,7 +1658,7 @@ smbios_dictionary = { }, "Macmini8,1": { "Board ID": "Mac-7BA5B2DFE22DDD8C", - "FirmwareFeatures": "0xFD8FF466", + "FirmwareFeatures": "0x8FD8FF466", "SecureBootModel": "j174", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2254,7 +2257,7 @@ smbios_dictionary = { }, "iMac16,1": { "Board ID": "Mac-A369DDC4E67F1C45", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, "Max OS Supported": os_data.os_data.monterey, @@ -2271,7 +2274,7 @@ smbios_dictionary = { }, "iMac16,2": { "Board ID": "Mac-FFE5EF870D7BA81A", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, "Max OS Supported": os_data.os_data.monterey, @@ -2288,7 +2291,7 @@ smbios_dictionary = { }, "iMac17,1": { "Board ID": "Mac-DB15BD556843C820", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -2308,7 +2311,7 @@ smbios_dictionary = { }, "iMac17,1_v2": { "Board ID": "Mac-65CE76090165799A", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -2328,7 +2331,7 @@ smbios_dictionary = { }, "iMac17,1_v3": { "Board ID": "Mac-B809C3757DA9BB8D", - "FirmwareFeatures": "0xFC0FE137", + "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, "Max OS Supported": os_data.os_data.monterey, @@ -2348,7 +2351,7 @@ smbios_dictionary = { }, "iMac18,1": { "Board ID": "Mac-4B682C642B45593E", - "FirmwareFeatures": "0xFD0FF576", + "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2365,7 +2368,7 @@ smbios_dictionary = { }, "iMac18,2": { "Board ID": "Mac-77F17D7DA9285301", - "FirmwareFeatures": "0xFD0FF576", + "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2383,7 +2386,7 @@ smbios_dictionary = { }, "iMac18,3": { "Board ID": "Mac-BE088AF8C5EB4FA2", - "FirmwareFeatures": "0xFD0FF576", + "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2402,7 +2405,7 @@ smbios_dictionary = { }, "iMac19,1": { "Board ID": "Mac-AA95B1DDAB278B95", - "FirmwareFeatures": "0xFD8FF576", + "FirmwareFeatures": "0x8FD8FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2423,7 +2426,7 @@ smbios_dictionary = { "AAPL_iMac19,1": { # AppleInternal iMac19,1 unit "Board ID": "Mac-CF21D135A7D34AA6", - "FirmwareFeatures": "0xFD8FF576", + "FirmwareFeatures": "0x8FD8FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2443,7 +2446,7 @@ smbios_dictionary = { }, "iMac19,2": { "Board ID": "Mac-63001698E7A34814", - "FirmwareFeatures": "0xFD8FF576", + "FirmwareFeatures": "0x8FD8FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2462,7 +2465,7 @@ smbios_dictionary = { }, "iMac20,1": { "Board ID": "Mac-CFF7D910A743CAAF", - "FirmwareFeatures": "0xFD8FF576", + "FirmwareFeatures": "0x8FFB3F066", "SecureBootModel": "j185", "CPU Generation": cpu_data.cpu_data.comet_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2480,7 +2483,7 @@ smbios_dictionary = { }, "iMac20,2": { "Board ID": "Mac-AF89B6D9451A490B", - "FirmwareFeatures": "0xFD8FF576", + "FirmwareFeatures": "0x8FFB3F066", "SecureBootModel": "j185f", "CPU Generation": cpu_data.cpu_data.comet_lake.value, "Max OS Supported": os_data.os_data.max_os, @@ -2638,7 +2641,7 @@ smbios_dictionary = { }, "MacPro6,1": { "Board ID": "Mac-F60DEB81FF30ACF6", - "FirmwareFeatures": "0xE90FF576", + "FirmwareFeatures": "0x8E90FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, "Max OS Supported": os_data.os_data.monterey, @@ -2654,7 +2657,7 @@ smbios_dictionary = { }, "MacPro7,1": { "Board ID": "Mac-27AD2F918AE68F61", - "FirmwareFeatures": "0xFDAFF066", + "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j160", "CPU Generation": cpu_data.cpu_data.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, diff --git a/resources/generate_smbios.py b/resources/generate_smbios.py index 5377ebb7b..82b0c66d8 100644 --- a/resources/generate_smbios.py +++ b/resources/generate_smbios.py @@ -7,31 +7,21 @@ def set_smbios_model_spoof(model): smbios_data.smbios_dictionary[model]["Screen Size"] # Found mobile SMBIOS if model.startswith("MacBookAir"): - if smbios_data.smbios_dictionary[model]["Screen Size"] == 13: - return "MacBookAir7,2" - elif smbios_data.smbios_dictionary[model]["Screen Size"] == 11: - return "MacBookAir7,1" - else: - # Unknown Model - raise Exception(f"Unknown SMBIOS for spoofing: {model}") + return "MacBookAir8,1" elif model.startswith("MacBookPro"): if smbios_data.smbios_dictionary[model]["Screen Size"] == 13: - return "MacBookPro12,1" + return "MacBookPro14,1" elif smbios_data.smbios_dictionary[model]["Screen Size"] >= 15: # 15" and 17" - try: - smbios_data.smbios_dictionary[model]["Switchable GPUs"] - return "MacBookPro11,5" - except KeyError: - return "MacBookPro11,4" + return "MacBookPro14,3" else: # Unknown Model raise Exception(f"Unknown SMBIOS for spoofing: {model}") elif model.startswith("MacBook"): if smbios_data.smbios_dictionary[model]["Screen Size"] == 13: - return "MacBookAir7,2" + return "MacBookAir8,1" elif smbios_data.smbios_dictionary[model]["Screen Size"] == 12: - return "MacBook9,1" + return "MacBook10,1" else: # Unknown Model raise Exception(f"Unknown SMBIOS for spoofing: {model}") @@ -43,13 +33,13 @@ def set_smbios_model_spoof(model): if model.startswith("MacPro") or model.startswith("Xserve"): return "MacPro7,1" elif model.startswith("Macmini"): - return "Macmini7,1" + return "Macmini8,1" elif model.startswith("iMac"): if smbios_data.smbios_dictionary[model]["Max OS Supported"] <= os_data.os_data.high_sierra: # Models dropped in Mojave either do not have an iGPU, or should have them disabled return "iMacPro1,1" else: - return "iMac17,1" + return "iMac18,3" else: # Unknown Model raise Exception(f"Unknown SMBIOS for spoofing: {model}")