Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c46f46d0 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

m68k/mvme16x: Adopt common boot console 



In a multi-platform kernel binary we only need one early console instance.

The difficulty here is that the common early console is started by
early_param(), whereas the MVME16x instance is started later by
config_mvme16x(). That means some interrupt setup must be done earlier.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Tested-by: default avatarStephen N Chivers <schivers@csc.com.au>
[Geert] Tag debug_cons_write() with __ref to kill section mismatch warning
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 7913ad1a

arch/m68k/kernel/early_printk.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -12,12 +12,21 @@ 
#include <linux/string.h>

#include <linux/string.h>

#include <asm/setup.h>

#include <asm/setup.h>





extern void mvme16x_cons_write(struct console *co,

			       const char *str, unsigned count);



asmlinkage void __init debug_cons_nputs(const char *s, unsigned n);

asmlinkage void __init debug_cons_nputs(const char *s, unsigned n);





static void debug_cons_write(struct console *c,

static void __ref debug_cons_write(struct console *c,

				   const char *s, unsigned n)

				   const char *s, unsigned n)

{

{

#if !(defined(CONFIG_SUN3)   || defined(CONFIG_M68360) || \

      defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE))

	if (MACH_IS_MVME16x)

		mvme16x_cons_write(c, s, n);

	else

		debug_cons_nputs(s, n);

		debug_cons_nputs(s, n);

#endif

}

}





static struct console early_console_instance = {

static struct console early_console_instance = {
@@ -29,10 +38,6 @@ static struct console early_console_instance = { 




static int __init setup_early_printk(char *buf)

static int __init setup_early_printk(char *buf)

{

{

	/* MVME16x registers an early console after interrupt setup. */

	if (MACH_IS_MVME16x)

		return 0;



	if (early_console || buf)

	if (early_console || buf)

		return 0;

		return 0;
@@ -52,7 +57,7 @@ early_param("earlyprintk", setup_early_printk); 




static int __init unregister_early_console(void)

static int __init unregister_early_console(void)

{

{

	if (!early_console)

	if (!early_console || MACH_IS_MVME16x)

		return 0;

		return 0;





	return unregister_console(early_console);

	return unregister_console(early_console);

arch/m68k/kernel/head.S

+11 −0
Original line number Original line Diff line number Diff line
@@ -2936,6 +2936,15 @@ L(serial_init_not_mac): 
2:

2:

#endif

#endif





#ifdef CONFIG_MVME16x

	is_not_mvme16x(L(serial_init_not_mvme16x))

	moveb	#0x10,M167_PCSCCMICR

	moveb	#0x10,M167_PCSCCTICR

	moveb	#0x10,M167_PCSCCRICR

	jra	L(serial_init_done)

L(serial_init_not_mvme16x):

#endif



#ifdef CONFIG_APOLLO

#ifdef CONFIG_APOLLO

/* We count on the PROM initializing SIO1 */

/* We count on the PROM initializing SIO1 */

#endif

#endif
@@ -3768,7 +3777,9 @@ M167_CYIER = 0xfff45011 
M167_CYLICR = 0xfff45026

M167_CYLICR = 0xfff45026

M167_CYTEOIR = 0xfff45085

M167_CYTEOIR = 0xfff45085

M167_CYTDR = 0xfff450f8

M167_CYTDR = 0xfff450f8

M167_PCSCCMICR = 0xfff4201d

M167_PCSCCTICR = 0xfff4201e

M167_PCSCCTICR = 0xfff4201e

M167_PCSCCRICR = 0xfff4201f

M167_PCTPIACKR = 0xfff42025

M167_PCTPIACKR = 0xfff42025

#endif

#endif

arch/m68k/mvme16x/config.c

+1 −25
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ static void __init mvme16x_init_IRQ (void) 
#define CySCRH		(0x22)

#define CySCRH		(0x22)

#define CyTFTC		(0x80)

#define CyTFTC		(0x80)





static void cons_write(struct console *co, const char *str, unsigned count)

void mvme16x_cons_write(struct console *co, const char *str, unsigned count)

{

{

	volatile unsigned char *base_addr = (u_char *)CD2401_ADDR;

	volatile unsigned char *base_addr = (u_char *)CD2401_ADDR;

	volatile u_char sink;

	volatile u_char sink;
@@ -268,20 +268,6 @@ static void cons_write(struct console *co, const char *str, unsigned count) 
	base_addr[CyIER] = ier;

	base_addr[CyIER] = ier;

}

}





static struct console cons_info =

{

	.name	= "sercon",

	.write	= cons_write,

	.flags	= CON_PRINTBUFFER | CON_BOOT,

	.index	= -1,

};



static void __init mvme16x_early_console(void)

{

	register_console(&cons_info);



	printk(KERN_INFO "MVME16x: early console registered\n");

}

#endif

#endif





void __init config_mvme16x(void)

void __init config_mvme16x(void)
@@ -336,16 +322,6 @@ void __init config_mvme16x(void) 
    else

    else

    {

    {

	mvme16x_config = MVME16x_CONFIG_GOT_LP | MVME16x_CONFIG_GOT_CD2401;

	mvme16x_config = MVME16x_CONFIG_GOT_LP | MVME16x_CONFIG_GOT_CD2401;



	/* Dont allow any interrupts from the CD2401 until the interrupt */

	/* handlers are installed					 */



	pcc2chip[PccSCCMICR] = 0x10;

	pcc2chip[PccSCCTICR] = 0x10;

	pcc2chip[PccSCCRICR] = 0x10;

#ifdef CONFIG_EARLY_PRINTK

	mvme16x_early_console();

#endif

    }

    }

}

}