Attachment 300001 Details for Bug 437943 – fix the rom reading code to fallback to the older methods.

[patch] fix the rom reading code to fallback to the older methods.

xorg-x11-server-1.1.1-fix-ia64-rom.patch (text/plain), 1.44 KB, created by Dave Airlie on 2008-04-02 01:51:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2008-04-02 01:51:05 UTC

Size: 1.44 KB

patch

obsolete

>diff -up xorg-server-1.1.1/hw/xfree86/os-support/bus/linuxPci.c.ia64-rom xorg-server-1.1.1/hw/xfree86/os-support/bus/linuxPci.c
>--- xorg-server-1.1.1/hw/xfree86/os-support/bus/linuxPci.c.ia64-rom	2008-04-02 10:20:23.000000000 +1000
>+++ xorg-server-1.1.1/hw/xfree86/os-support/bus/linuxPci.c	2008-04-02 11:09:36.000000000 +1000
>@@ -765,33 +765,11 @@ xf86ReadDomainMemory(PCITAG Tag, ADDRESS
>     char file[256];
>     struct stat st;
> 
>-    dom  = PCI_DOM_FROM_TAG(Tag);
>-    bus  = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag));
>-    dev  = PCI_DEV_FROM_TAG(Tag);
>-    func = PCI_FUNC_FROM_TAG(Tag);
>-    sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom",
>-	    dom, bus, dev, func);
>-
>-    /*
>-     * If the caller wants the ROM and the sysfs rom interface exists,
>-     * try to use it instead of reading it from /proc/bus/pci.
>-     */
>-    if (((Base & 0xfffff) == 0xC0000) && (stat(file, &st) == 0)) {
>-        if ((fd = open(file, O_RDWR)))
>-            Base = 0x0;
>-
>-	/* enable the ROM first */
>-	write(fd, "1", 2);
>-	lseek(fd, 0, SEEK_SET);
>-
>-        /* copy the ROM until we hit Len, EOF or read error */
>-        for (i = 0; i < Len && read(fd, Buf, 1) > 0; Buf++, i++)
>-            ;
>-
>-	write(fd, "0", 2);
>-	close(fd);
>-
>-	return Len;
>+    /* if the caller is looking for the BIOS */
>+    if ((Base & 0xfffff) == 0xC0000) {
>+	    size = linuxPciHandleBIOS(Tag, 0, Buf, Len);
>+	    if (size > 0)
>+		    return size;
>     }
> 
>     /* Ensure page boundaries */

Actions: View | Diff

Attachments on bug 437943: 298371 | 298541 | 299985 | 300001