Skip to content

L
linux
Commit 05352d8c authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds
Browse files
Options

[PATCH] PnP BIOS catch up 

The patch to the PnP BIOS driver that was in 2.5.7-dj and which
went into 2.5.8-pre1 did not include Brian Gerst's SMP fix.
parent 9d09c997
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 42 deletions
drivers/pnp/pnpbios_core.c
View file @ 05352d8c
/* /*
* PnP BIOS services * pnpbios -- PnP BIOS driver
*
* This driver provides access to Plug-'n'-Play services provided by
* the PnP BIOS firmware, described in the following documents:
* Plug and Play BIOS Specification, Version 1.0A, 5 May 1994
* Plug and Play BIOS Clarification Paper, 6 October 1994
* Compaq Computer Corporation, Phoenix Technologies Ltd., Intel Corp.
* *
* 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,2002 by Thomas Hood <jdthood@mail.com> * Further modifications (C) 2001, 2002 by:
* Alan Cox <alan@redhat.com>
* Thomas Hood <jdthood@mail.com>
* Brian Gerst <bgerst@didntduck.org>
* *
* 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
...@@ -19,12 +28,6 @@ ...@@ -19,12 +28,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* References:
* Compaq Computer Corporation, Phoenix Technologies Ltd., Intel Corporation
* Plug and Play BIOS Specification, Version 1.0A, May 5, 1994
* Plug and Play BIOS Clarification Paper, October 6, 1994
*
*/ */
#include <linux/types.h> #include <linux/types.h>
...@@ -141,7 +144,9 @@ u32 pnp_bios_is_utter_crap = 0; ...@@ -141,7 +144,9 @@ u32 pnp_bios_is_utter_crap = 0;
static spinlock_t pnp_bios_lock; static spinlock_t pnp_bios_lock;
static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3, static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
u16 arg4, u16 arg5, u16 arg6, u16 arg7) u16 arg4, u16 arg5, u16 arg6, u16 arg7,
void *ts1_base, u32 ts1_size,
void *ts2_base, u32 ts2_size)
{ {
unsigned long flags; unsigned long flags;
u16 status; u16 status;
...@@ -155,7 +160,12 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3, ...@@ -155,7 +160,12 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
/* On some boxes IRQ's during PnP BIOS calls are deadly. */ /* On some boxes IRQ's during PnP BIOS calls are deadly. */
spin_lock_irqsave(&pnp_bios_lock, flags); spin_lock_irqsave(&pnp_bios_lock, flags);
__cli();
if (ts1_size)
Q2_SET_SEL(PNP_TS1, ts1_base, ts1_size);
if (ts2_size)
Q2_SET_SEL(PNP_TS2, ts2_base, ts2_size);
__asm__ __volatile__( __asm__ __volatile__(
"pushl %%ebp\n\t" "pushl %%ebp\n\t"
"pushl %%edi\n\t" "pushl %%edi\n\t"
...@@ -258,8 +268,8 @@ static int __pnp_bios_dev_node_info(struct pnp_dev_node_info *data) ...@@ -258,8 +268,8 @@ 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)); 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); data, sizeof(struct pnp_dev_node_info), 0, 0);
data->no_nodes &= 0xff; data->no_nodes &= 0xff;
return status; return status;
} }
...@@ -293,9 +303,8 @@ static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node ...@@ -293,9 +303,8 @@ static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node
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;
Q2_SET_SEL(PNP_TS1, nodenum, sizeof(char)); status = call_pnp_bios(PNP_GET_SYS_DEV_NODE, 0, PNP_TS1, 0, PNP_TS2, boot ? 2 : 1, PNP_DS, 0,
Q2_SET_SEL(PNP_TS2, data, 64 * 1024); nodenum, sizeof(char), data, 65536);
status = call_pnp_bios(PNP_GET_SYS_DEV_NODE, 0, PNP_TS1, 0, PNP_TS2, boot ? 2 : 1, PNP_DS, 0);
return status; return status;
} }
...@@ -322,8 +331,8 @@ static int __pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node * ...@@ -322,8 +331,8 @@ static int __pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *
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;
Q2_SET_SEL(PNP_TS1, data, /* *((u16 *) data)*/ 65536); status = call_pnp_bios(PNP_SET_SYS_DEV_NODE, nodenum, 0, PNP_TS1, boot ? 2 : 1, PNP_DS, 0, 0,
status = call_pnp_bios(PNP_SET_SYS_DEV_NODE, nodenum, 0, PNP_TS1, boot ? 2 : 1, PNP_DS, 0, 0); data, 65536, 0, 0);
return status; return status;
} }
...@@ -354,8 +363,8 @@ static int pnp_bios_get_event(u16 *event) ...@@ -354,8 +363,8 @@ 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)); 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); event, sizeof(u16), 0, 0);
return status; return status;
} }
#endif #endif
...@@ -369,7 +378,7 @@ static int pnp_bios_send_message(u16 message) ...@@ -369,7 +378,7 @@ 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, 0, 0, 0, 0);
return status; return status;
} }
#endif #endif
...@@ -383,8 +392,8 @@ static int pnp_bios_dock_station_info(struct pnp_docking_station_info *data) ...@@ -383,8 +392,8 @@ 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)); 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); data, sizeof(struct pnp_docking_station_info), 0, 0);
return status; return status;
} }
#endif #endif
...@@ -399,8 +408,8 @@ static int pnp_bios_set_stat_res(char *info) ...@@ -399,8 +408,8 @@ 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)); 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); info, *((u16 *) info), 0, 0);
return status; return status;
} }
#endif #endif
...@@ -414,8 +423,8 @@ static int __pnp_bios_get_stat_res(char *info) ...@@ -414,8 +423,8 @@ 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); 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); info, 65536, 0, 0);
return status; return status;
} }
...@@ -437,9 +446,8 @@ static int pnp_bios_apm_id_table(char *table, u16 *size) ...@@ -437,9 +446,8 @@ 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); status = call_pnp_bios(PNP_GET_APM_ID_TABLE, 0, PNP_TS2, 0, PNP_TS1, PNP_DS, 0, 0,
Q2_SET_SEL(PNP_TS2, size, sizeof(u16)); table, *size, size, sizeof(u16));
status = call_pnp_bios(PNP_GET_APM_ID_TABLE, 0, PNP_TS2, 0, PNP_TS1, PNP_DS, 0, 0);
return status; return status;
} }
#endif #endif
...@@ -452,8 +460,8 @@ static int __pnp_bios_isapnp_config(struct pnp_isa_config_struc *data) ...@@ -452,8 +460,8 @@ 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)); 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); data, sizeof(struct pnp_isa_config_struc), 0, 0);
return status; return status;
} }
...@@ -474,8 +482,8 @@ static int __pnp_bios_escd_info(struct escd_info_struc *data) ...@@ -474,8 +482,8 @@ 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)); 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); data, sizeof(struct escd_info_struc), 0, 0);
return status; return status;
} }
...@@ -497,10 +505,8 @@ static int __pnp_bios_read_escd(char *data, u32 nvram_base) ...@@ -497,10 +505,8 @@ 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); status = call_pnp_bios(PNP_READ_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0,
set_base(gdt[PNP_TS2 >> 3], nvram_base); data, 65536, (void *)nvram_base, 65536);
set_limit(gdt[PNP_TS2 >> 3], 64 * 1024);
status = call_pnp_bios(PNP_READ_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0);
return status; return status;
} }
...@@ -522,10 +528,8 @@ static int pnp_bios_write_escd(char *data, u32 nvram_base) ...@@ -522,10 +528,8 @@ 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); status = call_pnp_bios(PNP_WRITE_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0,
set_base(gdt[PNP_TS2 >> 3], nvram_base); data, 65536, nvram_base, 65536);
set_limit(gdt[PNP_TS2 >> 3], 64 * 1024);
status = call_pnp_bios(PNP_WRITE_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0);
return status; return status;
} }
#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