i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdhci_pci: remove (incomplete) use of MSI

Browse Source 
MSI was never implemented in this driver and only used for a log during
initialization. Remove it for now.

This makes it easier to use the driver on non-x86 systems where there is
no MSI.

Change-Id: I39ccbb82b78ea98c0d045ef07ee9bb28c775e292
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4847
Reviewed-by: Adrien Destugues <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Adrien Destugues
2022-03-02 09:13:33 +00:00
committed by Jérôme Duval
parent fdb459132e
commit 455468cbfd
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
-19
View File
@@ -80,7 +80,6 @@ class SdhciDevice {
device_manager_info* gDeviceManager; device_manager_info* gDeviceManager;
device_module_info* gMMCBusController; device_module_info* gMMCBusController;
static pci_x86_module_info* sPCIx86Module;
static int32 static int32
@@ -659,14 +658,6 @@ init_bus(device_node* node, void** bus_cookie)
gDeviceManager->put_node(pciParent); gDeviceManager->put_node(pciParent);
gDeviceManager->put_node(parent); gDeviceManager->put_node(parent);
if (get_module(B_PCI_X86_MODULE_NAME, (module_info**)&sPCIx86Module)
!= B_OK) {
sPCIx86Module = NULL;
ERROR("PCIx86Module not loaded\n");
// FIXME try probing FDT as well
return B_NO_MEMORY;
}
uint8_t bar, slot; uint8_t bar, slot;
if (gDeviceManager->get_attr_uint8(node, SLOT_NUMBER, &slot, false) < B_OK if (gDeviceManager->get_attr_uint8(node, SLOT_NUMBER, &slot, false) < B_OK
|| gDeviceManager->get_attr_uint8(node, BAR_INDEX, &bar, false) < B_OK) || gDeviceManager->get_attr_uint8(node, BAR_INDEX, &bar, false) < B_OK)
@@ -698,11 +689,6 @@ init_bus(device_node* node, void** bus_cookie)
return B_IO_ERROR; return B_IO_ERROR;
} }
int msiCount = sPCIx86Module->get_msi_count(pciInfo.bus,
pciInfo.device, pciInfo.function);
TRACE("interrupts count: %d\n", msiCount);
// FIXME if available, use MSI rather than good old IRQ...
// enable bus master and io // enable bus master and io
uint16 pcicmd = pci->read_pci_config(device, PCI_command, 2); uint16 pcicmd = pci->read_pci_config(device, PCI_command, 2);
pcicmd &= ~(PCI_command_int_disable | PCI_command_io); pcicmd &= ~(PCI_command_int_disable | PCI_command_io);
@@ -735,11 +721,6 @@ init_bus(device_node* node, void** bus_cookie)
status = bus->InitCheck(); status = bus->InitCheck();
if (status != B_OK) { if (status != B_OK) {
if (sPCIx86Module != NULL) {
put_module(B_PCI_X86_MODULE_NAME);
sPCIx86Module = NULL;
}
if (bus != NULL) if (bus != NULL)
delete bus; delete bus;
else else