ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 21:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ahci: use MSIs on x86

Browse Source 
- remove code for disabling MSIs

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

2
repos/os/src/drivers/ahci/include/ahci_device_base.h
View File

@ -369,7 +369,7 @@ class Ahci_device_base
Generic_ctrl *_ctrl; /* generic host control */ Generic_ctrl *_ctrl; /* generic host control */
Ahci_port *_port; /* port base of device */ Ahci_port *_port; /* port base of device */
Irq_connection *_irq; /* device IRQ */ Irq_session_client *_irq; /* device IRQ */
Genode::Signal_receiver _irq_rec; /* IRQ signal receiver */ Genode::Signal_receiver _irq_rec; /* IRQ signal receiver */
Genode::Signal_context _irq_ctx; /* IRQ signal context */ Genode::Signal_context _irq_ctx; /* IRQ signal context */
size_t _block_cnt; /* number of blocks on device */ size_t _block_cnt; /* number of blocks on device */

25
repos/os/src/drivers/ahci/x86/ahci_device.h
View File

@ -114,26 +114,6 @@ class Ahci_device : public Ahci_device_base
_identify_device(); _identify_device();
} }
static void _disable_msi(::Pci::Device_client *pci)
{
enum { PM_CAP_OFF = 0x34, MSI_CAP = 0x5, MSI_ENABLED = 0x1 };
uint8_t cap = pci->config_read(PM_CAP_OFF, ::Pci::Device::ACCESS_8BIT);
/* iterate through cap pointers */
for (uint16_t val = 0; cap; cap = val >> 8) {
val = pci->config_read(cap, ::Pci::Device::ACCESS_16BIT);
if ((val & 0xff) != MSI_CAP)
continue;
uint16_t msi = pci->config_read(cap + 2, ::Pci::Device::ACCESS_16BIT);
if (msi & MSI_ENABLED) {
pci->config_write(cap + 2, msi ^ MSI_CAP, ::Pci::Device::ACCESS_8BIT);
PINF("Disabled MSIs %x", msi);
}
}
}
public: public:
Ahci_device(addr_t base, Io_mem_session_capability io_cap, Ahci_device(addr_t base, Io_mem_session_capability io_cap,
@ -187,10 +167,7 @@ class Ahci_device : public Ahci_device_base
PDBG("Bus address: %x:%02x.%u (0x%x)", bus, dev, func, (bus << 8) | ((dev & 0x1f) << 3) | (func & 0x7)); PDBG("Bus address: %x:%02x.%u (0x%x)", bus, dev, func, (bus << 8) | ((dev & 0x1f) << 3) | (func & 0x7));
} }
/* disable message signaled interrupts */ device->_irq = new(env()->heap()) Irq_session_client(pci_device->irq(0));
_disable_msi(pci_device);
device->_irq = new(env()->heap()) Irq_connection(intr & 0xff);
Genode::Signal_context_capability cap = device->_irq_rec.manage(&device->_irq_ctx); Genode::Signal_context_capability cap = device->_irq_rec.manage(&device->_irq_ctx);
device->_irq->sigh(cap); device->_irq->sigh(cap);
device->_irq->ack_irq(); device->_irq->ack_irq();