Skip to contentSkip to conversation

[parisc-linux] [[email protected]: permission to submit changes?]

parisc-linux Phil Schwan 1 participant 1 message Oct 1, 1999

lore
Share & tools
lore
#0 lore raw

[ I think I've fixed the mailing list; here's the mails from Grant
that it was dropping --phil ]

I'd like to submit the following minor changes. Any objections?

o enables FP coprocessor blindly - OK for PA 1.1 systems. Should be using PDC_PROC but I just wanted to try it out.

o clean up some of the excessive console output. More could be done here. But I just wanted to be able to cut/paste reasonable amounts of stuff.

Yes, my kernel panic'd when trying to kill the idle task. That's an improvement over the "code 22 interrupt". I'll post the output tomorrow.

(Lamont was feeling a bit guilty about not having hacked mkImage.c despite volunteering for it...)

thanks,
grant

Index: linux/arch/parisc/kernel/head.S
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/head.S,v retrieving revision 1.32

head.S +14 -3
diff -u -r1.32 head.S
@@ -295,9 +295,20 @@
 	ldil		L%KERNEL_PSW,%r10
 	ldo		R%KERNEL_PSW(%r10),%r10
 	mtctl		%r10,%ipsw
-	
-	mtctl		%r0,%cr17		; Clear two-level IIA Space Queue
-	mtctl		%r0,%cr17		;    effectively setting kernel space.
+
+	; Just assume we have an FP coprocessor and assume firmware
+	; did not enable it.
+	; Pass what firmware set CCR (cr10) to start_parisc() and print it.
+	mfctl		%cr10, %arg2
+
+#define FP_COPROC_ENABLE 0xc0
+	ldil		L%FP_COPROC_ENABLE,%r10
+	ldo		R%FP_COPROC_ENABLE(%r10),%r10
+	mtctl		%r10,%cr10	; CCR
+
+
+	mtctl		%r0,%cr17	; Clear two-level IIA Space Queue
+	mtctl		%r0,%cr17	;    effectively setting kernel space.
 	ldil		L%start_parisc,%r10
 	ldo		R%start_parisc(%r10),%r10
 

Index: linux/arch/parisc/kernel/setup.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/setup.c,v retrieving revision 1.59

setup.c +9 -10
diff -u -r1.59 setup.c
@@ -587,13 +587,16 @@
 #define PA(x) (void *)((unsigned long)(x)&~0xc0000000)
 extern int pdc_call_x(void *,...);
 
+#if 0
 static char iodc_tbuf[4096] __attribute__((aligned(4096))) = "Hallo\n";
 static char iodc_rbuf[4096] __attribute__((aligned(4096))) = "Hallo\n";
+#endif
 
 __initfunc(void start_parisc(unsigned long new_memory_start, 
-			     char *bootloader_command_line))
+			     char *bootloader_command_line,
+			     unsigned long ccr))
 {
-#if 1
+#if 0
 	pdc_call_x(
 		(void *)PAGE0->mem_cons.hpa, ENTRY_IO_COUT,
 		PAGE0->mem_cons.spa, PAGE0->mem_cons.dp.layers,
@@ -613,28 +616,24 @@
 	pdc_console_init();
 
 	printk("The Kernel has started...\n");
+#if 0
 	printk("Hmm\n");
 	printk("%d\n", 7);
 	printk("%d\n", *(unsigned *)0xc0000000);
-
+#endif
 	printk("%p\n", bootloader_command_line);
 	printk("You are running a %dMHz PA-RISC-Machine with %dMB of RAM.\n",
 		((int)PAGE0->mem_10msec/10000), PAGE0->imm_max_mem>>20);
+	printk("FP CCR was set to: 0x%x\n", (int) ccr);
 	parisc_memstart = new_memory_start;
 	
 	pdc = PAGE0->mem_pdc;
 
-	printk("You are running a %dMHz PA-RISC-Machine with %dMB of RAM.\n",
-		((int)PAGE0->mem_10msec/10000), PAGE0->imm_max_mem>>20);
-
 	if (bootloader_command_line)
 	    strcpy(saved_command_line,__va(bootloader_command_line));
 	else
 	    saved_command_line[0] = 0;
 
-	printk("You are running a %dMHz PA-RISC-Machine with %dMB of RAM.\n",
-		((int)PAGE0->mem_10msec/10000), PAGE0->imm_max_mem>>20);
-
 	printk("Free memory was at 0x%08lX (=stackbase, stacksize=0x%08lX).\n",
 		new_memory_start,(unsigned long)KERNEL_STACKSIZE );
 
@@ -659,7 +658,7 @@
 #endif
 	initrd_below_start_ok = 1;
 	
-	printk("initrd: %08x-%08x\n", initrd_start, initrd_end);
+	printk("initrd: %08x-%08x\n", (int) initrd_start, (int) initrd_end);
 	*memory_start_p = parisc_memstart;
 	*memory_end_p	= 0xc2000000;
 

Index: linux/drivers/block/rd.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/block/rd.c,v retrieving revision 1.3

rd.c +0 -1
diff -u -r1.3 rd.c
@@ -219,7 +219,6 @@
 {
 	int left;
 
-	printk("initrd_read\n");
 	left = initrd_end - initrd_start - *ppos;
 	if (count > left) count = left;
 	if (count == 0) return 0;

Index: linux/fs/buffer.c
===================================================================
RCS file: /home/cvs/parisc/linux/fs/buffer.c,v
retrieving revision 1.3

buffer.c +0 -2
diff -u -r1.3 buffer.c
@@ -840,8 +840,6 @@
 
 	struct buffer_head * bh;
 
-	printk("bread bh=%08x\n", bh);
-//	printk("%08x\n", &buffer_page(bh)->flags);
 	bh = getblk(dev, block, size);
 	if (buffer_uptodate(bh))
 		return bh;