Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] vmi: paravirt drop udelay op

Browse Source 
Not respecting udelay causes problems with any virtual hardware that is passed
through to real hardware.  This can be noticed by any device that interacts
with the real world in real time - like AP startup, which takes real time.  Or
keyboard LEDs, which should blink in real-time.  Or floppy drives, but only
when passed through to a real floppy controller on OSes which can't
sufficiently buffer the floppy commands to emulate a zero latency floppy.  Or
IDE drives, when connecting to a physical CDROM.

This was mostly a hack to get the kernel to boot faster, but it introduced a
number of misvirtualization bugs, and Alan and Pavel argued pretty strongly
against it.  We were the only client, and now want to clean up this cruft.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Zachary Amsden 2007-03-05 00:30:38 -08:00 committed by Linus Torvalds
parent 9a1c13e91f
commit eda08b1bef
5 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/i386/kernel/paravirt.c
View File

@ -538,7 +538,6 @@ struct paravirt_ops paravirt_ops = {
.set_iopl_mask = native_set_iopl_mask, .set_iopl_mask = native_set_iopl_mask,
.io_delay = native_io_delay, .io_delay = native_io_delay,
.const_udelay = __const_udelay,
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
.apic_write = native_apic_write, .apic_write = native_apic_write,

5
arch/i386/kernel/smpboot.c
View File

@ -33,11 +33,6 @@
* Dave Jones : Report invalid combinations of Athlon CPUs. * Dave Jones : Report invalid combinations of Athlon CPUs.
* Rusty Russell : Hacked into shape for new "hotplug" boot process. */ * Rusty Russell : Hacked into shape for new "hotplug" boot process. */
/* SMP boot always wants to use real time delay to allow sufficient time for
* the APs to come online */
#define USE_REAL_TIME_DELAY
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

8
arch/i386/kernel/vmi.c
View File

@ -48,7 +48,6 @@ typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
static struct vrom_header *vmi_rom; static struct vrom_header *vmi_rom;
static int license_gplok; static int license_gplok;
static int disable_nodelay;
static int disable_pge; static int disable_pge;
static int disable_pse; static int disable_pse;
static int disable_sep; static int disable_sep;
@ -801,9 +800,6 @@ static inline int __init activate_vmi(void)
para_fill(set_iopl_mask, SetIOPLMask); para_fill(set_iopl_mask, SetIOPLMask);
paravirt_ops.io_delay = (void *)vmi_nop; paravirt_ops.io_delay = (void *)vmi_nop;
if (!disable_nodelay) {
paravirt_ops.const_udelay = (void *)vmi_nop;
}
para_fill(set_lazy_mode, SetLazyMode); para_fill(set_lazy_mode, SetLazyMode);
@ -947,9 +943,7 @@ static int __init parse_vmi(char *arg)
if (!arg) if (!arg)
return -EINVAL; return -EINVAL;
if (!strcmp(arg, "disable_nodelay")) if (!strcmp(arg, "disable_pge")) {
disable_nodelay = 1;
else if (!strcmp(arg, "disable_pge")) {
clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
disable_pge = 1; disable_pge = 1;
} else if (!strcmp(arg, "disable_pse")) { } else if (!strcmp(arg, "disable_pse")) {

8
include/asm-i386/delay.h
View File

@ -16,13 +16,6 @@ extern void __ndelay(unsigned long nsecs);
extern void __const_udelay(unsigned long usecs); extern void __const_udelay(unsigned long usecs);
extern void __delay(unsigned long loops); extern void __delay(unsigned long loops);
#if defined(CONFIG_PARAVIRT) && !defined(USE_REAL_TIME_DELAY)
#define udelay(n) paravirt_ops.const_udelay((n) * 0x10c7ul)
#define ndelay(n) paravirt_ops.const_udelay((n) * 5ul)
#else /* !PARAVIRT || USE_REAL_TIME_DELAY */
/* 0x10c7 is 2**32 / 1000000 (rounded up) */ /* 0x10c7 is 2**32 / 1000000 (rounded up) */
#define udelay(n) (__builtin_constant_p(n) ? \ #define udelay(n) (__builtin_constant_p(n) ? \
((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \
@ -32,7 +25,6 @@ extern void __delay(unsigned long loops);
#define ndelay(n) (__builtin_constant_p(n) ? \ #define ndelay(n) (__builtin_constant_p(n) ? \
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
__ndelay(n)) __ndelay(n))
#endif
void use_tsc_delay(void); void use_tsc_delay(void);

1
include/asm-i386/paravirt.h
View File

@ -117,7 +117,6 @@ struct paravirt_ops
void (*set_iopl_mask)(unsigned mask); void (*set_iopl_mask)(unsigned mask);
void (*io_delay)(void); void (*io_delay)(void);
void (*const_udelay)(unsigned long loops);
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
void (*apic_write)(unsigned long reg, unsigned long v); void (*apic_write)(unsigned long reg, unsigned long v);