Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: add bridge control flags and use them.

Browse Source
This commit is contained in:
Jérôme Duval 2012-02-27 21:46:01 +01:00
parent de49f7dda3
commit 9f6b2d77b7
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
headers/os/drivers/PCI.h
View File

@ -655,6 +655,19 @@ struct pci_module_info {
#define PCI_pin_d 0x04
#define PCI_pin_max 0x04
/** PCI bridge control register bits */
#define PCI_bridge_parity_error_response 0x0001 /* 1/0 Parity Error Response */
#define PCI_bridge_serr 0x0002 /* 1/0 SERR# en/disabled */
#define PCI_bridge_isa 0x0004 /* 1/0 ISA en/disabled */
#define PCI_bridge_vga 0x0008 /* 1/0 VGA en/disabled */
#define PCI_bridge_master_abort 0x0020 /* 1/0 Master Abort mode */
#define PCI_bridge_secondary_bus_reset 0x0040 /* 1/0 Secondary bus reset */
#define PCI_bridge_secondary_bus_fastback 0x0080 /* 1/0 fast back-to-back en/disabled */
#define PCI_bridge_primary_discard_timeout 0x0100 /* 1/0 primary discard timeout */
#define PCI_bridge_secondary_discard_timeout 0x0200 /* 1/0 secondary discard timeout */
#define PCI_bridge_discard_timer_status 0x0400 /* 1/0 discard timer status */
#define PCI_bridge_discard_timer_serr 0x0800 /* 1/0 discard timer serr */
/** PCI Capability Codes */
#define PCI_cap_id_reserved 0x00
#define PCI_cap_id_pm 0x01 /* Power management */

15
src/add-ons/kernel/bus_managers/pci/pci.cpp
View File

@ -892,16 +892,21 @@ PCI::_ConfigureBridges(PCIBus *bus)
// Enable: Parity Error Response, SERR, Master Abort Mode, Discard
// Timer SERR
// Clear: Discard Timer Status
bridgeControlNew |= (1 << 0) | (1 << 1) | (1 << 5) | (1 << 10)
| (1 << 11);
bridgeControlNew |= PCI_bridge_parity_error_response
| PCI_bridge_serr | PCI_bridge_master_abort
| PCI_bridge_discard_timer_status
| PCI_bridge_discard_timer_serr;
// Set discard timer to 2^15 PCI clocks
bridgeControlNew &= ~((1 << 8) | (1 << 9));
bridgeControlNew &= ~(PCI_bridge_primary_discard_timeout
| PCI_bridge_secondary_discard_timeout);
WriteConfig(dev->domain, dev->bus, dev->device, dev->function,
PCI_bridge_control, 2, bridgeControlNew);
bridgeControlNew = ReadConfig(dev->domain, dev->bus, dev->device,
dev->function, PCI_bridge_control, 2);
dprintf("PCI: dom %u, bus %u, dev %2u, func %u, changed PCI bridge control from 0x%04x to 0x%04x\n",
dev->domain, dev->bus, dev->device, dev->function, bridgeControlOld, bridgeControlNew);
dprintf("PCI: dom %u, bus %u, dev %2u, func %u, changed PCI bridge"
" control from 0x%04x to 0x%04x\n", dev->domain, dev->bus,
dev->device, dev->function, bridgeControlOld,
bridgeControlNew);
}
if (dev->child)