Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

system.conf: subsystem VID/DID matching support

Browse Source 
- change "vid/did" to "vid:did", old form still supported for now;
- allow "vid:did/subvid:subdid" specification in system.conf, in
  which case a device will be visible to a driver if the subsystem
  VID/DID also match.

Change-Id: I7aef54da1b0bc81e24b5d98f1a28416f38f8b266
This commit is contained in:
David van Moolenbroek
2013-10-01 00:42:41 +02:00
committed by Lionel Sambuc
parent acc46143ab
commit 89332ecdf1
14 changed files with 129 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/atl2/atl2.conf
View File

@@ -6,7 +6,7 @@ service atl2
UMAP # 14
IRQCTL # 19
;
pci device 1969/2048;
pci device 1969:2048;
ipc
SYSTEM pm rs tty ds vm
pci inet lwip

2
drivers/dec21140A/dec21140A.conf
View File

@@ -8,7 +8,7 @@ service dec21140A
IRQCTL # 19
DEVIO # 21
;
pci device 1011/0009;
pci device 1011:0009;
ipc
SYSTEM pm rs log tty ds vm
pci inet lwip

14
drivers/e1000/e1000.conf
View File

@@ -7,13 +7,13 @@ service e1000
IRQCTL # 19
DEVIO # 21
;
pci device 8086/100e;
pci device 8086/100f;
pci device 8086/107c;
pci device 8086/10cd;
pci device 8086/10d3;
pci device 8086/10de;
pci device 8086/105e;
pci device 8086:100e;
pci device 8086:100f;
pci device 8086:107c;
pci device 8086:10cd;
pci device 8086:10d3;
pci device 8086:10de;
pci device 8086:105e;
ipc
SYSTEM pm rs log tty ds vm
pci inet lwip ;

14
drivers/fxp/fxp.conf
View File

@@ -8,13 +8,13 @@ service fxp
IRQCTL # 19
DEVIO # 21
;
pci device 8086/1031;
pci device 8086/1032;
pci device 8086/103d;
pci device 8086/1064;
pci device 8086/1229;
pci device 8086/2449;
pci device 8086/1209;
pci device 8086:1031;
pci device 8086:1032;
pci device 8086:103d;
pci device 8086:1064;
pci device 8086:1229;
pci device 8086:2449;
pci device 8086:1209;
ipc
SYSTEM pm rs log tty ds vm
pci inet lwip amddev

2
drivers/lance/lance.conf
View File

@@ -8,7 +8,7 @@ service lance
IRQCTL # 19
DEVIO # 21
;
pci device 1022/2000;
pci device 1022:2000;
uid 0;
};

37
drivers/pci/pci.c
View File

