Attachment 5044 Details for Bug 6377 – Fix various issues in xf86GetOSOffsetFromPCI

[patch] Fix various issues in xf86GetOSOffsetFromPCI

lnx_pci-20060324.xorgbugzilla.patch (text/plain), 2.01 KB, created by Felix Kuehling on 2006-03-25 03:03:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Kuehling

Created: 2006-03-25 03:03:46 UTC

Size: 2.01 KB

patch

obsolete

>Patch for submission to Xorg bugzilla. Fixes various issues related to
>PCI scanning that could lead to driver initialization failures.
>--- hw/xfree86/os-support/linux/lnx_pci.c.orig	2006-03-23 17:03:04.127913233 -0500
>+++ hw/xfree86/os-support/linux/lnx_pci.c	2006-03-23 17:03:36.314546773 -0500
>@@ -202,22 +202,26 @@
>             if (tag == pciTag(bus,dev,fn)) {
>                 /* ok now look through all the BAR values of this device */
>                 for (ndx=0; ndx<7; ndx++) {
>-                    unsigned long savePtr;
>-                    /*
>-		     * remember to lop of the last 4bits of the BAR values as they are
>-		     * memory attributes
>-		     */
>+                    unsigned long savePtr, flagMask;
> 		    if (ndx == 6) 
>-			savePtr = (0xFFFFFFF0) & 
>-			    pciReadLong(tag, PCI_CMD_BIOS_REG);
>+			savePtr = pciReadLong(tag, PCI_CMD_BIOS_REG);
> 		    else /* this the ROM bar */
>-			savePtr = (0xFFFFFFF0) & 
>-			    pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
>+			savePtr = pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
>+                    /* Ignore unset base addresses. The kernel may
>+                     * have reported non-zero size and address even
>+                     * if they are disabled (e.g. disabled ROM BAR).
>+                     */
>+                    if (savePtr == 0)
>+                        continue;
>+                    /* Remove memory attribute bits, different for IO
>+                     * and memory ranges. */
>+                    flagMask = (savePtr & 0x1) ? ~0x3UL : ~0xFUL;
>+                    savePtr &= flagMask;
> 
>                     /* find the index of the incoming base */
>-                    if (base >= savePtr && base <= (savePtr + size[ndx])) {
>+                    if (base >= savePtr && base < (savePtr + size[ndx])) {
>                         fclose(file);
>-                        return (offset[ndx] & ~(0xFUL)) + (base - savePtr);
>+                        return (offset[ndx] & flagMask) + (base - savePtr);
>                     }
>                 }
>             }

Actions: View | Splinter Review

Attachments on bug 6377: 5044

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.