[PATCH] early_printk for SGI SN2

[PATCH] early_printk for SGI SN2

[Chad Talbott]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

This patch requires the console driver that's pending inclusion in
Linus' tree, but will not get in the way as long as
IA64_EARLY_PRINTK_SGI_SN is config'd off.

Thanks,
Chad


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: early_printk.diff --]
[-- Type: text/x-patch, Size: 995 bytes --]

diff -Nru a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c	Tue Jun 17 14:47:33 2003
+++ b/kernel/printk.c	Tue Jun 17 14:47:33 2003
@@ -784,6 +784,10 @@
 
 # endif /* CONFIG_IA64_EARLY_PRINTK_UART */
 
+#ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
+extern int sal_cons_console_out(const char *str, int len);
+#endif
+
 void early_printk(const char *str, size_t len)
 {
 #ifdef CONFIG_IA64_EARLY_PRINTK_UART
@@ -791,6 +795,9 @@
 #endif
 #ifdef CONFIG_IA64_EARLY_PRINTK_VGA
 	early_printk_vga(str, len);
+#endif
+#ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
+ 	sal_cons_console_out(str, len);
 #endif
 }
 
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig	Tue Jun 17 14:45:16 2003
+++ b/arch/ia64/Kconfig	Tue Jun 17 14:45:16 2003
@@ -863,6 +831,10 @@
 
 config IA64_EARLY_PRINTK_VGA
 	bool "Early printk on VGA"
+	depends on IA64_EARLY_PRINTK
+
+config IA64_EARLY_PRINTK_SGI_SN
+	bool "Early printk on SGI SN serial console"
 	depends on IA64_EARLY_PRINTK
 
 config DEBUG_SLAB

Re: [PATCH] early_printk for SGI SN2

[David Mosberger]

>>>>> On 18 Jun 2003 14:29:09 -0700, Chad Talbott <chadt@sgi.com> said:

  Chad> This patch requires the console driver that's pending
  Chad> inclusion in Linus' tree, but will not get in the way as long
  Chad> as IA64_EARLY_PRINTK_SGI_SN is config'd off.

The patch is basically fine with me, except why is it called
sal_cons_console_out().  Does it really have anything to do with SAL?
If not, it would be better to use rename it to something SN-specific
to avoid confusion (and reduce the risk of namespace collision).

	--david

Re: [PATCH] early_printk for SGI SN2

[Chad Talbott]

David Mosberger <davidm@napali.hpl.hp.com> writes:

> The patch is basically fine with me, except why is it called
> sal_cons_console_out().  Does it really have anything to do with SAL?
> If not, it would be better to use rename it to something SN-specific
> to avoid confusion (and reduce the risk of namespace collision).

The name may not be the best.  The routines are called sal_* as they
use an SGI specific SAL call to actually output the text.  Perhaps
sn_sal_console_out?

Chad

Re: [PATCH] early_printk for SGI SN2

[David Mosberger]

>>>>> On 18 Jun 2003 15:04:02 -0700, Chad Talbott <chadt@sgi.com> said:

  Chad> The name may not be the best.  The routines are called sal_*
  Chad> as they use an SGI specific SAL call to actually output the
  Chad> text.  Perhaps sn_sal_console_out?

Sure, that'd work for me.

	--david

Re: [PATCH] early_printk for SGI SN2

[Chad Talbott]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

David Mosberger <davidm@napali.hpl.hp.com> writes:

> >>>>> On 18 Jun 2003 15:04:02 -0700, Chad Talbott <chadt@sgi.com> said:
> 
>   Chad> The name may not be the best.  The routines are called sal_*
>   Chad> as they use an SGI specific SAL call to actually output the
>   Chad> text.  Perhaps sn_sal_console_out?
> 
> Sure, that'd work for me.

Agreed.  :)

Here's the changed patch for reference.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: early_printk.diff --]
[-- Type: text/x-patch, Size: 991 bytes --]

diff -Nru a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c	Tue Jun 17 14:47:33 2003
+++ b/kernel/printk.c	Tue Jun 17 14:47:33 2003
@@ -784,6 +784,10 @@
 
 # endif /* CONFIG_IA64_EARLY_PRINTK_UART */
 
+#ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
+extern int sn_sal_console_out(const char *str, int len);
+#endif
+
 void early_printk(const char *str, size_t len)
 {
 #ifdef CONFIG_IA64_EARLY_PRINTK_UART
@@ -791,6 +795,9 @@
 #endif
 #ifdef CONFIG_IA64_EARLY_PRINTK_VGA
 	early_printk_vga(str, len);
+#endif
+#ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
+ 	sn_sal_console_out(str, len);
 #endif
 }
 
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig	Tue Jun 17 14:45:16 2003
+++ b/arch/ia64/Kconfig	Tue Jun 17 14:45:16 2003
@@ -863,6 +831,10 @@
 
 config IA64_EARLY_PRINTK_VGA
 	bool "Early printk on VGA"
+	depends on IA64_EARLY_PRINTK
+
+config IA64_EARLY_PRINTK_SGI_SN
+	bool "Early printk on SGI SN serial console"
 	depends on IA64_EARLY_PRINTK
 
 config DEBUG_SLAB

Re: [PATCH] early_printk for SGI SN2

[David Mosberger]

>>>>> On 18 Jun 2003 15:30:52 -0700, Chad Talbott <chadt@sgi.com> said:

  Chad> David Mosberger <davidm@napali.hpl.hp.com> writes:
  >> >>>>> On 18 Jun 2003 15:04:02 -0700, Chad Talbott <chadt@sgi.com>
  >> said:

  Chad> The name may not be the best.  The routines are called sal_*
  Chad> as they use an SGI specific SAL call to actually output the
  Chad> text.  Perhaps sn_sal_console_out?
  >>  Sure, that'd work for me.

  Chad> Agreed.  :)

  Chad> Here's the changed patch for reference.

I applied this now.

Thanks,

	--david