Skip to content

L
linux
Commit 0d440bfb authored by Dave Jones's avatar Dave Jones
Browse files
Options

[PATCH] pnpbios driver update. 

Update from Thomas..

Here are the additional bits from the -ac tree, diffed
against 2.5.6 + 2.5.5-dj3 patch.  The changes include:

- Improve some comments
- Postpone starting the kernel thread (Alan Cox)
- Call kernel thread 'kpnpbiosd' instead of 'kpnpbios'
- Consolidate printing of error messages to save space
- Add __init and __exit tags and return appropriate error codes
- Print slightly more consistent messages
- Get closer to supporting build-as-module
parent 24cece3a
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 110 deletions
drivers/pnp/pnpbios_core.c
View file @ 0d440bfb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Originally (C) 1998 Christian Schmidt <schmidt@digadd.de> * Originally (C) 1998 Christian Schmidt <schmidt@digadd.de>
* Modifications (c) 1998 Tom Lees <tom@lpsg.demon.co.uk> * Modifications (c) 1998 Tom Lees <tom@lpsg.demon.co.uk>
* Minor reorganizations by David Hinds <dahinds@users.sourceforge.net> * Minor reorganizations by David Hinds <dahinds@users.sourceforge.net>
* Modifications (c) 2001 by Thomas Hood <jdthood@mail.com> * Modifications (c) 2001,2002 by Thomas Hood <jdthood@mail.com>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
...@@ -190,8 +190,8 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3, ...@@ -190,8 +190,8 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
/* If we get here and this is set then the PnP BIOS faulted on us. */ /* If we get here and this is set then the PnP BIOS faulted on us. */
if(pnp_bios_is_utter_crap) if(pnp_bios_is_utter_crap)
{ {
printk(KERN_ERR "PnPBIOS: Warning! Your PnP BIOS caused a fatal error. Attempting to continue.\n"); printk(KERN_ERR "PnPBIOS: Warning! Your PnP BIOS caused a fatal error. Attempting to continue\n");
printk(KERN_ERR "PnPBIOS: You may need to reboot with the \"nobiospnp\" option to operate stably.\n"); printk(KERN_ERR "PnPBIOS: You may need to reboot with the \"nobiospnp\" option to operate stably\n");
printk(KERN_ERR "PnPBIOS: Check with your vendor for an updated BIOS\n"); printk(KERN_ERR "PnPBIOS: Check with your vendor for an updated BIOS\n");
} }
...@@ -205,11 +205,16 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3, ...@@ -205,11 +205,16 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
* *
*/ */
static void pnpbios_warn_unexpected_status(const char * module, u16 status)
{
printk(KERN_ERR "PnPBIOS: %s: Unexpected status 0x%x\n", module, status);
}
void *pnpbios_kmalloc(size_t size, int f) void *pnpbios_kmalloc(size_t size, int f)
{ {
void *p = kmalloc( size, f ); void *p = kmalloc( size, f );
if ( p == NULL ) if ( p == NULL )
printk(KERN_ERR "PnPBIOS: kmalloc() failed.\n"); printk(KERN_ERR "PnPBIOS: kmalloc() failed\n");
return p; return p;
} }
...@@ -251,7 +256,7 @@ static void update_devlist( u8 nodenum, struct pnp_bios_node *data ); ...@@ -251,7 +256,7 @@ static void update_devlist( u8 nodenum, struct pnp_bios_node *data );
static int __pnp_bios_dev_node_info(struct pnp_dev_node_info *data) static int __pnp_bios_dev_node_info(struct pnp_dev_node_info *data)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, data, sizeof(struct pnp_dev_node_info)); Q2_SET_SEL(PNP_TS1, data, sizeof(struct pnp_dev_node_info));
status = call_pnp_bios(PNP_GET_NUM_SYS_DEV_NODES, 0, PNP_TS1, 2, PNP_TS1, PNP_DS, 0, 0); status = call_pnp_bios(PNP_GET_NUM_SYS_DEV_NODES, 0, PNP_TS1, 2, PNP_TS1, PNP_DS, 0, 0);
...@@ -263,7 +268,7 @@ int pnp_bios_dev_node_info(struct pnp_dev_node_info *data) ...@@ -263,7 +268,7 @@ int pnp_bios_dev_node_info(struct pnp_dev_node_info *data)
{ {
int status = __pnp_bios_dev_node_info( data ); int status = __pnp_bios_dev_node_info( data );
if ( status ) if ( status )
printk(KERN_WARNING "PnPBIOS: dev_node_info: Unexpected status 0x%x\n", status); pnpbios_warn_unexpected_status( "dev_node_info", status );
return status; return status;
} }
...@@ -284,7 +289,7 @@ int pnp_bios_dev_node_info(struct pnp_dev_node_info *data) ...@@ -284,7 +289,7 @@ int pnp_bios_dev_node_info(struct pnp_dev_node_info *data)
static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data) static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
if ( !boot & pnpbios_dont_use_current_config ) if ( !boot & pnpbios_dont_use_current_config )
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
...@@ -299,7 +304,7 @@ int pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data) ...@@ -299,7 +304,7 @@ int pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data)
int status; int status;
status = __pnp_bios_get_dev_node( nodenum, boot, data ); status = __pnp_bios_get_dev_node( nodenum, boot, data );
if ( status ) if ( status )
printk(KERN_WARNING "PnPBIOS: get_dev_node: Unexpected 0x%x\n", status); pnpbios_warn_unexpected_status( "get_dev_node", status );
return status; return status;
} }
...@@ -313,7 +318,7 @@ int pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data) ...@@ -313,7 +318,7 @@ int pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data)
static int __pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *data) static int __pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *data)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
if ( !boot & pnpbios_dont_use_current_config ) if ( !boot & pnpbios_dont_use_current_config )
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
...@@ -327,17 +332,14 @@ int pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *data) ...@@ -327,17 +332,14 @@ int pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *data)
int status; int status;
status = __pnp_bios_set_dev_node( nodenum, boot, data ); status = __pnp_bios_set_dev_node( nodenum, boot, data );
if ( status ) { if ( status ) {
printk(KERN_WARNING "PnPBIOS: set_dev_node: Unexpected set_dev_node status 0x%x\n", status); pnpbios_warn_unexpected_status( "set_dev_node", status );
return status; return status;
} }
if ( !boot ) { if ( !boot ) { /* Update devlist */
/* Update devlist */
u8 thisnodenum = nodenum; u8 thisnodenum = nodenum;
status = __pnp_bios_get_dev_node( &nodenum, boot, data ); status = pnp_bios_get_dev_node( &nodenum, boot, data );
if ( status ) { if ( status )
printk(KERN_WARNING "PnPBIOS: set_dev_node: Unexpected get_dev_node status 0x%x\n", status);
return status; return status;
}
update_devlist( thisnodenum, data ); update_devlist( thisnodenum, data );
} }
return status; return status;
...@@ -350,7 +352,7 @@ int pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *data) ...@@ -350,7 +352,7 @@ int pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *data)
static int pnp_bios_get_event(u16 *event) static int pnp_bios_get_event(u16 *event)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, event, sizeof(u16)); Q2_SET_SEL(PNP_TS1, event, sizeof(u16));
status = call_pnp_bios(PNP_GET_EVENT, 0, PNP_TS1, PNP_DS, 0, 0 ,0 ,0); status = call_pnp_bios(PNP_GET_EVENT, 0, PNP_TS1, PNP_DS, 0, 0 ,0 ,0);
...@@ -365,7 +367,7 @@ static int pnp_bios_get_event(u16 *event) ...@@ -365,7 +367,7 @@ static int pnp_bios_get_event(u16 *event)
static int pnp_bios_send_message(u16 message) static int pnp_bios_send_message(u16 message)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
status = call_pnp_bios(PNP_SEND_MESSAGE, message, PNP_DS, 0, 0, 0, 0, 0); status = call_pnp_bios(PNP_SEND_MESSAGE, message, PNP_DS, 0, 0, 0, 0, 0);
return status; return status;
...@@ -379,7 +381,7 @@ static int pnp_bios_send_message(u16 message) ...@@ -379,7 +381,7 @@ static int pnp_bios_send_message(u16 message)
static int pnp_bios_dock_station_info(struct pnp_docking_station_info *data) static int pnp_bios_dock_station_info(struct pnp_docking_station_info *data)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, data, sizeof(struct pnp_docking_station_info)); Q2_SET_SEL(PNP_TS1, data, sizeof(struct pnp_docking_station_info));
status = call_pnp_bios(PNP_GET_DOCKING_STATION_INFORMATION, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0); status = call_pnp_bios(PNP_GET_DOCKING_STATION_INFORMATION, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0);
...@@ -395,7 +397,7 @@ static int pnp_bios_dock_station_info(struct pnp_docking_station_info *data) ...@@ -395,7 +397,7 @@ static int pnp_bios_dock_station_info(struct pnp_docking_station_info *data)
static int pnp_bios_set_stat_res(char *info) static int pnp_bios_set_stat_res(char *info)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, info, *((u16 *) info)); Q2_SET_SEL(PNP_TS1, info, *((u16 *) info));
status = call_pnp_bios(PNP_SET_STATIC_ALLOCED_RES_INFO, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0); status = call_pnp_bios(PNP_SET_STATIC_ALLOCED_RES_INFO, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0);
...@@ -403,21 +405,28 @@ static int pnp_bios_set_stat_res(char *info) ...@@ -403,21 +405,28 @@ static int pnp_bios_set_stat_res(char *info)
} }
#endif #endif
#if needed
/* /*
* Call PnP BIOS with function 0x0a, "get statically allocated resource * Call PnP BIOS with function 0x0a, "get statically allocated resource
* information" * information"
*/ */
static int pnp_bios_get_stat_res(char *info) static int __pnp_bios_get_stat_res(char *info)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, info, 64 * 1024); Q2_SET_SEL(PNP_TS1, info, 64 * 1024);
status = call_pnp_bios(PNP_GET_STATIC_ALLOCED_RES_INFO, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0); status = call_pnp_bios(PNP_GET_STATIC_ALLOCED_RES_INFO, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0);
return status; return status;
} }
#endif
int pnp_bios_get_stat_res(char *info)
{
int status;
status = __pnp_bios_get_stat_res( info );
if ( status )
pnpbios_warn_unexpected_status( "get_stat_res", status );
return status;
}
#if needed #if needed
/* /*
...@@ -426,7 +435,7 @@ static int pnp_bios_get_stat_res(char *info) ...@@ -426,7 +435,7 @@ static int pnp_bios_get_stat_res(char *info)
static int pnp_bios_apm_id_table(char *table, u16 *size) static int pnp_bios_apm_id_table(char *table, u16 *size)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, table, *size); Q2_SET_SEL(PNP_TS1, table, *size);
Q2_SET_SEL(PNP_TS2, size, sizeof(u16)); Q2_SET_SEL(PNP_TS2, size, sizeof(u16));
...@@ -435,45 +444,58 @@ static int pnp_bios_apm_id_table(char *table, u16 *size) ...@@ -435,45 +444,58 @@ static int pnp_bios_apm_id_table(char *table, u16 *size)
} }
#endif #endif
#if needed
/* /*
* Call PnP BIOS with function 0x40, "get isa pnp configuration structure" * Call PnP BIOS with function 0x40, "get isa pnp configuration structure"
*/ */
static int pnp_bios_isapnp_config(struct pnp_isa_config_struc *data) static int __pnp_bios_isapnp_config(struct pnp_isa_config_struc *data)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, data, sizeof(struct pnp_isa_config_struc)); Q2_SET_SEL(PNP_TS1, data, sizeof(struct pnp_isa_config_struc));
status = call_pnp_bios(PNP_GET_PNP_ISA_CONFIG_STRUC, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0); status = call_pnp_bios(PNP_GET_PNP_ISA_CONFIG_STRUC, 0, PNP_TS1, PNP_DS, 0, 0, 0, 0);
return status; return status;
} }
#endif
#if needed int pnp_bios_isapnp_config(struct pnp_isa_config_struc *data)
{
int status;
status = __pnp_bios_isapnp_config( data );
if ( status )
pnpbios_warn_unexpected_status( "isapnp_config", status );
return status;
}
/* /*
* Call PnP BIOS with function 0x41, "get ESCD info" * Call PnP BIOS with function 0x41, "get ESCD info"
*/ */
static int pnp_bios_escd_info(struct escd_info_struc *data) static int __pnp_bios_escd_info(struct escd_info_struc *data)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return ESCD_FUNCTION_NOT_SUPPORTED; return ESCD_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, data, sizeof(struct escd_info_struc)); Q2_SET_SEL(PNP_TS1, data, sizeof(struct escd_info_struc));
status = call_pnp_bios(PNP_GET_ESCD_INFO, 0, PNP_TS1, 2, PNP_TS1, 4, PNP_TS1, PNP_DS); status = call_pnp_bios(PNP_GET_ESCD_INFO, 0, PNP_TS1, 2, PNP_TS1, 4, PNP_TS1, PNP_DS);
return status; return status;
} }
#endif
#if needed int pnp_bios_escd_info(struct escd_info_struc *data)
{
int status;
status = __pnp_bios_escd_info( data );
if ( status )
pnpbios_warn_unexpected_status( "escd_info", status );
return status;
}
/* /*
* Call PnP BIOS function 0x42, "read ESCD" * Call PnP BIOS function 0x42, "read ESCD"
* nvram_base is determined by calling escd_info * nvram_base is determined by calling escd_info
*/ */
static int pnp_bios_read_escd(char *data, u32 nvram_base) static int __pnp_bios_read_escd(char *data, u32 nvram_base)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return ESCD_FUNCTION_NOT_SUPPORTED; return ESCD_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, data, 64 * 1024); Q2_SET_SEL(PNP_TS1, data, 64 * 1024);
set_base(gdt[PNP_TS2 >> 3], nvram_base); set_base(gdt[PNP_TS2 >> 3], nvram_base);
...@@ -481,7 +503,15 @@ static int pnp_bios_read_escd(char *data, u32 nvram_base) ...@@ -481,7 +503,15 @@ static int pnp_bios_read_escd(char *data, u32 nvram_base)
status = call_pnp_bios(PNP_READ_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0); status = call_pnp_bios(PNP_READ_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0);
return status; return status;
} }
#endif
int pnp_bios_read_escd(char *data, u32 nvram_base)
{
int status;
status = __pnp_bios_read_escd( data, nvram_base );
if ( status )
pnpbios_warn_unexpected_status( "read_escd", status );
return status;
}
#if needed #if needed
/* /*
...@@ -490,7 +520,7 @@ static int pnp_bios_read_escd(char *data, u32 nvram_base) ...@@ -490,7 +520,7 @@ static int pnp_bios_read_escd(char *data, u32 nvram_base)
static int pnp_bios_write_escd(char *data, u32 nvram_base) static int pnp_bios_write_escd(char *data, u32 nvram_base)
{ {
u16 status; u16 status;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return ESCD_FUNCTION_NOT_SUPPORTED; return ESCD_FUNCTION_NOT_SUPPORTED;
Q2_SET_SEL(PNP_TS1, data, 64 * 1024); Q2_SET_SEL(PNP_TS1, data, 64 * 1024);
set_base(gdt[PNP_TS2 >> 3], nvram_base); set_base(gdt[PNP_TS2 >> 3], nvram_base);
...@@ -574,13 +604,13 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info) ...@@ -574,13 +604,13 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
static int pnp_dock_thread(void * unused) static int pnp_dock_thread(void * unused)
{ {
static struct pnp_docking_station_info now; static struct pnp_docking_station_info now;
int docked = -1, d; int docked = -1, d = 0;
daemonize(); daemonize();
reparent_to_init(); reparent_to_init();
strcpy(current->comm, "kpnpbios"); strcpy(current->comm, "kpnpbiosd");
while(!unloading && !signal_pending(current)) while(!unloading && !signal_pending(current))
{ {
int err; int status;
/* /*
* Poll every 2 seconds * Poll every 2 seconds
...@@ -590,9 +620,9 @@ static int pnp_dock_thread(void * unused) ...@@ -590,9 +620,9 @@ static int pnp_dock_thread(void * unused)
if(signal_pending(current)) if(signal_pending(current))
break; break;
err = pnp_bios_dock_station_info(&now); status = pnp_bios_dock_station_info(&now);
switch(err) switch(status)
{ {
/* /*
* No dock to manage * No dock to manage
...@@ -606,7 +636,7 @@ static int pnp_dock_thread(void * unused) ...@@ -606,7 +636,7 @@ static int pnp_dock_thread(void * unused)
d = 1; d = 1;
break; break;
default: default:
printk(KERN_WARNING "PnPBIOS: pnp_dock_thread: Unexpected status 0x%x returned by BIOS.\n", err); pnpbios_warn_unexpected_status( "pnp_dock_thread", status );
continue; continue;
} }
if(d != docked) if(d != docked)
...@@ -615,7 +645,7 @@ static int pnp_dock_thread(void * unused) ...@@ -615,7 +645,7 @@ static int pnp_dock_thread(void * unused)
{ {
docked = d; docked = d;
#if 0 #if 0
printk(KERN_INFO "PnPBIOS: Docking station %stached.\n", docked?"at":"de"); printk(KERN_INFO "PnPBIOS: Docking station %stached\n", docked?"at":"de");
#endif #endif
} }
} }
...@@ -848,15 +878,14 @@ static void inline pnpid32_to_pnpid(u32 id, char *str) ...@@ -848,15 +878,14 @@ static void inline pnpid32_to_pnpid(u32 id, char *str)
*/ */
static void __init build_devlist(void) static void __init build_devlist(void)
{ {
int i; u8 nodenum;
int nodenum; unsigned int nodes_got = 0;
int nodes_got = 0; unsigned int devs = 0;
int devs = 0;
struct pnp_bios_node *node; struct pnp_bios_node *node;
struct pnp_dev_node_info node_info; struct pnp_dev_node_info node_info;
struct pci_dev *dev; struct pci_dev *dev;
if (!pnp_bios_present ()) if (!pnp_bios_present())
return; return;
if (pnp_bios_dev_node_info(&node_info) != 0) if (pnp_bios_dev_node_info(&node_info) != 0)
...@@ -866,26 +895,20 @@ static void __init build_devlist(void) ...@@ -866,26 +895,20 @@ static void __init build_devlist(void)
if (!node) if (!node)
return; return;
for(i=0,nodenum=0; i<0xff && nodenum!=0xff; i++) { for(nodenum=0; nodenum<0xff; ) {
int thisnodenum = nodenum; u8 thisnodenum = nodenum;
/* For now we build the list from the "boot" config /* We build the list from the "boot" config because
* because asking for the "current" config causes * asking for the "current" config causes some
* some BIOSes to crash. */ * BIOSes to crash.
if (pnp_bios_get_dev_node((u8 *)&nodenum, (char )1 , node)) { */
printk(KERN_WARNING "PnPBIOS: PnP BIOS reported error on attempt to get dev node.\n"); if (pnp_bios_get_dev_node(&nodenum, (char )1 , node))
break;
}
/* The BIOS returns with nodenum = the next node number */
if (nodenum < thisnodenum) {
printk(KERN_WARNING "PnPBIOS: Node number is out of sequence. Naughty BIOS!\n");
break; break;
}
nodes_got++; nodes_got++;
dev = pnpbios_kmalloc(sizeof (struct pci_dev), GFP_KERNEL); dev = pnpbios_kmalloc(sizeof (struct pci_dev), GFP_KERNEL);
if (!dev) if (!dev)
break; break;
memset(dev,0,sizeof(struct pci_dev)); memset(dev,0,sizeof(struct pci_dev));
dev->devfn=thisnodenum; dev->devfn = thisnodenum;
memcpy(dev->name,"PNPBIOS",8); memcpy(dev->name,"PNPBIOS",8);
pnpid32_to_pnpid(node->eisa_id,dev->slot_name); pnpid32_to_pnpid(node->eisa_id,dev->slot_name);
node_resource_data_to_dev(node,dev); node_resource_data_to_dev(node,dev);
...@@ -893,10 +916,14 @@ static void __init build_devlist(void) ...@@ -893,10 +916,14 @@ static void __init build_devlist(void)
kfree(dev); kfree(dev);
else else
devs++; devs++;
if (nodenum <= thisnodenum) {
printk(KERN_ERR "PnPBIOS: build_devlist: Node number 0x%x is out of sequence following node 0x%x. Aborting.\n", (unsigned int)nodenum, (unsigned int)thisnodenum);
break;
}
} }
kfree(node); kfree(node);
printk(KERN_INFO "PnPBIOS: %i node%s reported by PnP BIOS; %i recorded by driver.\n", printk(KERN_INFO "PnPBIOS: %i node%s reported by PnP BIOS; %i recorded by driver\n",
nodes_got, nodes_got != 1 ? "s" : "", devs); nodes_got, nodes_got != 1 ? "s" : "", devs);
} }
...@@ -1062,7 +1089,7 @@ static void __init reserve_ioport_range(char *pnpid, int start, int end) ...@@ -1062,7 +1089,7 @@ static void __init reserve_ioport_range(char *pnpid, int start, int end)
regionid = pnpbios_kmalloc(16, GFP_KERNEL); regionid = pnpbios_kmalloc(16, GFP_KERNEL);
if ( regionid == NULL ) if ( regionid == NULL )
return; return;
sprintf(regionid, "PnPBIOS %s", pnpid); snprintf(regionid, 16, "PnPBIOS %s", pnpid);
res = request_region(start,end-start+1,regionid); res = request_region(start,end-start+1,regionid);
if ( res == NULL ) if ( res == NULL )
kfree( regionid ); kfree( regionid );
...@@ -1074,7 +1101,7 @@ static void __init reserve_ioport_range(char *pnpid, int start, int end) ...@@ -1074,7 +1101,7 @@ static void __init reserve_ioport_range(char *pnpid, int start, int end)
* have double reservations. * have double reservations.
*/ */
printk(KERN_INFO printk(KERN_INFO
"PnPBIOS: %s: ioport range 0x%x-0x%x %s reserved.\n", "PnPBIOS: %s: ioport range 0x%x-0x%x %s reserved\n",
pnpid, start, end, pnpid, start, end,
NULL != res ? "has been" : "could not be" NULL != res ? "has been" : "could not be"
); );
...@@ -1193,14 +1220,14 @@ int __init pnpbios_init(void) ...@@ -1193,14 +1220,14 @@ int __init pnpbios_init(void)
{ {
union pnp_bios_expansion_header *check; union pnp_bios_expansion_header *check;
u8 sum; u8 sum;
int i, length; int i, length, r;
spin_lock_init(&pnp_bios_lock); spin_lock_init(&pnp_bios_lock);
spin_lock_init(&pnpbios_devices_lock); spin_lock_init(&pnpbios_devices_lock);
if(pnpbios_disabled) { if(pnpbios_disabled) {
printk(KERN_INFO "PnPBIOS: Disabled.\n"); printk(KERN_INFO "PnPBIOS: Disabled\n");
return 0; return -ENODEV;
} }
if ( is_sony_vaio_laptop ) if ( is_sony_vaio_laptop )
...@@ -1224,13 +1251,13 @@ int __init pnpbios_init(void) ...@@ -1224,13 +1251,13 @@ int __init pnpbios_init(void)
if (sum) if (sum)
continue; continue;
if (check->fields.version < 0x10) { if (check->fields.version < 0x10) {
printk(KERN_WARNING "PnPBIOS: PnP BIOS version %d.%d is not supported.\n", printk(KERN_WARNING "PnPBIOS: PnP BIOS version %d.%d is not supported\n",
check->fields.version >> 4, check->fields.version >> 4,
check->fields.version & 15); check->fields.version & 15);
continue; continue;
} }
printk(KERN_INFO "PnPBIOS: Found PnP BIOS installation structure at 0x%p.\n", check); printk(KERN_INFO "PnPBIOS: Found PnP BIOS installation structure at 0x%p\n", check);
printk(KERN_INFO "PnPBIOS: PnP BIOS version %d.%d, entry 0x%x:0x%x, dseg 0x%x.\n", printk(KERN_INFO "PnPBIOS: PnP BIOS version %d.%d, entry 0x%x:0x%x, dseg 0x%x\n",
check->fields.version >> 4, check->fields.version & 15, check->fields.version >> 4, check->fields.version & 15,
check->fields.pm16cseg, check->fields.pm16offset, check->fields.pm16cseg, check->fields.pm16offset,
check->fields.pm16dseg); check->fields.pm16dseg);
...@@ -1242,12 +1269,21 @@ int __init pnpbios_init(void) ...@@ -1242,12 +1269,21 @@ int __init pnpbios_init(void)
pnp_bios_hdr = check; pnp_bios_hdr = check;
break; break;
} }
if (!pnp_bios_present())
return -ENODEV;
build_devlist(); build_devlist();
if ( ! dont_reserve_resources ) if ( ! dont_reserve_resources )
reserve_resources(); reserve_resources();
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
pnpbios_proc_init(); r = pnpbios_proc_init();
if (r)
return r;
#endif #endif
return 0;
}
static int __init pnpbios_thread_init(void)
{
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG
init_completion(&unload_sem); init_completion(&unload_sem);
if(kernel_thread(pnp_dock_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL)>0) if(kernel_thread(pnp_dock_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL)>0)
...@@ -1256,23 +1292,46 @@ int __init pnpbios_init(void) ...@@ -1256,23 +1292,46 @@ int __init pnpbios_init(void)
return 0; return 0;
} }
#ifdef MODULE #ifndef MODULE
/* init/main.c calls pnpbios_init early */
/* Start the kernel thread later: */
module_init(pnpbios_thread_init);
#else
/*
* N.B.: Building pnpbios as a module hasn't been fully implemented
*/
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* We have to run it early and not as a module. */ static int __init pnpbios_init_all(void)
module_init(pnpbios_init); {
int r;
r = pnpbios_init();
if (r)
return r;
r = pnpbios_thread_init();
if (r)
return r;
return 0;
}
#ifdef CONFIG_HOTPLUG static void __exit pnpbios_exit(void)
static void pnpbios_exit(void)
{ {
/* free_resources() ought to go here */ #ifdef CONFIG_HOTPLUG
/* pnpbios_proc_done() */
unloading = 1; unloading = 1;
wait_for_completion(&unload_sem); wait_for_completion(&unload_sem);
#endif
pnpbios_proc_exit();
/* We ought to free resources here */
return;
} }
module_init(pnpbios_init_all);
module_exit(pnpbios_exit); module_exit(pnpbios_exit);
#endif #endif
#endif
drivers/pnp/pnpbios_proc.c
View file @ 0d440bfb
/* /*
* pnp_proc.c: /proc/bus/pnp interface for Plug and Play devices * /proc/bus/pnp interface for Plug and Play devices
* *
* Written by David Hinds, dahinds@users.sourceforge.net * Written by David Hinds, dahinds@users.sourceforge.net
* Modified by Thomas Hood, jdthood@mail.com
*
* The .../devices and .../<node> and .../boot/<node> files are
* utilized by the lspnp and setpnp utilities, supplied with the
* pcmcia-cs package.
* http://pcmcia-cs.sourceforge.net
*
* The .../escd file is utilized by the lsescd utility written by
* Gunther Mayer.
* http://home.t-online.de/home/gunther.mayer/lsescd
*
* The .../legacy_device_resources file is not used yet.
*
* The other files are human-readable.
*/ */
//#include <pcmcia/config.h> //#include <pcmcia/config.h>
...@@ -19,30 +33,118 @@ static struct proc_dir_entry *proc_pnp = NULL; ...@@ -19,30 +33,118 @@ static struct proc_dir_entry *proc_pnp = NULL;
static struct proc_dir_entry *proc_pnp_boot = NULL; static struct proc_dir_entry *proc_pnp_boot = NULL;
static struct pnp_dev_node_info node_info; static struct pnp_dev_node_info node_info;
static int proc_read_pnpconfig(char *buf, char **start, off_t pos,
int count, int *eof, void *data)
{
struct pnp_isa_config_struc pnps;
if (pnp_bios_isapnp_config(&pnps))
return -EIO;
return snprintf(buf, count,
"structure_revision %d\n"
"number_of_CSNs %d\n"
"ISA_read_data_port 0x%x\n",
pnps.revision,
pnps.no_csns,
pnps.isa_rd_data_port
);
}
static int proc_read_escdinfo(char *buf, char **start, off_t pos,
int count, int *eof, void *data)
{
struct escd_info_struc escd;
if (pnp_bios_escd_info(&escd))
return -EIO;
return snprintf(buf, count,
"min_ESCD_write_size %d\n"
"ESCD_size %d\n"
"NVRAM_base 0x%x\n",
escd.min_escd_write_size,
escd.escd_size,
escd.nv_storage_base
);
}
static int proc_read_escd(char *buf, char **start, off_t pos,
int count, int *eof, void *data)
{
struct escd_info_struc escd;
char *tmpbuf;
int escd_size, escd_left_to_read, n;
if (pnp_bios_escd_info(&escd))
return -EIO;
/* sanity check */
if (escd.escd_size > (32*1024)) {
printk(KERN_ERR "PnPBIOS: proc_read_escd: ESCD size is too great\n");
return -EFBIG;
}
tmpbuf = pnpbios_kmalloc(escd.escd_size, GFP_KERNEL);
if (!tmpbuf) return -ENOMEM;
if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base))
return -EIO;
escd_size = (unsigned char)(buf[0]) + (unsigned char)(buf[1])*256;
escd_left_to_read = escd_size - pos;
if (escd_left_to_read < 0) escd_left_to_read = 0;
if (escd_left_to_read == 0) *eof = 1;
n = min(count,escd_left_to_read);
memcpy(buf, tmpbuf + pos, n);
kfree(tmpbuf);
*start = buf;
return n;
}
static int proc_read_legacyres(char *buf, char **start, off_t pos,
int count, int *eof, void *data)
{
/* Assume that the following won't overflow the buffer */
if (pnp_bios_get_stat_res(buf))
return -EIO;
return count; // FIXME: Return actual length
}
static int proc_read_devices(char *buf, char **start, off_t pos, static int proc_read_devices(char *buf, char **start, off_t pos,
int count, int *eof, void *data) int count, int *eof, void *data)
{ {
struct pnp_bios_node *node; struct pnp_bios_node *node;
int i;
u8 nodenum; u8 nodenum;
char *p = buf; char *p = buf;
if (pos != 0) { if (pos >= 0xff)
*eof = 1; return 0;
return 0;
}
node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL); node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
if (!node) return -ENOMEM; if (!node) return -ENOMEM;
for (i=0,nodenum=0;i<0xff && nodenum!=0xff; i++) {
if ( pnp_bios_get_dev_node(&nodenum, 1, node) ) for (nodenum=pos; nodenum<0xff; ) {
u8 thisnodenum = nodenum;
/* 26 = the number of characters per line sprintf'ed */
if ((p - buf + 26) > count)
break;
if (pnp_bios_get_dev_node(&nodenum, 1, node))
break; break;
p += sprintf(p, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n", p += sprintf(p, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n",
node->handle, node->eisa_id, node->handle, node->eisa_id,
node->type_code[0], node->type_code[1], node->type_code[0], node->type_code[1],
node->type_code[2], node->flags); node->type_code[2], node->flags);
if (nodenum <= thisnodenum) {
printk(KERN_ERR "%s Node number 0x%x is out of sequence following node 0x%x. Aborting.\n", "PnPBIOS: proc_read_devices:", (unsigned int)nodenum, (unsigned int)thisnodenum);
*eof = 1;
break;
}
} }
kfree(node); kfree(node);
return (p-buf); if (nodenum == 0xff)
*eof = 1;
*start = (char *)((off_t)nodenum - pos);
return p - buf;
} }
static int proc_read_node(char *buf, char **start, off_t pos, static int proc_read_node(char *buf, char **start, off_t pos,
...@@ -53,13 +155,9 @@ static int proc_read_node(char *buf, char **start, off_t pos, ...@@ -53,13 +155,9 @@ static int proc_read_node(char *buf, char **start, off_t pos,
u8 nodenum = (long)data; u8 nodenum = (long)data;
int len; int len;
if (pos != 0) {
*eof = 1;
return 0;
}
node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL); node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
if (!node) return -ENOMEM; if (!node) return -ENOMEM;
if ( pnp_bios_get_dev_node(&nodenum, boot, node) ) if (pnp_bios_get_dev_node(&nodenum, boot, node))
return -EIO; return -EIO;
len = node->size - sizeof(struct pnp_bios_node); len = node->size - sizeof(struct pnp_bios_node);
memcpy(buf, node->data, len); memcpy(buf, node->data, len);
...@@ -92,25 +190,34 @@ static int proc_write_node(struct file *file, const char *buf, ...@@ -92,25 +190,34 @@ static int proc_write_node(struct file *file, const char *buf,
* work and the pnpbios_dont_use_current_config flag * work and the pnpbios_dont_use_current_config flag
* should already have been set to the appropriate value * should already have been set to the appropriate value
*/ */
void pnpbios_proc_init( void ) int __init pnpbios_proc_init( void )
{ {
struct pnp_bios_node *node; struct pnp_bios_node *node;
struct proc_dir_entry *ent; struct proc_dir_entry *ent;
char name[3]; char name[3];
int i;
u8 nodenum; u8 nodenum;
if (pnp_bios_dev_node_info(&node_info) != 0) return; if (pnp_bios_dev_node_info(&node_info))
return -EIO;
proc_pnp = proc_mkdir("pnp", proc_bus); proc_pnp = proc_mkdir("pnp", proc_bus);
if (!proc_pnp) return; if (!proc_pnp)
return -EIO;
proc_pnp_boot = proc_mkdir("boot", proc_pnp); proc_pnp_boot = proc_mkdir("boot", proc_pnp);
if (!proc_pnp_boot) return; if (!proc_pnp_boot)
return -EIO;
create_proc_read_entry("devices", 0, proc_pnp, proc_read_devices, NULL); create_proc_read_entry("devices", 0, proc_pnp, proc_read_devices, NULL);
create_proc_read_entry("configuration_info", 0, proc_pnp, proc_read_pnpconfig, NULL);
create_proc_read_entry("escd_info", 0, proc_pnp, proc_read_escdinfo, NULL);
create_proc_read_entry("escd", 0, proc_pnp, proc_read_escd, NULL);
create_proc_read_entry("legacy_device_resources", 0, proc_pnp, proc_read_legacyres, NULL);
node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL); node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
if (!node) return; if (!node)
for (i=0,nodenum = 0; i<0xff && nodenum != 0xff; i++) { return -ENOMEM;
for (nodenum=0; nodenum<0xff; ) {
u8 thisnodenum = nodenum;
if (pnp_bios_get_dev_node(&nodenum, 1, node) != 0) if (pnp_bios_get_dev_node(&nodenum, 1, node) != 0)
break; break;
sprintf(name, "%02x", node->handle); sprintf(name, "%02x", node->handle);
...@@ -128,11 +235,17 @@ void pnpbios_proc_init( void ) ...@@ -128,11 +235,17 @@ void pnpbios_proc_init( void )
ent->write_proc = proc_write_node; ent->write_proc = proc_write_node;
ent->data = (void *)(long)(node->handle+0x100); ent->data = (void *)(long)(node->handle+0x100);
} }
if (nodenum <= thisnodenum) {
printk(KERN_ERR "%s Node number 0x%x is out of sequence following node 0x%x. Aborting.\n", "PnPBIOS: proc_init:", (unsigned int)nodenum, (unsigned int)thisnodenum);
break;
}
} }
kfree(node); kfree(node);
return 0;
} }
void pnpbios_proc_done(void) void __exit pnpbios_proc_exit(void)
{ {
int i; int i;
char name[3]; char name[3];
...@@ -145,7 +258,13 @@ void pnpbios_proc_done(void) ...@@ -145,7 +258,13 @@ void pnpbios_proc_done(void)
remove_proc_entry(name, proc_pnp); remove_proc_entry(name, proc_pnp);
remove_proc_entry(name, proc_pnp_boot); remove_proc_entry(name, proc_pnp_boot);
} }
remove_proc_entry("boot", proc_pnp); remove_proc_entry("legacy_device_resources", proc_pnp);
remove_proc_entry("escd", proc_pnp);
remove_proc_entry("escd_info", proc_pnp);
remove_proc_entry("configuration_info", proc_pnp);
remove_proc_entry("devices", proc_pnp); remove_proc_entry("devices", proc_pnp);
remove_proc_entry("boot", proc_pnp);
remove_proc_entry("pnp", proc_bus); remove_proc_entry("pnp", proc_bus);
return;
} }
include/linux/pnpbios.h
View file @ 0d440bfb
...@@ -143,20 +143,21 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev * ...@@ -143,20 +143,21 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev *
extern int pnpbios_dont_use_current_config; extern int pnpbios_dont_use_current_config;
extern void *pnpbios_kmalloc(size_t size, int f); extern void *pnpbios_kmalloc(size_t size, int f);
extern int pnpbios_init (void); extern int pnpbios_init (void);
extern void pnpbios_proc_init (void); extern int pnpbios_proc_init (void);
extern void pnpbios_proc_exit (void);
extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data); extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data);
extern int pnp_bios_get_dev_node (u8 *nodenum, char config, struct pnp_bios_node *data); extern int pnp_bios_get_dev_node (u8 *nodenum, char config, struct pnp_bios_node *data);
extern int pnp_bios_set_dev_node (u8 nodenum, char config, struct pnp_bios_node *data); extern int pnp_bios_set_dev_node (u8 nodenum, char config, struct pnp_bios_node *data);
extern int pnp_bios_get_stat_res (char *info);
extern int pnp_bios_isapnp_config (struct pnp_isa_config_struc *data);
extern int pnp_bios_escd_info (struct escd_info_struc *data);
extern int pnp_bios_read_escd (char *data, u32 nvram_base);
#if needed #if needed
extern int pnp_bios_get_event (u16 *message); extern int pnp_bios_get_event (u16 *message);
extern int pnp_bios_send_message (u16 message); extern int pnp_bios_send_message (u16 message);
extern int pnp_bios_set_stat_res (char *info); extern int pnp_bios_set_stat_res (char *info);
extern int pnp_bios_get_stat_res (char *info);
extern int pnp_bios_apm_id_table (char *table, u16 *size); extern int pnp_bios_apm_id_table (char *table, u16 *size);
extern int pnp_bios_isapnp_config (struct pnp_isa_config_struc *data);
extern int pnp_bios_escd_info (struct escd_info_struc *data);
extern int pnp_bios_read_escd (char *data, u32 nvram_base);
extern int pnp_bios_write_escd (char *data, u32 nvram_base); extern int pnp_bios_write_escd (char *data, u32 nvram_base);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7