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

optimized debug output, and enabled PCI bus (re-)enumeration

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16159 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-01-30 23:09:28 +00:00
parent 9797f71b23
commit badb1d4be6
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/pci/pci.cpp
+21 -12
View File
@@ -119,7 +119,7 @@ PCI::InitBus()
ppnext = &bus->next; ppnext = &bus->next;
} }
bool bus_enumeration = false; bool bus_enumeration = true;
if (bus_enumeration) { if (bus_enumeration) {
for (int i = 0; i < fDomainCount; i++) { for (int i = 0; i < fDomainCount; i++) {
@@ -239,7 +239,7 @@ PCI::GetNthPciInfo(PCIBus *bus, long *curindex, long wantindex, pci_info *outInf
void void
PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus) PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus)
{ {
TRACE(("PCI: EnumerateBus, domain %u, bus %u\n", domain, bus)); TRACE(("PCI: EnumerateBus: domain %u, bus %u\n", domain, bus));
int max_bus_devices = GetDomainData(domain)->max_bus_devices; int max_bus_devices = GetDomainData(domain)->max_bus_devices;
@@ -261,8 +261,8 @@ PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus)
if (base_class != PCI_bridge || sub_class != PCI_pci) if (base_class != PCI_bridge || sub_class != PCI_pci)
continue; continue;
TRACE(("PCI: found PCI-PCI bridge, domain %u, bus %u, dev %u, func %u\n", domain, bus, dev, func)); TRACE(("PCI: found PCI-PCI bridge: domain %u, bus %u, dev %u, func %u\n", domain, bus, dev, func));
TRACE(("PCI: pcicmd %04lx, primary-bus %lu, secondary-bus %lu, subordinate-bus %lu\n", TRACE(("PCI: original settings: pcicmd %04lx, primary-bus %lu, secondary-bus %lu, subordinate-bus %lu\n",
ReadPciConfig(domain, bus, dev, func, PCI_command, 2), ReadPciConfig(domain, bus, dev, func, PCI_command, 2),
ReadPciConfig(domain, bus, dev, func, PCI_primary_bus, 1), ReadPciConfig(domain, bus, dev, func, PCI_primary_bus, 1),
ReadPciConfig(domain, bus, dev, func, PCI_secondary_bus, 1), ReadPciConfig(domain, bus, dev, func, PCI_secondary_bus, 1),
@@ -278,15 +278,17 @@ PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus)
WritePciConfig(domain, bus, dev, func, PCI_primary_bus, 1, 0); WritePciConfig(domain, bus, dev, func, PCI_primary_bus, 1, 0);
WritePciConfig(domain, bus, dev, func, PCI_secondary_bus, 1, 0); WritePciConfig(domain, bus, dev, func, PCI_secondary_bus, 1, 0);
WritePciConfig(domain, bus, dev, func, PCI_subordinate_bus, 1, 0); WritePciConfig(domain, bus, dev, func, PCI_subordinate_bus, 1, 0);
TRACE(("PCI: disabled settings: pcicmd %04lx, primary-bus %lu, secondary-bus %lu, subordinate-bus %lu\n",
ReadPciConfig(domain, bus, dev, func, PCI_command, 2),
ReadPciConfig(domain, bus, dev, func, PCI_primary_bus, 1),
ReadPciConfig(domain, bus, dev, func, PCI_secondary_bus, 1),
ReadPciConfig(domain, bus, dev, func, PCI_subordinate_bus, 1)));
} }
} }
uint8 last_used_bus_number = bus; uint8 last_used_bus_number = bus;
// testing:
if (last_used_bus_number == 0)
last_used_bus_number = 3;
// step 2: assign busses to all bridges, and enable them again // step 2: assign busses to all bridges, and enable them again
for (int dev = 0; dev < max_bus_devices; dev++) { for (int dev = 0; dev < max_bus_devices; dev++) {
uint16 vendor_id = ReadPciConfig(domain, bus, dev, 0, PCI_vendor_id, 2); uint16 vendor_id = ReadPciConfig(domain, bus, dev, 0, PCI_vendor_id, 2);
@@ -305,7 +307,8 @@ PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus)
if (base_class != PCI_bridge || sub_class != PCI_pci) if (base_class != PCI_bridge || sub_class != PCI_pci)
continue; continue;
TRACE(("PCI: configuring PCI-PCI bridge, domain %u, bus %u, dev %u, func %u\n", domain, bus, dev, func)); TRACE(("PCI: configuring PCI-PCI bridge: domain %u, bus %u, dev %u, func %u\n",
domain, bus, dev, func));
// open Scheunentor for enumerating the bus behind the bridge // open Scheunentor for enumerating the bus behind the bridge
WritePciConfig(domain, bus, dev, func, PCI_primary_bus, 1, bus); WritePciConfig(domain, bus, dev, func, PCI_primary_bus, 1, bus);
@@ -318,13 +321,19 @@ PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus)
pcicmd |= PCI_command_io | PCI_command_memory | PCI_command_master; pcicmd |= PCI_command_io | PCI_command_memory | PCI_command_master;
WritePciConfig(domain, bus, dev, func, PCI_command, 2, pcicmd); WritePciConfig(domain, bus, dev, func, PCI_command, 2, pcicmd);
// enumarate bus TRACE(("PCI: probing settings: pcicmd %04lx, primary-bus %lu, secondary-bus %lu, subordinate-bus %lu\n",
ReadPciConfig(domain, bus, dev, func, PCI_command, 2),
ReadPciConfig(domain, bus, dev, func, PCI_primary_bus, 1),
ReadPciConfig(domain, bus, dev, func, PCI_secondary_bus, 1),
ReadPciConfig(domain, bus, dev, func, PCI_subordinate_bus, 1)));
// enumerate bus
EnumerateBus(domain, last_used_bus_number + 1, &last_used_bus_number); EnumerateBus(domain, last_used_bus_number + 1, &last_used_bus_number);
// close Scheunentor // close Scheunentor
WritePciConfig(domain, bus, dev, func, PCI_subordinate_bus, 1, last_used_bus_number); WritePciConfig(domain, bus, dev, func, PCI_subordinate_bus, 1, last_used_bus_number);
TRACE(("PCI: pcicmd %04lx, primary-bus %lu, secondary-bus %lu, subordinate-bus %lu\n", TRACE(("PCI: configured settings: pcicmd %04lx, primary-bus %lu, secondary-bus %lu, subordinate-bus %lu\n",
ReadPciConfig(domain, bus, dev, func, PCI_command, 2), ReadPciConfig(domain, bus, dev, func, PCI_command, 2),
ReadPciConfig(domain, bus, dev, func, PCI_primary_bus, 1), ReadPciConfig(domain, bus, dev, func, PCI_primary_bus, 1),
ReadPciConfig(domain, bus, dev, func, PCI_secondary_bus, 1), ReadPciConfig(domain, bus, dev, func, PCI_secondary_bus, 1),
@@ -334,7 +343,7 @@ PCI::EnumerateBus(int domain, uint8 bus, uint8 *subordinate_bus)
if (subordinate_bus) if (subordinate_bus)
*subordinate_bus = last_used_bus_number; *subordinate_bus = last_used_bus_number;
TRACE(("PCI: EnumerateBus done, domain %u, bus %u, last_used_bus_number %u\n", domain, bus, last_used_bus_number)); TRACE(("PCI: EnumerateBus done: domain %u, bus %u, last used bus number %u\n", domain, bus, last_used_bus_number));
} }