wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kexts: pci: score driver matches, allow fallback class drivers

Browse Source
This commit is contained in:
max 🍓
2023-07-08 15:51:12 +01:00
parent 65db7cfbda
commit 9d2644ffa7
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kexts/drivers/bus/pci/driver.c
View File

@@ -1,4 +1,5 @@
#include <socks/device.h> #include <socks/device.h>
#include <socks/printk.h>
#include <socks/pci.h> #include <socks/pci.h>
static struct vm_cache pci_driver_cache = { static struct vm_cache pci_driver_cache = {
@@ -70,24 +71,37 @@ kern_status_t pci_driver_unregister(struct pci_driver *driver)
return driver_unregister(&driver->pci_base); return driver_unregister(&driver->pci_base);
} }
static bool scan_device_id_list(const struct pci_device_id *device_ids, uint16_t vendor_id, uint16_t device_id) static int scan_device_id_list(const struct pci_device_id *device_ids, const struct pci_device_id *query)
{ {
int best_score = 0;
for (unsigned int i = 0; ; i++) { for (unsigned int i = 0; ; i++) {
if (device_ids[i].pci_device_id == PCI_NONE && device_ids[i].pci_vendor_id == PCI_NONE) { if (device_ids[i].pci_device_id == PCI_NONE && device_ids[i].pci_vendor_id == PCI_NONE && device_ids[i].pci_class_id == PCI_CLASS_ANY && device_ids[i].pci_subclass_id == PCI_CLASS_ANY) {
break; break;
} }
if (device_ids[i].pci_device_id == device_id && device_ids[i].pci_vendor_id == vendor_id) { int score = 0;
return true;
if (device_ids[i].pci_class_id == query->pci_class_id && device_ids[i].pci_subclass_id == query->pci_subclass_id && device_ids[i].pci_vendor_id == PCI_NONE && device_ids[i].pci_device_id == PCI_NONE) {
score = 1;
}
if (device_ids[i].pci_device_id == query->pci_device_id && device_ids[i].pci_vendor_id == query->pci_vendor_id) {
score = 2;
}
if (score > best_score) {
best_score = score;
} }
} }
return false; return best_score;
} }
struct pci_driver *find_driver_for_pci_device(uint16_t vendor_id, uint16_t device_id) struct pci_driver *find_driver_for_pci_device(const struct pci_device_id *query)
{ {
struct pci_driver *out = NULL; struct pci_driver *best_match = NULL;
int best_score = 0;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&pci_drivers_lock, &flags); spin_lock_irqsave(&pci_drivers_lock, &flags);
@@ -98,12 +112,13 @@ struct pci_driver *find_driver_for_pci_device(uint16_t vendor_id, uint16_t devic
continue; continue;
} }
if (scan_device_id_list(device_ids, vendor_id, device_id)) { int score = scan_device_id_list(device_ids, query);
out = driver; if (score > best_score) {
break; best_score = score;
best_match = driver;
} }
} }
spin_unlock_irqrestore(&pci_drivers_lock, flags); spin_unlock_irqrestore(&pci_drivers_lock, flags);
return out; return best_match;
} }

9
kexts/drivers/bus/pci/include/socks/pci.h
View File

