rpms/kernel/devel linux-2.6-x86-debug-boot.patch, 1.2, 1.3 kernel.spec, 1.151, 1.152

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4154

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-debug-boot.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- x86: debug early boot


linux-2.6-x86-debug-boot.patch:

Index: linux-2.6-x86-debug-boot.patch
===================================================================
RCS file: linux-2.6-x86-debug-boot.patch
diff -N linux-2.6-x86-debug-boot.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86-debug-boot.patch	7 Sep 2007 18:32:07 -0000	1.3
@@ -0,0 +1,108 @@
+---
+ arch/i386/boot/main.c |   12 ++++++++++++
+ arch/i386/boot/pm.c   |    8 ++++++++
+ 2 files changed, 20 insertions(+)
+
+--- linux-2.6.22.noarch.orig/arch/i386/boot/main.c
++++ linux-2.6.22.noarch/arch/i386/boot/main.c
+@@ -105,6 +105,7 @@ static void set_bios_mode(void)
+ void main(void)
+ {
+ 	/* First, copy the boot header into the "zeropage" */
++	puts("Booting: ");
+ 	copy_boot_params();
+ 
+ 	/* End of heap check */
+@@ -118,6 +119,7 @@ void main(void)
+ 	}
+ 
+ 	/* Make sure we have all the proper CPU support */
++	puts("A");
+ 	if (validate_cpu()) {
+ 		puts("Unable to boot - please use a kernel appropriate "
+ 		     "for your CPU.\n");
+@@ -125,37 +127,47 @@ void main(void)
+ 	}
+ 
+ 	/* Tell the BIOS what CPU mode we intend to run in. */
++	puts("B");
+ 	set_bios_mode();
+ 
+ 	/* Detect memory layout */
++	puts("C");
+ 	detect_memory();
+ 
+ 	/* Set keyboard repeat rate (why?) */
++	puts("D");
+ 	keyboard_set_repeat();
+ 
+ 	/* Set the video mode */
++	puts("E");
+ 	set_video();
+ 
+ 	/* Query MCA information */
++	puts("F");
+ 	query_mca();
+ 
+ 	/* Voyager */
+ #ifdef CONFIG_X86_VOYAGER
++	puts("G");
+ 	query_voyager();
+ #endif
+ 
++	puts("H");
+ 	/* Query Intel SpeedStep (IST) information */
+ 	query_ist();
+ 
+ 	/* Query APM information */
+ #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
++	puts("I");
+ 	query_apm_bios();
+ #endif
+ 
+ 	/* Query EDD information */
+ #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
++	puts("J");
+ 	query_edd();
+ #endif
+ 	/* Do the last things and invoke protected mode */
++	puts("K");
+ 	go_to_protected_mode();
+ }
+--- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c
++++ linux-2.6.22.noarch/arch/i386/boot/pm.c
+@@ -145,26 +145,34 @@ static void setup_idt(void)
+ void go_to_protected_mode(void)
+ {
+ 	/* Hook before leaving real mode, also disables interrupts */
++	puts("L");
+ 	realmode_switch_hook();
+ 
+ 	/* Move the kernel/setup to their final resting places */
++	puts("M");
+ 	move_kernel_around();
+ 
+ 	/* Enable the A20 gate */
++	puts("N");
+ 	if (enable_a20()) {
+ 		puts("A20 gate not responding, unable to boot...\n");
+ 		die();
+ 	}
+ 
+ 	/* Reset coprocessor (IGNNE#) */
++	puts("O");
+ 	reset_coprocessor();
+ 
+ 	/* Mask all interrupts in the PIC */
++	puts("P");
+ 	mask_all_interrupts();
+ 
+ 	/* Actual transition to protected mode... */
++	puts("Q");
+ 	setup_idt();
++	puts("R");
+ 	setup_gdt();
++	puts("S\n");
+ 	protected_mode_jump(boot_params.hdr.code32_start,
+ 			    (u32)&boot_params + (ds() << 4));
+ }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kernel.spec	6 Sep 2007 19:47:37 -0000	1.151
+++ kernel.spec	7 Sep 2007 18:32:07 -0000	1.152
@@ -579,6 +579,7 @@
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
+Patch75: linux-2.6-x86-debug-boot.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
@@ -1003,6 +1004,8 @@
 ApplyPatch linux-2.6-x86-tune-generic.patch
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
+# debug early boot
+ApplyPatch linux-2.6-x86-debug-boot.patch
 
 #
 # PowerPC
@@ -1194,6 +1197,8 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# ---------- below all scheduled for 2.6.23 -----------------
+
 # Fix Xen bootup
 ApplyPatch linux-2.6-xen-fix-bootup.patch
 
@@ -1798,6 +1803,9 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86: debug early boot
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix imbalance in scheduler on multicore systems
 
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>