* [PATCH] ignore vgacon if hardware not present @ 2007-03-29 7:46 Rusty Russell 2007-03-29 10:36 ` Andi Kleen 0 siblings, 1 reply; 7+ messages in thread From: Rusty Russell @ 2007-03-29 7:46 UTC (permalink / raw) To: Andi Kleen, Andrew Morton Cc: Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List (Did this fall through the cracks? I don't see it in -mm. It's standalone, and saves some silly code in lguest and presumably others). == Avoid trying to set up vgacon if there's no vga hardware present. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> From: Gerd Hoffmann <kraxel@suse.de> Cc: Alan <alan@lxorguk.ukuu.org.uk> Acked-by: Ingo Molnar <mingo@elte.hu> --- drivers/video/console/vgacon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) =================================================================== --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -372,7 +372,8 @@ static const char *vgacon_startup(void) } /* VGA16 modes are not handled by VGACON */ - if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ + if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */ + (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */ ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ignore vgacon if hardware not present 2007-03-29 7:46 [PATCH] ignore vgacon if hardware not present Rusty Russell @ 2007-03-29 10:36 ` Andi Kleen 2007-03-29 11:06 ` Rusty Russell 0 siblings, 1 reply; 7+ messages in thread From: Andi Kleen @ 2007-03-29 10:36 UTC (permalink / raw) To: Rusty Russell Cc: Andrew Morton, Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List On Thu, Mar 29, 2007 at 05:46:48PM +1000, Rusty Russell wrote: > (Did this fall through the cracks? I don't see it in -mm. It's > standalone, and saves some silly code in lguest and presumably others). Normally it should go to some some console maintainer? Ok I can add it. -Andi ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ignore vgacon if hardware not present 2007-03-29 10:36 ` Andi Kleen @ 2007-03-29 11:06 ` Rusty Russell 2007-03-29 12:19 ` Andi Kleen 0 siblings, 1 reply; 7+ messages in thread From: Rusty Russell @ 2007-03-29 11:06 UTC (permalink / raw) To: Andi Kleen Cc: Andrew Morton, Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List On Thu, 2007-03-29 at 12:36 +0200, Andi Kleen wrote: > On Thu, Mar 29, 2007 at 05:46:48PM +1000, Rusty Russell wrote: > > (Did this fall through the cracks? I don't see it in -mm. It's > > standalone, and saves some silly code in lguest and presumably others). > > Normally it should go to some some console maintainer? Hmm, but who? > Ok I can add it. Thanks. While you're in a patch-applying mood, how about this? Cheers, Rusty. == Use X86_EFLAGS_IF in irqflags.h. Move X86_EFLAGS_IF et al out to a new header: processor-flags.h, so we can include it from irqflags.h and use it in raw_irqs_disabled_flags(). As a side-effect, we could now use these flags in .S files. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> --- include/asm-i386/irqflags.h | 3 ++- include/asm-i386/processor-flags.h | 26 ++++++++++++++++++++++++++ include/asm-i386/processor.h | 22 +--------------------- 3 files changed, 29 insertions(+), 22 deletions(-) =================================================================== --- /dev/null +++ b/include/asm-i386/processor-flags.h @@ -0,0 +1,26 @@ +#ifndef __ASM_I386_PROCESSOR_FLAGS_H +#define __ASM_I386_PROCESSOR_FLAGS_H +/* Various flags defined: can be included from assembler. */ + +/* + * EFLAGS bits + */ +#define X86_EFLAGS_CF 0x00000001 /* Carry Flag */ +#define X86_EFLAGS_PF 0x00000004 /* Parity Flag */ +#define X86_EFLAGS_AF 0x00000010 /* Auxillary carry Flag */ +#define X86_EFLAGS_ZF 0x00000040 /* Zero Flag */ +#define X86_EFLAGS_SF 0x00000080 /* Sign Flag */ +#define X86_EFLAGS_TF 0x00000100 /* Trap Flag */ +#define X86_EFLAGS_IF 0x00000200 /* Interrupt Flag */ +#define X86_EFLAGS_DF 0x00000400 /* Direction Flag */ +#define X86_EFLAGS_OF 0x00000800 /* Overflow Flag */ +#define X86_EFLAGS_IOPL 0x00003000 /* IOPL mask */ +#define X86_EFLAGS_NT 0x00004000 /* Nested Task */ +#define X86_EFLAGS_RF 0x00010000 /* Resume Flag */ +#define X86_EFLAGS_VM 0x00020000 /* Virtual Mode */ +#define X86_EFLAGS_AC 0x00040000 /* Alignment Check */ +#define X86_EFLAGS_VIF 0x00080000 /* Virtual Interrupt Flag */ +#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */ +#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */ + +#endif /* __ASM_I386_PROCESSOR_FLAGS_H */ =================================================================== --- a/include/asm-i386/irqflags.h +++ b/include/asm-i386/irqflags.h @@ -9,6 +9,7 @@ */ #ifndef _ASM_IRQFLAGS_H #define _ASM_IRQFLAGS_H +#include <asm/processor-flags.h> #ifndef __ASSEMBLY__ static inline unsigned long native_save_fl(void) @@ -119,7 +120,7 @@ static inline unsigned long __raw_local_ static inline int raw_irqs_disabled_flags(unsigned long flags) { - return !(flags & (1 << 9)); + return !(flags & X86_EFLAGS_IF); } static inline int raw_irqs_disabled(void) =================================================================== --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h @@ -21,6 +21,7 @@ #include <asm/percpu.h> #include <linux/cpumask.h> #include <linux/init.h> +#include <asm/processor-flags.h> /* flag for disabling the tsc */ extern int tsc_disable; @@ -125,27 +126,6 @@ extern void detect_ht(struct cpuinfo_x86 #else static inline void detect_ht(struct cpuinfo_x86 *c) {} #endif - -/* - * EFLAGS bits - */ -#define X86_EFLAGS_CF 0x00000001 /* Carry Flag */ -#define X86_EFLAGS_PF 0x00000004 /* Parity Flag */ -#define X86_EFLAGS_AF 0x00000010 /* Auxillary carry Flag */ -#define X86_EFLAGS_ZF 0x00000040 /* Zero Flag */ -#define X86_EFLAGS_SF 0x00000080 /* Sign Flag */ -#define X86_EFLAGS_TF 0x00000100 /* Trap Flag */ -#define X86_EFLAGS_IF 0x00000200 /* Interrupt Flag */ -#define X86_EFLAGS_DF 0x00000400 /* Direction Flag */ -#define X86_EFLAGS_OF 0x00000800 /* Overflow Flag */ -#define X86_EFLAGS_IOPL 0x00003000 /* IOPL mask */ -#define X86_EFLAGS_NT 0x00004000 /* Nested Task */ -#define X86_EFLAGS_RF 0x00010000 /* Resume Flag */ -#define X86_EFLAGS_VM 0x00020000 /* Virtual Mode */ -#define X86_EFLAGS_AC 0x00040000 /* Alignment Check */ -#define X86_EFLAGS_VIF 0x00080000 /* Virtual Interrupt Flag */ -#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */ -#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ignore vgacon if hardware not present 2007-03-29 11:06 ` Rusty Russell @ 2007-03-29 12:19 ` Andi Kleen 2007-03-30 3:12 ` [PATCH] Use X86_EFLAGS_IF in x86-64/irqflags.h Rusty Russell 0 siblings, 1 reply; 7+ messages in thread From: Andi Kleen @ 2007-03-29 12:19 UTC (permalink / raw) To: Rusty Russell Cc: Andrew Morton, Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List On Thu, Mar 29, 2007 at 09:06:57PM +1000, Rusty Russell wrote: > On Thu, 2007-03-29 at 12:36 +0200, Andi Kleen wrote: > > On Thu, Mar 29, 2007 at 05:46:48PM +1000, Rusty Russell wrote: > > > (Did this fall through the cracks? I don't see it in -mm. It's > > > standalone, and saves some silly code in lguest and presumably others). > > > > Normally it should go to some some console maintainer? > > Hmm, but who? > > > Ok I can add it. > > Thanks. While you're in a patch-applying mood, how about this? Ok. Can you do it for x86-64 too? -Andi ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Use X86_EFLAGS_IF in x86-64/irqflags.h. 2007-03-29 12:19 ` Andi Kleen @ 2007-03-30 3:12 ` Rusty Russell 2007-03-30 10:12 ` Andi Kleen 0 siblings, 1 reply; 7+ messages in thread From: Rusty Russell @ 2007-03-30 3:12 UTC (permalink / raw) To: Andi Kleen Cc: Andrew Morton, Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List On Thu, 2007-03-29 at 14:19 +0200, Andi Kleen wrote: > On Thu, Mar 29, 2007 at 09:06:57PM +1000, Rusty Russell wrote: [SNIP: processor-flags.h patch for i386 ] > Ok. Can you do it for x86-64 too? OK, here it is. Compiles, but -rc5-mm2 doesn't link for me on x86-64 at the moment. Something seems quite wrong with CONFIG_X86_VSMP. AFAICT (1 << 18) is the "alignment check" flag, not the "virtual interrupt" flag which I expected. Cheers, Rusty. == As per i386 patch: move X86_EFLAGS_IF et al out to a new header: processor-flags.h, so we can include it from irqflags.h and use it in raw_irqs_disabled_flags(). As a side-effect, we could now use these flags in .S files. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> diff -r 533294f1af63 include/asm-x86_64/irqflags.h --- a/include/asm-x86_64/irqflags.h Thu Mar 29 18:52:58 2007 +1000 +++ b/include/asm-x86_64/irqflags.h Fri Mar 30 12:57:01 2007 +1000 @@ -9,6 +9,7 @@ */ #ifndef _ASM_IRQFLAGS_H #define _ASM_IRQFLAGS_H +#include <asm/processor-flags.h> #ifndef __ASSEMBLY__ /* @@ -53,19 +54,19 @@ static inline void raw_local_irq_disable { unsigned long flags = __raw_local_save_flags(); - raw_local_irq_restore((flags & ~(1 << 9)) | (1 << 18)); + raw_local_irq_restore((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC); } static inline void raw_local_irq_enable(void) { unsigned long flags = __raw_local_save_flags(); - raw_local_irq_restore((flags | (1 << 9)) & ~(1 << 18)); + raw_local_irq_restore((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC)); } static inline int raw_irqs_disabled_flags(unsigned long flags) { - return !(flags & (1<<9)) || (flags & (1 << 18)); + return !(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC); } #else /* CONFIG_X86_VSMP */ @@ -82,7 +83,7 @@ static inline void raw_local_irq_enable( static inline int raw_irqs_disabled_flags(unsigned long flags) { - return !(flags & (1 << 9)); + return !(flags & X86_EFLAGS_IF); } #endif diff -r 533294f1af63 include/asm-x86_64/processor-flags.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/asm-x86_64/processor-flags.h Fri Mar 30 12:48:11 2007 +1000 @@ -0,0 +1,26 @@ +#ifndef __ASM_X86_64_PROCESSOR_FLAGS_H +#define __ASM_X86_64_PROCESSOR_FLAGS_H +/* Various flags defined: can be included from assembler. */ + +/* + * EFLAGS bits + */ +#define X86_EFLAGS_CF 0x00000001 /* Carry Flag */ +#define X86_EFLAGS_PF 0x00000004 /* Parity Flag */ +#define X86_EFLAGS_AF 0x00000010 /* Auxillary carry Flag */ +#define X86_EFLAGS_ZF 0x00000040 /* Zero Flag */ +#define X86_EFLAGS_SF 0x00000080 /* Sign Flag */ +#define X86_EFLAGS_TF 0x00000100 /* Trap Flag */ +#define X86_EFLAGS_IF 0x00000200 /* Interrupt Flag */ +#define X86_EFLAGS_DF 0x00000400 /* Direction Flag */ +#define X86_EFLAGS_OF 0x00000800 /* Overflow Flag */ +#define X86_EFLAGS_IOPL 0x00003000 /* IOPL mask */ +#define X86_EFLAGS_NT 0x00004000 /* Nested Task */ +#define X86_EFLAGS_RF 0x00010000 /* Resume Flag */ +#define X86_EFLAGS_VM 0x00020000 /* Virtual Mode */ +#define X86_EFLAGS_AC 0x00040000 /* Alignment Check */ +#define X86_EFLAGS_VIF 0x00080000 /* Virtual Interrupt Flag */ +#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */ +#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */ + +#endif /* __ASM_X86_64_PROCESSOR_FLAGS_H */ diff -r 533294f1af63 include/asm-x86_64/processor.h --- a/include/asm-x86_64/processor.h Thu Mar 29 18:52:58 2007 +1000 +++ b/include/asm-x86_64/processor.h Fri Mar 30 12:44:11 2007 +1000 @@ -20,6 +20,7 @@ #include <asm/percpu.h> #include <linux/personality.h> #include <linux/cpumask.h> +#include <asm/processor-flags.h> #define TF_MASK 0x00000100 #define IF_MASK 0x00000200 @@ -103,27 +104,6 @@ extern unsigned short num_cache_leaves; extern unsigned short num_cache_leaves; /* - * EFLAGS bits - */ -#define X86_EFLAGS_CF 0x00000001 /* Carry Flag */ -#define X86_EFLAGS_PF 0x00000004 /* Parity Flag */ -#define X86_EFLAGS_AF 0x00000010 /* Auxillary carry Flag */ -#define X86_EFLAGS_ZF 0x00000040 /* Zero Flag */ -#define X86_EFLAGS_SF 0x00000080 /* Sign Flag */ -#define X86_EFLAGS_TF 0x00000100 /* Trap Flag */ -#define X86_EFLAGS_IF 0x00000200 /* Interrupt Flag */ -#define X86_EFLAGS_DF 0x00000400 /* Direction Flag */ -#define X86_EFLAGS_OF 0x00000800 /* Overflow Flag */ -#define X86_EFLAGS_IOPL 0x00003000 /* IOPL mask */ -#define X86_EFLAGS_NT 0x00004000 /* Nested Task */ -#define X86_EFLAGS_RF 0x00010000 /* Resume Flag */ -#define X86_EFLAGS_VM 0x00020000 /* Virtual Mode */ -#define X86_EFLAGS_AC 0x00040000 /* Alignment Check */ -#define X86_EFLAGS_VIF 0x00080000 /* Virtual Interrupt Flag */ -#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */ -#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */ - -/* * Intel CPU features in CR4 */ #define X86_CR4_VME 0x0001 /* enable vm86 extensions */ ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Use X86_EFLAGS_IF in x86-64/irqflags.h. 2007-03-30 3:12 ` [PATCH] Use X86_EFLAGS_IF in x86-64/irqflags.h Rusty Russell @ 2007-03-30 10:12 ` Andi Kleen 2007-03-30 10:59 ` Rusty Russell 0 siblings, 1 reply; 7+ messages in thread From: Andi Kleen @ 2007-03-30 10:12 UTC (permalink / raw) To: Rusty Russell Cc: Andrew Morton, Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List On Fri, Mar 30, 2007 at 01:12:23PM +1000, Rusty Russell wrote: > On Thu, 2007-03-29 at 14:19 +0200, Andi Kleen wrote: > > On Thu, Mar 29, 2007 at 09:06:57PM +1000, Rusty Russell wrote: > > [SNIP: processor-flags.h patch for i386 ] > > > Ok. Can you do it for x86-64 too? > > OK, here it is. Compiles, but -rc5-mm2 doesn't link for me on x86-64 at > the moment. What's the problem? > > Something seems quite wrong with CONFIG_X86_VSMP. AFAICT (1 << 18) is > the "alignment check" flag, not the "virtual interrupt" flag which I > expected. They abuse that intentionally as a way to talk to their hypervisor. You don't want to know details. -Andi ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Use X86_EFLAGS_IF in x86-64/irqflags.h. 2007-03-30 10:12 ` Andi Kleen @ 2007-03-30 10:59 ` Rusty Russell 0 siblings, 0 replies; 7+ messages in thread From: Rusty Russell @ 2007-03-30 10:59 UTC (permalink / raw) To: Andi Kleen Cc: Andrew Morton, Jeremy Fitzhardinge, Gerd Hoffmann, Alan, Ingo Molnar, lkml - Kernel Mailing List On Fri, 2007-03-30 at 12:12 +0200, Andi Kleen wrote: > On Fri, Mar 30, 2007 at 01:12:23PM +1000, Rusty Russell wrote: > > On Thu, 2007-03-29 at 14:19 +0200, Andi Kleen wrote: > > > On Thu, Mar 29, 2007 at 09:06:57PM +1000, Rusty Russell wrote: > > > > [SNIP: processor-flags.h patch for i386 ] > > > > > Ok. Can you do it for x86-64 too? > > > > OK, here it is. Compiles, but -rc5-mm2 doesn't link for me on x86-64 at > > the moment. > > What's the problem? Sorry, should have included it, I assumed a known issue: LD .tmp_vmlinux1 ld: section .vsyscall_1 [0000000000533400 -> 000000000053342e] overlaps section .jiffies [0000000000533400 -> 0000000000533407] ld: .tmp_vmlinux1: section .vsyscall_1 lma 0x533400 overlaps previous sections make: *** [.tmp_vmlinux1] Error 1 Cheers, Rusty. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-03-30 11:00 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-03-29 7:46 [PATCH] ignore vgacon if hardware not present Rusty Russell 2007-03-29 10:36 ` Andi Kleen 2007-03-29 11:06 ` Rusty Russell 2007-03-29 12:19 ` Andi Kleen 2007-03-30 3:12 ` [PATCH] Use X86_EFLAGS_IF in x86-64/irqflags.h Rusty Russell 2007-03-30 10:12 ` Andi Kleen 2007-03-30 10:59 ` Rusty Russell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox