frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #6377: Ignore disabled BARs, and allow matching BARs aligned to less 

than 16 bytes. (Felix Kühling, ATI)
This commit is contained in:
Adam Jackson 2006-05-18 23:48:57 +00:00
parent fa9a49a92d
commit c11cfcfaff
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-05-18 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/os-support/linux/lnx_pci.c:
Bug #6377: Ignore disabled BARs, and allow matching BARs
aligned to less than 16 bytes. (Felix Kühling, ATI)
2006-05-18 Adam Jackson <ajax@freedesktop.org> 2006-05-18 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/os-support/linux/lnx_acpi.c: * hw/xfree86/os-support/linux/lnx_acpi.c:

26
hw/xfree86/os-support/linux/lnx_pci.c
View File

@ -202,22 +202,26 @@ xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base)
if (tag == pciTag(bus,dev,fn)) { if (tag == pciTag(bus,dev,fn)) {
/* ok now look through all the BAR values of this device */ /* ok now look through all the BAR values of this device */
for (ndx=0; ndx<7; ndx++) { for (ndx=0; ndx<7; ndx++) {
unsigned long savePtr; unsigned long savePtr, flagMask;
/*
* remember to lop of the last 4bits of the BAR values as they are
* memory attributes
*/
if (ndx == 6) if (ndx == 6)
savePtr = (0xFFFFFFF0) & savePtr = pciReadLong(tag, PCI_CMD_BIOS_REG);
pciReadLong(tag, PCI_CMD_BIOS_REG);
else /* this the ROM bar */ else /* this the ROM bar */
savePtr = (0xFFFFFFF0) & savePtr = pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
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 */ /* find the index of the incoming base */
if (base >= savePtr && base <= (savePtr + size[ndx])) { if (base >= savePtr && base < (savePtr + size[ndx])) {
fclose(file); fclose(file);
return (offset[ndx] & ~(0xFUL)) + (base - savePtr); return (offset[ndx] & flagMask) + (base - savePtr);
} }
} }
} }