@@ -70,6 +70,8 @@ static struct pcidev
u8_t pd_infclass;
u16_t pd_vid;
u16_t pd_did;
u16_t pd_sub_vid;
u16_t pd_sub_did;
u8_t pd_ilr;
u8_t pd_inuse;
@@ -737,7 +739,7 @@ static void pci_intel_init()
dstr= "unknown device";
if (debug)
{
printf("pci_intel_init: %s (%04X/%04X)\n",
printf("pci_intel_init: %s (%04X:%04X)\n",
dstr, vid, did);
}
@@ -774,7 +776,7 @@ static void pci_intel_init()
static void probe_bus(int busind)
{
u32_t dev, func, t3;
u16_t vid, did, sts;
u16_t vid, did, sts, sub_vid, sub_did;
u8_t headt;
u8_t baseclass, subclass, infclass;
int devind, busnr;
@@ -831,12 +833,15 @@ static void probe_bus(int busind)
}
}
sub_vid= pci_attr_r16(devind, PCI_SUBVID);
sub_did= pci_attr_r16(devind, PCI_SUBDID);
dstr= pci_dev_name(vid, did);
if (debug)
{
if (dstr)
{
printf("%d.%lu.%lu: %s (%04X/%04X)\n",
printf("%d.%lu.%lu: %s (%04X:%04X)\n",
busnr, (unsigned long)dev,
(unsigned long)func, dstr,
vid, did);
@@ -851,8 +856,7 @@ static void probe_bus(int busind)
}
printf("Device index: %d\n", devind);
printf("Subsystem: Vid 0x%x, did 0x%x\n",
pci_attr_r16(devind, PCI_SUBVID),
pci_attr_r16(devind, PCI_SUBDID));
sub_vid, sub_did);
}
baseclass= pci_attr_r8_u(devind, PCI_BCR);
@@ -886,6 +890,8 @@ static void probe_bus(int busind)
pcidev[devind].pd_infclass= infclass;
pcidev[devind].pd_vid= vid;
pcidev[devind].pd_did= did;
pcidev[devind].pd_sub_vid= sub_vid;
pcidev[devind].pd_sub_did= sub_did;
pcidev[devind].pd_inuse= 0;
pcidev[devind].pd_bar_nr= 0;
record_irq(devind);
@@ -1531,7 +1537,7 @@ static void complete_bars(void)
if (debug)
{
printf(
"pci device %d (%04x/%04x), bar %d: base 0x%x, size 0x%x\n",
"pci device %d (%04x:%04x), bar %d: base 0x%x, size 0x%x\n",
i, pcidev[i].pd_vid, pcidev[i].pd_did,
j, base, size);
}
@@ -1765,7 +1771,7 @@ int busind;
dstr= "unknown device";
if (debug)
{
printf("found ISA bridge (%04X/%04X) %s\n",
printf("found ISA bridge (%04X:%04X) %s\n",
vid, did, dstr);
}
pcibus[busind].pb_isabridge_dev= bridge_dev;
@@ -1803,7 +1809,7 @@ int busind;
if (debug)
{
printf(
"(warning) unsupported ISA bridge %04X/%04X for bus %d\n",
"(warning) unsupported ISA bridge %04X:%04X for bus %d\n",
pcidev[unknown_bridge].pd_vid,
pcidev[unknown_bridge].pd_did, busind);
}
@@ -1899,7 +1905,7 @@ int busind;
t3 != PCI_T3_PCI2PCI_SUBTR)
{
printf(
"Unknown PCI class %02x:%02x:%02x for PCI-to-PCI bridge, device %04X/%04X\n",
"Unknown PCI class %02x/%02x/%02x for PCI-to-PCI bridge, device %04X:%04X\n",
baseclass, subclass, infclass,
vid, did);
continue;
@@ -1908,7 +1914,7 @@ int busind;
t3 != PCI_T3_CARDBUS)
{
printf(
"Unknown PCI class %02x:%02x:%02x for Cardbus bridge, device %04X/%04X\n",
"Unknown PCI class %02x/%02x/%02x for Cardbus bridge, device %04X:%04X\n",
baseclass, subclass, infclass,
vid, did);
continue;
@@ -1917,7 +1923,7 @@ int busind;
if (debug)
{
printf("%u.%u.%u: PCI-to-PCI bridge: %04X/%04X\n",
printf("%u.%u.%u: PCI-to-PCI bridge: %04X:%04X\n",
pcidev[devind].pd_busnr,
pcidev[devind].pd_dev,
pcidev[devind].pd_func, vid, did);
@@ -2640,6 +2646,7 @@ static int visible(aclp, devind)
struct rs_pci *aclp;
int devind;
{
u16_t acl_sub_vid, acl_sub_did;
int i;
u32_t class_id;
@@ -2651,8 +2658,14 @@ int devind;
/* Check whether the caller is allowed to get this device. */
for (i= 0; i<aclp->rsp_nr_device; i++)
{
acl_sub_vid = aclp->rsp_device[i].sub_vid;
acl_sub_did = aclp->rsp_device[i].sub_did;
if (aclp->rsp_device[i].vid == pcidev[devind].pd_vid &&
aclp->rsp_device[i].did == pcidev[devind].pd_did)
aclp->rsp_device[i].did == pcidev[devind].pd_did &&
(acl_sub_vid == NO_SUB_VID ||
acl_sub_vid == pcidev[devind].pd_sub_vid) &&
(acl_sub_did == NO_SUB_DID ||
acl_sub_did == pcidev[devind].pd_sub_did))
{
return TRUE;
}

34
drivers/rtl8139/rtl8139.conf
View File

@@ -7,23 +7,23 @@ service rtl8139
IRQCTL # 19
DEVIO # 21
;
pci device 10ec/8139;
pci device 02ac/1012;
pci device 1065/8139;
pci device 1113/1211;
pci device 1186/1300;
pci device 1186/1340;
pci device 11db/1234;
pci device 1259/a117;
pci device 1259/a11e;
pci device 126c/1211;
pci device 13d1/ab06;
pci device 1432/9130;
pci device 14ea/ab06;
pci device 14ea/ab07;
pci device 1500/1360;
pci device 1743/8139;
pci device 4033/1360;
pci device 10ec:8139;
pci device 02ac:1012;
pci device 1065:8139;
pci device 1113:1211;
pci device 1186:1300;
pci device 1186:1340;
pci device 11db:1234;
pci device 1259:a117;
pci device 1259:a11e;
pci device 126c:1211;
pci device 13d1:ab06;
pci device 1432:9130;
pci device 14ea:ab06;
pci device 14ea:ab07;
pci device 1500:1360;
pci device 1743:8139;
pci device 4033:1360;
ipc
SYSTEM pm rs log tty ds vm
pci inet lwip amddev

20
drivers/rtl8169/rtl8169.conf
View File

@@ -8,16 +8,16 @@ service rtl8169
IRQCTL # 19
DEVIO # 21
;
pci device 10ec/8129;
pci device 10ec/8136;
pci device 10ec/8167;
pci device 10ec/8169;
pci device 10ec/8168;
pci device 1186/4300;
pci device 1259/c107;
pci device 1385/8169;
pci device 16ec/0116;
pci device 1737/1032;
pci device 10ec:8129;
pci device 10ec:8136;
pci device 10ec:8167;
pci device 10ec:8169;
pci device 10ec:8168;
pci device 1186:4300;
pci device 1259:c107;
pci device 1385:8169;
pci device 16ec:0116;
pci device 1737:1032;
ipc
SYSTEM pm rs log tty ds vm
pci inet lwip amddev

2
drivers/virtio_net/virtio_net.conf
View File

@@ -9,5 +9,5 @@ service virtio_net
DEVIO
;
pci device 1af4/1000;
pci device 1af4:1000;
}