PnPBIOS 2.4.9-ac1[56] Vaio fix
Here's the patch to the PnP BIOS driver for Vaio laptops again, this time against 2.4.9-ac18. It's unchanged, but as per the "SubmittingPatches" file, I append rather than attach it. // Thomas
drivers/pnp/pnp_bios.c +19 -4
@@ -48,7 +48,8 @@/* PnP bios signature: "$PnP" */ #define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24)) -void pnp_proc_init (void ); +extern int is_sony_vaio_laptop; +static void pnpbios_build_devlist (void );/*
@@ -560,6 +561,7 @@*/ static int pnp_bios_disabled; +static int pnp_bios_dont_use_current_config;static int disable_pnp_bios (char *str) {
@@ -567,7 +569,14 @@return 0 ; } +static int disable_use_of_current_config (char *str) +{ + pnp_bios_dont_use_current_config=1 ; +return 0 ; +} +__setup ("nobiospnp" , disable_pnp_bios); +__setup ("nobioscurrpnp" , disable_use_of_current_config);void pnp_bios_init (void ) {
@@ -582,6 +591,10 @@printk (KERN_INFO "PNP BIOS services disabled.\n" );return ; } + +if ( is_sony_vaio_laptop ) + pnp_bios_dont_use_current_config =1 ; +for (check = (union pnpbios *)__va (0xf0000 ); check < (union pnpbios *)__va (0xffff0 ); ((void *) (check)) +=16 ) {
@@ -616,7 +629,7 @@ }pnpbios_build_devlist ();#ifdef CONFIG_PROC_FS -pnp_proc_init (); +pnp_proc_init ( pnp_bios_dont_use_current_config );#endif #ifdef CONFIG_HOTPLUG init_completion (&unload_sem);
@@ -846,8 +859,10 @@ dev =kmalloc (sizeof (struct pci_dev ),GFP_KERNEL );if (!dev)break ; - -if (pnp_bios_get_dev_node ((u8 *)&num, (char )0 , node)) + +// For now we scan the "boot" config because some BIOSes +// oops when their "current" configs are accessed +if (pnp_bios_get_dev_node ((u8 *)&num, (char )1 , node))continue ; devs++;
drivers/pnp/pnp_proc.c +16 -9
@@ -33,7 +33,7 @@ node =kmalloc (node_info.max_node_size,GFP_KERNEL );if (!node)return -ENOMEM ;for (num =0 ; num !=0xff ; ) { -pnp_bios_get_dev_node (&num,0 , node); +pnp_bios_get_dev_node (&num,1 , node); p += sprintf(p, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n", node->handle, node->eisa_id, node->type_code[0], node->type_code[1],
@@ -83,13 +83,17 @@return count; } -void pnp_proc_init (void ) +static int pnp_proc_dont_use_current_config; + +void pnp_proc_init (int dont_use_current ) {struct pnp_bios_node *node;struct proc_dir_entry *ent;char name[3 ];u8 num; + pnp_proc_dont_use_current_config = dont_use_current; +if (!pnp_bios_present ())return ;if (pnp_bios_dev_node_info (&node_info) !=0 )return ;
@@ -105,14 +109,16 @@if (!node)return ;for (num =0 ; num !=0xff ; ) {//sprintf(name, "%02x", num); -if (pnp_bios_get_dev_node (&num,0 , node) !=0 ) +if (pnp_bios_get_dev_node (&num,1 , node) !=0 )break ;sprintf (name,"%02x" , node->handle); - ent =create_proc_entry (name,0 , proc_pnp); -if (ent) { - ent->read_proc = proc_read_node; - ent->write_proc = proc_write_node; - ent->data = (void *)(long )(node->handle); +if ( !dont_use_current ) { + ent =create_proc_entry (name,0 , proc_pnp); +if (ent) { + ent->read_proc = proc_read_node; + ent->write_proc = proc_write_node; + ent->data = (void *)(long )(node->handle); + } } ent =create_proc_entry (name,0 , proc_pnp_boot);if (ent) {
@@ -132,7 +138,8 @@if (!proc_pnp)return ;for (num =0 ; num !=0xff ; num++) {sprintf (name,"%02x" , num); -remove_proc_entry (name, proc_pnp); +if ( !pnp_proc_dont_use_current_config ) +remove_proc_entry (name, proc_pnp);remove_proc_entry (name, proc_pnp_boot); }remove_proc_entry ("boot" , proc_pnp);
include/linux/pnp_bios.h +2 -0
@@ -146,6 +146,8 @@extern int pnp_bios_read_escd (char *data,u32 nvram_base);extern int pnp_bios_write_escd (char *data,u32 nvram_base); +extern void pnp_proc_init (int dont_use_current ); +#ifdef CONFIG_PNPBIOS #define pnpbios_for_each_dev (dev) \ for(dev = pnpbios_dev_g(pnpbios_devices.next); dev != pnpbios_dev_g(&pnpbios_devices); dev = pnpbios_dev_g(dev->global_list.next))
arch/i386/kernel/dmi_scan.c +4 -9
@@ -313,14 +313,12 @@return 0 ; } -#if defined(CONFIG_SONYPI ) || defined(CONFIG_SONYPI_MODULE )/* -* Check for a Sony Vaio system in order to enable the use of -* the sonypi driver (we don't want this driver to be used on -* other systems, even if they have the good PCI IDs). +* Check for a Sony Vaio system * -* This one isn't a bug detect for those who asked, we simply want to -* activate Sony specific goodies like the camera and jogdial.. +* On a Sony system we want to enable the use of the sonypi +* driver for Sony-specific goodies like the camera and jogdial. +* We also want to avoid using certain functions of the PnP BIOS. */ int is_sony_vaio_laptop;
@@ -333,7 +331,6 @@ }return 0 ; } -#endif /* * This bios swaps the APM minute reporting bytes over (Many sony laptops
@@ -459,13 +456,11 @@MATCH (DMI_BIOS_VENDOR ,"SystemSoft" ), MATCH(DMI_BIOS_VERSION,"Version R2.08") } }, -#if defined(CONFIG_SONYPI) || defined(CONFIG_SONYPI_MODULE) { sony_vaio_laptop, "Sony Vaio", { /* This is a Sony Vaio laptop */MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ),MATCH (DMI_PRODUCT_NAME ,"PCG-" ),NO_MATCH ,NO_MATCH , } }, -#endif { swab_apm_power_in_minutes, "Sony VAIO", { /* Handle problems with APM on Sony Vaio PCG-N505X(DE) */MATCH (DMI_BIOS_VENDOR ,"Phoenix Technologies LTD" ), MATCH(DMI_BIOS_VERSION, "R0206H"),
arch/i386/kernel/i386_ksyms.c +0 -2
@@ -171,8 +171,6 @@EXPORT_SYMBOL (do_BUG);#endif -#if defined(CONFIG_SONYPI ) || defined(CONFIG_SONYPI_MODULE )extern int is_sony_vaio_laptop;EXPORT_SYMBOL (is_sony_vaio_laptop); -#endif
Quoted 4 lines · Thomas Hood
Here's the patch to the PnP BIOS driver for Vaio laptops again, this time against 2.4.9-ac18. It's unchanged, but as per the "SubmittingPatches" file, I append rather than attach it. // Thomas
Ok, here I am again, sorry for not being able to react on your patches this weekend...
I tested your latest patches with a 2.4.9-ac18 kernels, and, surprise, the kernel now boots correctly, _without_ any pnpbios* boot option.
Since the DMI / PNP order was not modified as of ac18, I suppose the patches change something else which makes it work...
Stelian.
Signature · 4 lines
Stelian Pop <[email protected]> |---------------- Free Software Engineer -----------------| | Alcôve - http://www.alcove.com - Tel: +33 1 49 22 68 00 | |------------- Alcôve, liberating software ---------------|
Le driver de stelian est tombé en marche ;-)
Quoted 30 lines · you
Quoted 4 lines · Thomas Hood
Here's the patch to the PnP BIOS driver for Vaio laptops again, this time against 2.4.9-ac18. It's unchanged, but as per the "SubmittingPatches" file, I append rather than attach it. // Thomas
Ok, here I am again, sorry for not being able to react on your patches this weekend...
I tested your latest patches with a 2.4.9-ac18 kernels, and, surprise, the kernel now boots correctly, _without_ any pnpbios* boot option.
Since the DMI / PNP order was not modified as of ac18, I suppose the patches change something else which makes it work...
Stelian.
Signature · 9 lines
Stelian Pop <[email protected]> |---------------- Free Software Engineer -----------------| | Alcôve - http://www.alcove.com - Tel: +33 1 49 22 68 00 | |------------- Alcôve, liberating software ---------------| - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/