ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-21 10:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpi: use local irq service for pci slave

Browse Source 
Fixes base-foc issue on qemu caused by wrong set irq polarity and trigger mode.

Bug introduced in #1471

Issue #1216
This commit is contained in:
Alexander Boettcher 2015-05-06 18:20:36 +02:00 committed by Christian Helmuth
parent 2ceecd44f9
commit a312d440c8
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
repos/os/src/drivers/acpi/main.cc
View File

@ -161,6 +161,10 @@ namespace Pci {
} }
static Irq::Root irq_root;
static Genode::Local_service local_irq("IRQ", &irq_root);
class Pci_policy : public Genode::Slave_policy, public Pci::Provider class Pci_policy : public Genode::Slave_policy, public Pci::Provider
{ {
private: private:
@ -172,14 +176,24 @@ class Pci_policy : public Genode::Slave_policy, public Pci::Provider
protected: protected:
Genode::Service *resolve_session_request(const char *service_name,
const char *args) override
{
if (!Genode::strcmp(service_name, "IRQ"))
return &local_irq;
return Genode::Slave_policy::resolve_session_request(service_name,
args);
}
char const **_permitted_services() const char const **_permitted_services() const
{ {
static char const *permitted_services[] = { "CPU", "CAP", "RM", static char const *permitted_services[] = { "CPU", "CAP", "RM",
"LOG", "IO_PORT", "PD", "LOG", "IO_PORT", "PD",
"ROM", "RAM", "SIGNAL", "ROM", "RAM", "SIGNAL",
"IO_MEM", "IRQ", 0 }; "IO_MEM", 0 };
return permitted_services; return permitted_services;
}; }
/** /**
* Parse ACPI tables and announce slave PCI service * Parse ACPI tables and announce slave PCI service
@ -199,7 +213,6 @@ class Pci_policy : public Genode::Slave_policy, public Pci::Provider
/* announce PCI/IRQ services to parent */ /* announce PCI/IRQ services to parent */
static Pci::Root pci_root(*this); static Pci::Root pci_root(*this);
static Irq::Root irq_root;
Genode::env()->parent()->announce(_pci_ep.manage(&pci_root)); Genode::env()->parent()->announce(_pci_ep.manage(&pci_root));
Genode::env()->parent()->announce(_irq_ep.manage(&irq_root)); Genode::env()->parent()->announce(_irq_ep.manage(&irq_root));