andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix device path in altixPCI.c to be domain aware.

Browse Source
This commit is contained in:
Matthias Hopf 2006-11-02 18:53:41 +01:00
parent 1d731fc54a
commit d50fc413b3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/os-support/bus/altixPCI.c
View File

@ -41,13 +41,14 @@ static pciDevice *get_dev_on_bus(unsigned int segnum, unsigned int busnum)
static void get_bridge_info(pciBusInfo_t *bus_info, pciDevice *pdev) static void get_bridge_info(pciBusInfo_t *bus_info, pciDevice *pdev)
{ {
unsigned int parent_segnum, segnum = PCI_DOM_FROM_TAG(pdev->tag); unsigned int parent_segnum, segnum = PCI_DOM_FROM_TAG(pdev->tag);
unsigned int parent_busnum, busnum = pdev->busnum; unsigned int parent_busnum, parent_nodombus, busnum = pdev->busnum;
unsigned int nodombus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(pdev->tag));
char bridge_path[] = "/sys/class/pci_bus/0000:00/bridge"; char bridge_path[] = "/sys/class/pci_bus/0000:00/bridge";
char bridge_target[] = "../../../devices/pci0000:00"; char bridge_target[] = "../../../devices/pci0000:00";
/* Path to this device's bridge */ /* Path to this device's bridge */
sprintf(bridge_path, "/sys/class/pci_bus/%04x:%02x/bridge", segnum, sprintf(bridge_path, "/sys/class/pci_bus/%04x:%02x/bridge", segnum,
busnum); nodombus);
if (readlink(bridge_path, bridge_target, strlen(bridge_target)) < 0) { if (readlink(bridge_path, bridge_target, strlen(bridge_target)) < 0) {
perror("failed to dereference bridge link"); perror("failed to dereference bridge link");
@ -56,7 +57,9 @@ static void get_bridge_info(pciBusInfo_t *bus_info, pciDevice *pdev)
} }
sscanf(bridge_target, "../../../devices/pci%04x:%02x", &parent_segnum, sscanf(bridge_target, "../../../devices/pci%04x:%02x", &parent_segnum,
&parent_busnum); &parent_nodombus);
parent_busnum = PCI_MAKE_BUS(parent_segnum, parent_nodombus);
/* /*
* If there's no bridge or the bridge points to the device, use * If there's no bridge or the bridge points to the device, use