[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-kernel
Subject:    [PATCH] quiet non-x86 option ROM warnings
From:       Jesse Barnes <jbarnes () sgi ! com>
Date:       2005-02-15 23:57:05
Message-ID: 200502151557.06049.jbarnes () sgi ! com
[Download RAW message or body]

Both the r128 and radeon drivers complain if they don't find an x86 option ROM 
on the device they're talking to.  This would be fine, except that the 
message is incorrect--not all option ROMs are required to be x86 based.  This 
small patch just removes the messages altogether, causing the drivers to 
*silently* fall back to the non-x86 option ROM behavior (it works fine and 
there's no cause for alarm).

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>


["non-x86-rom-ok.patch" (text/x-diff)]

===== drivers/video/aty/radeon_base.c 1.39 vs edited =====
--- 1.39/drivers/video/aty/radeon_base.c	2005-02-10 22:57:44 -08:00
+++ edited/drivers/video/aty/radeon_base.c	2005-02-15 15:51:19 -08:00
@@ -329,11 +329,9 @@
 	rinfo->bios_seg = rom;
 
 	/* Very simple test to make sure it appeared */
-	if (BIOS_IN16(0) != 0xaa55) {
-		printk(KERN_ERR "radeonfb (%s): Invalid ROM signature %x should be"
-		       "0xaa55\n", pci_name(rinfo->pdev), BIOS_IN16(0));
-		goto failed;
-	}
+	if (BIOS_IN16(0) != 0xaa55)
+		goto failed; /* not an x86 option ROM, bail out */
+
 	/* Look for the PCI data to check the ROM type */
 	dptr = BIOS_IN16(0x18);
 
===== drivers/video/aty/aty128fb.c 1.56 vs edited =====
--- 1.56/drivers/video/aty/aty128fb.c	2005-02-10 22:57:44 -08:00
+++ edited/drivers/video/aty/aty128fb.c	2005-02-15 15:51:40 -08:00
@@ -812,11 +812,8 @@
 	}
 
 	/* Very simple test to make sure it appeared */
-	if (BIOS_IN16(0) != 0xaa55) {
-		printk(KERN_ERR "aty128fb: Invalid ROM signature %x should be 0xaa55\n",
-		       BIOS_IN16(0));
-		goto failed;
-	}
+	if (BIOS_IN16(0) != 0xaa55)
+		goto failed; /* not an x86 option ROM, bail out */
 
 	/* Look for the PCI data to check the ROM type */
 	dptr = BIOS_IN16(0x18);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[prev in list] [next in list] [prev in thread] [next in thread]