@@ -40,15 +40,20 @@
#define PCI_VALUE_PORT 0xCFC #define PCI_VALUE_PORT 0xCFC
#define PCI_NONE 0xFFFF #define PCI_NONE 0xFFFF
#define PCI_CLASS_ANY 0xFF
#define PCI_SUBSYSTEM_KEXT_ID "net.doorstuck.socks.pci" #define PCI_SUBSYSTEM_KEXT_ID "net.doorstuck.socks.pci"
#define PCI_DEVICE_ID(vid, did) { .pci_vendor_id = (vid), .pci_device_id = (did) } #define PCI_DEVICE_ID(vid, did) { .pci_vendor_id = (vid), .pci_device_id = (did), .pci_class_id = PCI_CLASS_ANY, .pci_subclass_id = PCI_CLASS_ANY }
#define PCI_DEVICE_ID_INVALID { .pci_vendor_id = PCI_NONE, .pci_device_id = PCI_NONE } #define PCI_CLASS_ID(cid, scid) { .pci_vendor_id = PCI_NONE, .pci_device_id = PCI_NONE, .pci_class_id = (cid), .pci_subclass_id = (scid) }
#define PCI_DEVICE_ID_FULL(vid, did, cid, scid) { .pci_vendor_id = (vid), .pci_device_id = (did), .pci_class_id = (cid), .pci_subclass_id = (scid) }
#define PCI_DEVICE_ID_INVALID PCI_DEVICE_ID_FULL(PCI_NONE, PCI_NONE, PCI_CLASS_ANY, PCI_CLASS_ANY)
struct pci_device_id { struct pci_device_id {
uint16_t pci_vendor_id; uint16_t pci_vendor_id;
uint16_t pci_device_id; uint16_t pci_device_id;
uint8_t pci_class_id;
uint8_t pci_subclass_id;
}; };
struct pci_device { struct pci_device {

10
kexts/drivers/bus/pci/main.c
View File

@@ -18,7 +18,11 @@ static void init_pci_device(uint32_t device, uint16_t vendid, uint16_t devid, vo
pci_get_slot(device), pci_get_slot(device),
pci_get_func(device)); pci_get_func(device));
printk("pci: found device %s (vend:%04x, dev:%04x)", dev->dev_name, vendid, devid); uint8_t c = pci_read_field(device, PCI_REG_CLASS, 1);
uint8_t sc = pci_read_field(device, PCI_REG_SUBCLASS, 1);
printk("pci: found device %s (vend:%04x, dev:%04x, class:%02x, subclass:%02x)",
dev->dev_name, vendid, devid, c, sc);
struct pci_device *pci_dev = kmalloc(sizeof *pci_dev, VM_NORMAL); struct pci_device *pci_dev = kmalloc(sizeof *pci_dev, VM_NORMAL);
if (!pci_dev) { if (!pci_dev) {
@@ -28,6 +32,8 @@ static void init_pci_device(uint32_t device, uint16_t vendid, uint16_t devid, vo
pci_dev->pci_id.pci_vendor_id = vendid; pci_dev->pci_id.pci_vendor_id = vendid;
pci_dev->pci_id.pci_device_id = devid; pci_dev->pci_id.pci_device_id = devid;
pci_dev->pci_id.pci_class_id = c;
pci_dev->pci_id.pci_subclass_id = sc;
pci_dev->pci_bus = pci_get_bus(device); pci_dev->pci_bus = pci_get_bus(device);
pci_dev->pci_slot = pci_get_slot(device); pci_dev->pci_slot = pci_get_slot(device);
pci_dev->pci_func = pci_get_func(device); pci_dev->pci_func = pci_get_func(device);
@@ -38,7 +44,7 @@ static void init_pci_device(uint32_t device, uint16_t vendid, uint16_t devid, vo
if we find a suitable driver for this device, that device will re-register it as theirs. */ if we find a suitable driver for this device, that device will re-register it as theirs. */
device_register(dev, pci_driver, bus_device_base(pci_bus)); device_register(dev, pci_driver, bus_device_base(pci_bus));
struct pci_driver *driver = find_driver_for_pci_device(vendid, devid); struct pci_driver *driver = find_driver_for_pci_device(&pci_dev->pci_id);
if (driver && driver->probe) { if (driver && driver->probe) {
driver->probe(driver, dev); driver->probe(driver, dev);
} }

4
kexts/drivers/bus/pci/pci.h
View File

@@ -4,12 +4,14 @@
#include <stdint.h> #include <stdint.h>
#include <socks/status.h> #include <socks/status.h>
struct pci_device_id;
typedef void (*pci_func_t)(uint32_t device, uint16_t vendor_id, uint16_t device_id, void *arg); typedef void (*pci_func_t)(uint32_t device, uint16_t vendor_id, uint16_t device_id, void *arg);
extern struct driver *pci_driver; extern struct driver *pci_driver;
extern struct bus_device *pci_bus; extern struct bus_device *pci_bus;
extern struct pci_driver *find_driver_for_pci_device(unsigned int vendor_id, unsigned int device_id); extern struct pci_driver *find_driver_for_pci_device(const struct pci_device_id *query);
extern kern_status_t init_pci_driver_cache(void); extern kern_status_t init_pci_driver_cache(void);
extern void pci_enumerate_devices(pci_func_t f, int type, void *arg); extern void pci_enumerate_devices(pci_func_t f, int type, void *arg);