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

pci: print irq/msi vector when a device gets used

Browse Source
This commit is contained in:
Alexander Boettcher 2015-05-15 11:13:07 +02:00 committed by Christian Helmuth
parent dd7ddae0e9
commit 869fac8f76
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/os/src/drivers/pci/nonpci_devices.cc
View File

@ -46,8 +46,10 @@ class Nonpci::Ps2 : public Pci::Device_component
{
switch (virt_irq) {
case 0:
PINF("PS2 uses IRQ, vector 0x%x", IRQ_KEYBOARD);
return Device_component::irq(virt_irq);
case 1:
PINF("PS2 uses IRQ, vector 0x%x", IRQ_MOUSE);
return _irq_mouse.cap();
default:
return Genode::Irq_session_capability();

34
repos/os/src/drivers/pci/pci_device_component.h
View File

@ -50,7 +50,10 @@ class Pci::Device_component : public Genode::Rpc_object<Pci::Device>,
PCI_CMD_REG = 0x4,
PCI_CMD_DMA = 0x4,
PCI_IRQ_LINE = 0x3c,
PCI_IRQ_PIN = 0x3d
PCI_IRQ_PIN = 0x3d,
CAP_MSI_64 = 0x80,
MSI_ENABLED = 0x1
};
Genode::Tslab<Genode::Io_port_connection, IO_BLOCK_SIZE> _slab_ioport;
@ -121,8 +124,6 @@ class Pci::Device_component : public Genode::Rpc_object<Pci::Device>,
uint16_t msi = _device_config.read(&_config_access, cap + 2,
Pci::Device::ACCESS_16BIT);
enum { MSI_ENABLED = 0x1 };
if (msi & MSI_ENABLED)
/* disable MSI */
_device_config.write(&_config_access, cap + 2,
@ -202,7 +203,6 @@ class Pci::Device_component : public Genode::Rpc_object<Pci::Device>,
Genode::uint32_t msi_value = _irq_session.msi_data();
Genode::uint16_t msi_cap = _msi_cap();
enum { CAP_MSI_64 = 0x80, MSI_ENABLED = 0x1 };
Genode::uint16_t msi = _device_config.read(&_config_access,
msi_cap + 2,
Pci::Device::ACCESS_16BIT);
@ -327,6 +327,32 @@ class Pci::Device_component : public Genode::Rpc_object<Pci::Device>,
{
if (id != 0)
return Genode::Irq_session_capability();
if (!_device_config.valid())
return _irq_session.cap();
bool msi_64 = false;
Genode::uint16_t msi_cap = _msi_cap();
if (msi_cap) {
Genode::uint16_t msi = _device_config.read(&_config_access,
msi_cap + 2,
Pci::Device::ACCESS_16BIT);
msi_64 = msi & CAP_MSI_64;
}
if (_irq_session.msi())
PINF("%x:%x.%x uses MSI %s, vector 0x%lx, address 0x%lx",
_device_config.bus_number(),
_device_config.device_number(),
_device_config.function_number(),
msi_64 ? "64bit" : "32bit",
_irq_session.msi_data(), _irq_session.msi_address());
else
PINF("%x:%x.%x uses IRQ, vector 0x%x",
_device_config.bus_number(),
_device_config.device_number(),
_device_config.function_number(), _irq_line);
return _irq_session.cap();
}