ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wifi_drv: make pci probing more sane 

Initial patch by @skalk.

Issue #1774.
This commit is contained in:
Josef Söntgen 2015-11-11 13:20:22 +01:00 committed by Christian Helmuth
parent a01b1793eb
commit 88123bdbd5
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
repos/dde_linux/src/lib/wifi/pci_driver.cc
View File

@ -14,6 +14,7 @@
/* Genode inludes */
#include <ram_session/client.h>
#include <util/retry.h>
#include <base/object_pool.h>
#include <platform_session/connection.h>
#include <platform_device/client.h>
@ -264,9 +265,7 @@ extern "C" int pci_register_driver(struct pci_driver *drv)
{
drv->driver.name = drv->name;
pci_device_id const *id = drv->id_table;
if (!id)
return -ENODEV;
if (!drv->id_table) return -ENODEV;
using namespace Genode;
@ -279,48 +278,39 @@ extern "C" int pci_register_driver(struct pci_driver *drv)
PCI_CLASS_WIFI = 0x028000,
};
unsigned found = 0;
bool found = false;
while (id->device) {
if (id->class_ == (unsigned)PCI_ANY_ID) {
id++;
continue;
}
for (Platform::Device_capability cap = pci()->first_device(PCI_CLASS_WIFI,
PCI_CLASS_MASK);
cap.valid() && !found;) {
Pci_driver *pci_drv = nullptr;
pci_device_cap = cap;
Platform::Device_capability cap = pci()->first_device(PCI_CLASS_WIFI,
PCI_CLASS_MASK);
for (pci_device_id const *id = drv->id_table; id->device && !found; id++) {
if (id->class_ == (unsigned)PCI_ANY_ID) continue;
while (cap.valid()) {
Pci_driver *pci_drv = 0;
try {
pci_device_cap = cap;
/* probe device */
pci_drv = new (env()->heap()) Pci_driver(drv, cap, id);
pci()->on_destruction(Platform::Connection::KEEP_OPEN);
found++;
} catch (Platform::Device::Quota_exceeded) {
Genode::env()->parent()->upgrade(pci()->cap(), "ram_quota=4096");
continue;
retry<Platform::Device::Quota_exceeded>(
[&] {
/* probe device */
pci_drv = new (env()->heap()) Pci_driver(drv, cap, id);
pci()->on_destruction(Platform::Connection::KEEP_OPEN);
found = true;
},
[&] {
Genode::env()->parent()->upgrade(pci()->cap(), "ram_quota=4096");
});
} catch (...) {
destroy(env()->heap(), pci_drv);
pci_drv = 0;
pci_drv = nullptr;
}
if (found)
break;
Platform::Device_capability free_up = cap;
cap = pci()->next_device(cap, PCI_CLASS_WIFI, PCI_CLASS_MASK);
if (!pci_drv)
pci()->release_device(free_up);
}
id++;
/* XXX */
if (found)
break;
Platform::Device_capability free_up = cap;
cap = pci()->next_device(cap, PCI_CLASS_WIFI, PCI_CLASS_MASK);
if (!pci_drv)
pci()->release_device(free_up);
}
return found ? 0 : -ENODEV;