This is for apm support.
diffstat:
arch/i386/kernel/apm.c | 55 +++++++++++++++++++++++++++++++++++++++++------
include/linux/apm_bios.h | 24 ++++++++++++++++++++
2 files changed, 72 insertions(+), 7 deletions(-)
-- Osamu Tomita tomita@cinet.co.jp
diff -urN linux/arch/i386/kernel/apm.c linux98/arch/i386/kernel/apm.c --- linux/arch/i386/kernel/apm.c Thu Oct 31 13:23:02 2002 +++ linux98/arch/i386/kernel/apm.c Thu Oct 31 13:35:09 2002 @@ -227,6 +227,8 @@ #include <linux/sysrq.h> +#include "io_ports.h" + extern rwlock_t xtime_lock; extern spinlock_t i8253_lock; extern unsigned long get_cmos_time(void); @@ -377,6 +379,15 @@ #define DEFAULT_IDLE_PERIOD (100 / 3) /* + * PC-9800 BIOS reports version by BCD format + */ +#ifdef CONFIG_PC9800 +#define BIOS_VERSION_HILO_FMT "%d.%02x" +#else +#define BIOS_VERSION_HILO_FMT "%d.%d" +#endif + +/* * Local variables */ static struct { @@ -629,6 +640,9 @@ __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" +#ifdef CONFIG_PC9800 + "pushfl\n\t" +#endif "lcall *%%cs:apm_bios_entry\n\t" "setc %%al\n\t" "popl %%ebp\n\t" @@ -690,6 +704,9 @@ __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" +#ifdef CONFIG_PC9800 + "pushfl\n\t" +#endif "lcall *%%cs:apm_bios_entry\n\t" "setc %%bl\n\t" "popl %%ebp\n\t" @@ -961,7 +978,7 @@ /* * This may be called on an SMP machine. */ -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_PC9800) /* Some bioses don't like being called from CPU != 0 */ if (smp_processor_id() != 0) { set_cpus_allowed(current, 1 << 0); @@ -1241,11 +1258,11 @@ { #ifdef INIT_TIMER_AFTER_SUSPEND /* set the clock to 100 Hz */ - outb_p(0x34,0x43); /* binary, mode 2, LSB/MSB, ch 0 */ + outb_p(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ udelay(10); - outb_p(LATCH & 0xff , 0x40); /* LSB */ + outb_p(LATCH & 0xff, PIT_CH0); /* LSB */ udelay(10); - outb(LATCH >> 8 , 0x40); /* MSB */ + outb(LATCH >> 8, PIT_CH0); /* MSB */ udelay(10); #endif } @@ -1720,7 +1737,8 @@ -1: Unknown 8) min = minutes; sec = seconds */ - p += sprintf(p, "%s %d.%d 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n", + p += sprintf(p, "%s " BIOS_VERSION_HILO_FMT + " 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n", driver_version, (apm_info.bios.version >> 8) & 0xff, apm_info.bios.version & 0xff, @@ -1744,6 +1762,8 @@ char * power_stat; char * bat_stat; +#if !defined(CONFIG_PC9800) || !defined(CONFIG_SMP) + /* Deamonize causes freeze on PC-9800 SMP box */ kapmd_running = 1; daemonize(); @@ -1751,6 +1771,7 @@ strcpy(current->comm, "kapmd"); current->flags |= PF_IOTHREAD; sigfillset(¤t->blocked); +#endif /* !CONFIG_PC9800 || !CONFIG_SMP */ #ifdef CONFIG_SMP /* 2002/08/01 - WT @@ -1780,6 +1801,17 @@ /* Fall back to an APM 1.0 connection. */ apm_info.connection_version = 0x100; } +#ifdef CONFIG_PC9800 + else { + printk("PC-9801 APM BIOS BUG work around: " + "fix connection_version 0x%x to ", + apm_info.connection_version); + apm_info.connection_version = + (apm_info.connection_version & 0xff00) + | ((apm_info.connection_version & 0x00f0) >> 4); + printk("0x%x\n", apm_info.connection_version); + } +#endif /* CONFIG_PC9800 */ } } @@ -1956,8 +1988,8 @@ printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; } - printk(KERN_INFO - "apm: BIOS version %d.%d Flags 0x%02x (Driver version %s)\n", + printk(KERN_INFO "apm: BIOS version " BIOS_VERSION_HILO_FMT + " Flags 0x%02x (Driver version %s)\n", ((apm_info.bios.version >> 8) & 0xff), (apm_info.bios.version & 0xff), apm_info.bios.flags, @@ -1984,6 +2016,11 @@ if (apm_info.bios.version == 0x001) apm_info.bios.version = 0x100; +#ifdef CONFIG_PC9800 + /* In PC-9800, APM BIOS version is written in BCD...?? */ + apm_info.bios.version = (apm_info.bios.version & 0xff00) + | ((apm_info.bios.version & 0x00f0) >> 4); +#endif /* BIOS < 1.2 doesn't set cseg_16_len */ if (apm_info.bios.version < 0x102) apm_info.bios.cseg_16_len = 0; /* 64k */ @@ -2067,7 +2104,11 @@ if (apm_proc) SET_MODULE_OWNER(apm_proc); +#if defined(CONFIG_PC9800) && defined(CONFIG_SMP) + apm(0); +#else kernel_thread(apm, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND | SIGCHLD); +#endif if (num_online_cpus() > 1 && !smp ) { printk(KERN_NOTICE diff -urN linux/include/linux/apm_bios.h linux98/include/linux/apm_bios.h --- linux/include/linux/apm_bios.h Wed Aug 28 09:52:31 2002 +++ linux98/include/linux/apm_bios.h Wed Aug 28 13:34:09 2002 @@ -20,6 +20,7 @@ typedef unsigned short apm_eventinfo_t; #ifdef __KERNEL__ +#include <linux/config.h> #define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8) #define APM_CS_16 (APM_CS + 8) @@ -60,6 +61,7 @@ /* * The APM function codes */ +#ifndef CONFIG_PC9800 #define APM_FUNC_INST_CHECK 0x5300 #define APM_FUNC_REAL_CONN 0x5301 #define APM_FUNC_16BIT_CONN 0x5302 @@ -80,6 +82,28 @@ #define APM_FUNC_RESUME_TIMER 0x5311 #define APM_FUNC_RESUME_ON_RING 0x5312 #define APM_FUNC_TIMER 0x5313 +#else +#define APM_FUNC_INST_CHECK 0x9a00 +#define APM_FUNC_REAL_CONN 0x9a01 +#define APM_FUNC_16BIT_CONN 0x9a02 +#define APM_FUNC_32BIT_CONN 0x9a03 +#define APM_FUNC_DISCONN 0x9a04 +#define APM_FUNC_IDLE 0x9a05 +#define APM_FUNC_BUSY 0x9a06 +#define APM_FUNC_SET_STATE 0x9a07 +#define APM_FUNC_ENABLE_PM 0x9a08 +#define APM_FUNC_RESTORE_BIOS 0x9a09 +#define APM_FUNC_GET_STATUS 0x9a3a +#define APM_FUNC_GET_EVENT 0x9a0b +#define APM_FUNC_GET_STATE 0x9a0c +#define APM_FUNC_ENABLE_DEV_PM 0x9a0d +#define APM_FUNC_VERSION 0x9a3e +#define APM_FUNC_ENGAGE_PM 0x9a3f +#define APM_FUNC_GET_CAP 0x9a10 +#define APM_FUNC_RESUME_TIMER 0x9a11 +#define APM_FUNC_RESUME_ON_RING 0x9a12 +#define APM_FUNC_TIMER 0x9a13 +#endif /* * Function code for APM_FUNC_RESUME_TIMER
- 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/
This archive was generated by hypermail 2b29 : Fri Nov 15 2002 - 22:00:37 EST