ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-23 15:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dde_linux: test subdevice id for device matching

Browse Source 
As linux drivers may distinguish device configuration by pci subdevice id in
addition to the pci device id, the former must also be used for finding the
matching entry. Otherwise, e.g., the iwlwifi driver might load the wrong
firmware.

Side note: Add break statement to save superfluous iterations after
match was identified.

Fixes genodelabs#4076
This commit is contained in:
Johannes Schlatow 2021-04-16 10:14:16 +02:00 committed by Norman Feske
parent ace7c9172b
commit 462bff5aef
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
repos/dde_linux/src/include/lx_emul/impl/pci.h
View File

@ -37,12 +37,17 @@ extern "C" int pci_register_driver(struct pci_driver *driver)
/* request device ID from platform driver */
unsigned const device_id = client.device_id();
unsigned const subdevice_id = client.config_read(0x2e,
Platform::Device::ACCESS_16BIT);
/* look if we find the device ID in the driver's 'id_table' */
pci_device_id const *matching_id = nullptr;
for (pci_device_id const *id = id_table; id->device; id++) {
if (id->device == device_id)
if ((id->device == device_id) &&
(id->subdevice == PCI_ANY_ID || id->subdevice == subdevice_id)) {
matching_id = id;
break;
}
}
/* skip device that is not handled by driver */