Re: [PATCH] Fix GDT limit in setup.S for 2.0 and 2.2

[Richard B. Johnson]

If you are going to muck with the startup code, I suggest this:

--- linux-2.4.24/arch/i386/boot/setup.S.orig	Mon Feb 23 10:34:11 2004
+++ linux-2.4.24/arch/i386/boot/setup.S	Mon Feb 23 11:07:09 2004
@@ -822,12 +822,16 @@
 a20_done:

 # set up gdt and idt
+	movl	$idt_48,%eax			# End of GDT
+	subl	$gdt, %eax			# Subtract beginning
+	decl	%eax				# One less
+	movw	%ax, (gdt_48)			# Length of the table
 	lidt	idt_48				# load idt with 0,0
 	xorl	%eax, %eax			# Compute gdt_base
 	movw	%ds, %ax			# (Convert %ds:gdt to a linear ptr)
 	shll	$4, %eax
 	addl	$gdt, %eax
-	movl	%eax, (gdt_48+2)
+	movl	%eax, (gdt_lo)
 	lgdt	gdt_48				# load gdt with whatever is
 						# appropriate

@@ -1080,8 +1084,11 @@
 delay:
 	outb	%al,$0x80
 	ret
-
-# Descriptor tables
+#
+# Descriptor tables, note that more entries will be entered when the
+# kernel starts. However, we do not want to load tables that don't
+# exist at this time!
+#
 gdt:
 	.word	0, 0, 0, 0			# dummy
 	.word	0, 0, 0, 0			# unused
@@ -1100,11 +1107,12 @@
 idt_48:
 	.word	0				# idt limit = 0
 	.word	0, 0				# idt base = 0L
-gdt_48:
-	.word	0x8000				# gdt limit=2048,
-						#  256 GDT entries
-
-	.word	0, 0				# gdt base (filled in later)
+#
+#	Filled in by startup code around label a20_done.
+#
+gdt_48:	.word	0				# Length of GDT -1
+gdt_lo:	.word	0				# GDT base low word
+gdt_hi:	.word	0				# GDT base high word

 # Include video setup & detection code


FYI, this machine is running with that change. The current
code loads a discriptor table with a (non-existant) length
of 0x8000 (plus a byte) bytes. For some reason, it's lucky.

Later on, more entries are added and the new table is loaded
with another LGDT instruction, fine. But, in the existing
code, any "entries" after those shown are video setup code.

The correct code will load the correct table length, not some
length that might be used in the future.


Cheers,
Dick Johnson
Penguin : Linux version 2.4.24 on an i686 machine (797.90 BogoMips).
            Note 96.31% of all statistics are fiction.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/