timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-04-24 12:00:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

device_probe.py: Fix NVMe handling (part 2)

Browse Source
This commit is contained in:
Dhinak G
2023-07-17 17:51:02 -04:00
parent c19cbd9f41
commit 74857b1d16
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
resources/device_probe.py
View File

@@ -259,6 +259,17 @@ class NVMeController(PCIDevice):
aspm: Optional[int] = None aspm: Optional[int] = None
# parent_aspm: Optional[int] = None # parent_aspm: Optional[int] = None
@classmethod
def from_ioregistry(cls, entry: ioreg.io_registry_entry_t, anti_spoof=True):
device = super().from_ioregistry(entry, anti_spoof=anti_spoof)
device.aspm: Union[int, bytes] = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, "pci-aspm-default", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)) or 0 # type: ignore
if isinstance(device.aspm, bytes):
device.aspm = int.from_bytes(device.aspm, byteorder="little")
return device
@dataclass @dataclass
class EthernetController(PCIDevice): class EthernetController(PCIDevice):
CLASS_CODE: ClassVar[int] = 0x020000 CLASS_CODE: ClassVar[int] = 0x020000
@@ -805,20 +816,9 @@ class Computer:
ioreg.IOObjectRelease(device) ioreg.IOObjectRelease(device)
for device in nvme_controllers: for device in nvme_controllers:
parent = ioreg.IORegistryEntryGetParentEntry(device, "IOService".encode(), None)[1] self.storage.append(NVMeController.from_ioregistry(device))
ioreg.IOObjectRelease(device) ioreg.IOObjectRelease(device)
aspm: Union[int, bytes] = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(parent, "pci-aspm-default", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)) or 0 # type: ignore
if isinstance(aspm, bytes):
aspm = int.from_bytes(aspm, byteorder="little")
controller = NVMeController.from_ioregistry(parent)
controller.aspm = aspm
self.storage.append(controller)
ioreg.IOObjectRelease(parent)
def smbios_probe(self): def smbios_probe(self):
# Reported model # Reported model
entry = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceMatching("IOPlatformExpertDevice".encode()), None)[1])) entry = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceMatching("IOPlatformExpertDevice".encode()), None)[1]))