Re: [PATCH] PnP BIOS -- bugfix; update devlist on setpnp

[Andrey Panin <pazke@orbita1.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 2090 bytes --]

On Mon, Oct 15, 2001 at 11:45:56AM +0200, Stelian Pop wrote:

> On Sun, Oct 14, 2001 at 11:37:39PM -0700, Jurgen Botz wrote:
> 
> > Thomas Hood wrote:
> > > Okay, here's a new major patch to the PnP BIOS driver
> > > which needs some testing before it's integrated.
> > >[...] 
> > > Vaio users: Please make sure that this doesn't oops.
> > 
> > Patched against 2.4.12-ac1, it works and doesn't oops my
> > VAIO PCG-N505VE.  
> 
> Same for me (against a 2.4.10-ac12), on a VAIO PCG-C1VE.
> 
> Relevant (maybe) output:
> 
> ...
> Sony Vaio laptop detected.
> BIOS strings suggest APM reports battery life in minutes and wrong byte order.
> PCI: PCI BIOS revision 2.10 entry at 0xfd98e, last bus=0
> PCI: Using configuration type 1
> PCI: Probing PCI hardware
> PCI: Using IRQ router PIIX [8086/7110] at 00:07.0
> PCI: Found IRQ 9 for device 00:08.0
> PCI: Sharing IRQ 9 with 00:07.2
> isapnp: Scanning for PnP cards...
> isapnp: No Plug & Play device found
> PnPBIOS: Found PnP BIOS installation structure at 0xc00f8120.
> PnPBIOS: PnP BIOS version 1.0, entry 0xf0000:0xb25f, dseg 0x400.
> PnPBIOS: 14 nodes reported by PnP BIOS; 14 recorded by driver.
> PnPBIOS: PNP0c02: 0xfff80000-0xffffffff was already reserved
		    ^^^^^^^^^^^^^^^^^^^^^
Looks wrong for me, we are trying to reserve _memory_ range with request_region().
Patch attached.

> PnPBIOS: PNP0c02: 0xfff7f600-0xfff7ffff was already reserved
> PnPBIOS: PNP0c02: 0x398-0x399 has been reserved
> PnPBIOS: PNP0c02: 0x4d0-0x4d1 has been reserved
> PnPBIOS: PNP0c02: 0x8000-0x804f was already reserved
> PnPBIOS: PNP0c02: 0x1040-0x104f has been reserved
> PnPBIOS: PNP0c01: 0xe8000-0xfffff was already reserved
> PnPBIOS: PNP0c01: 0x100000-0x70ffbff was already reserved
> PnPBIOS: PNP0c02: 0xdc000-0xdffff was already reserved
> PnPBIOS: PNP0c02: 0xd1000-0xd3fff was already reserved
> Linux NET4.0 for Linux 2.4
> ...
> 
> Stelian.

-- 
Andrey Panin            | Embedded systems software engineer
pazke@orbita1.ru        | PGP key: http://www.orbita1.ru/~pazke/AndreyPanin.asc

[-- Attachment #1.2: patch-pnpbios --]
[-- Type: text/plain, Size: 794 bytes --]

diff -ur linux.old/drivers/pnp/pnp_bios.c linux/drivers/pnp/pnp_bios.c
--- linux.old/drivers/pnp/pnp_bios.c	Mon Oct 15 15:38:43 2001
+++ linux/drivers/pnp/pnp_bios.c	Mon Oct 15 15:54:56 2001
@@ -1052,8 +1052,8 @@
 	 * example do reserve stuff they know about too, so we may well
 	 * have double reservations.
 	 */
-	printk(
-		"PnPBIOS: %s: 0x%x-0x%x %s reserved\n",
+	printk( 
+		KERN_INFO "PnPBIOS: %s: 0x%x-0x%x %s reserved\n",
 		pnpid, start, end,
 		NULL != res ? "has been" : "was already"
 	);
@@ -1069,6 +1069,9 @@
 		if ( dev->resource[i].flags & IORESOURCE_UNSET )
 			/* resource record not used */
 			break;
+		if (!(dev->resource[i].flags & IORESOURCE_IO))
+			/* memory resource */
+			continue;
 		if ( dev->resource[i].start == 0 )
 			/* resource disabled */
 			continue;

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]