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

Commit 776258df authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Consolidate the sh_bios earlyprintk code. 



Now that the sh-sci earlyprintk is taken care of by the sh-sci driver
directly, there's no longer any reason for having a split-out
early_printk framework. sh_bios is the only other thing that uses it, so
we just migrate the leftovers in to there. As it's possible to have
multiple early_param()'s for the same string, there's not much point in
having this split out anymore anyways, particularly since the sh_bios
dependencies are still special-cased within sh-sci itself.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b9303a79

arch/sh/include/asm/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
/* ... */

#define COMMAND_LINE ((char *) (PARAM+0x100))



int setup_early_printk(char *);

void sh_mv_setup(void);



#endif /* __KERNEL__ */

arch/sh/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ obj-y := debugtraps.o dma-nommu.o dumpstack.o \ 
obj-y				+= cpu/

obj-$(CONFIG_VSYSCALL)		+= vsyscall/

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SH_STANDARD_BIOS)	+= sh_bios.o early_printk.o

obj-$(CONFIG_SH_STANDARD_BIOS)	+= sh_bios.o

obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_SH_CPU_FREQ)	+= cpufreq.o

obj-$(CONFIG_MODULES)		+= sh_ksyms_$(BITS).o module.o

arch/sh/kernel/early_printk.c

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
/*

 * arch/sh/kernel/early_printk.c

 *

 *  Copyright (C) 1999, 2000  Niibe Yutaka

 *  Copyright (C) 2002  M. R. Brown

 *  Copyright (C) 2004 - 2007  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/console.h>

#include <linux/tty.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/delay.h>



#include <asm/sh_bios.h>



/*

 *	Print a string through the BIOS

 */

static void sh_console_write(struct console *co, const char *s,

				 unsigned count)

{

	sh_bios_console_write(s, count);

}



/*

 *	Setup initial baud/bits/parity. We do two things here:

 *	- construct a cflag setting for the first rs_open()

 *	- initialize the serial port

 *	Return non-zero if we didn't find a serial port.

 */

static int __init sh_console_setup(struct console *co, char *options)

{

	int	cflag = CREAD | HUPCL | CLOCAL;



	/*

	 *	Now construct a cflag setting.

	 *	TODO: this is a totally bogus cflag, as we have

	 *	no idea what serial settings the BIOS is using, or

	 *	even if its using the serial port at all.

	 */

	cflag |= B115200 | CS8 | /*no parity*/0;



	co->cflag = cflag;



	return 0;

}



static struct console bios_console = {

	.name		= "bios",

	.write		= sh_console_write,

	.setup		= sh_console_setup,

	.flags		= CON_PRINTBUFFER,

	.index		= -1,

};



static struct console *early_console;



static int __init setup_early_printk(char *buf)

{

	int keep_early = 0;



	if (!buf)

		return 0;



	if (strstr(buf, "keep"))

		keep_early = 1;



	if (!strncmp(buf, "bios", 4))

		early_console = &bios_console;



	if (likely(early_console)) {

		if (keep_early)

			early_console->flags &= ~CON_BOOT;

		else

			early_console->flags |= CON_BOOT;

		register_console(early_console);

	}



	return 0;

}

early_param("earlyprintk", setup_early_printk);

arch/sh/kernel/sh_bios.c

+78 −2
Original line number Diff line number Diff line 
/*

 *  linux/arch/sh/kernel/sh_bios.c

 *  C interface for trapping into the standard LinuxSH BIOS.

 *

 *  Copyright (C) 2000 Greg Banks, Mitch Davis

 *  Copyright (C) 1999, 2000  Niibe Yutaka

 *  Copyright (C) 2002  M. R. Brown

 *  Copyright (C) 2004 - 2010  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/module.h>

#include <linux/console.h>

#include <linux/tty.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <asm/sh_bios.h>



#define BIOS_CALL_CONSOLE_WRITE		0

#define BIOS_CALL_ETH_NODE_ADDR		10

#define BIOS_CALL_SHUTDOWN		11

#define BIOS_CALL_CHAR_OUT		0x1f	/* TODO: hack */

#define BIOS_CALL_GDB_DETACH		0xff



static inline long sh_bios_call(long func, long arg0, long arg1, long arg2,
@@ -87,3 +96,70 @@ void sh_bios_vbr_reload(void) 
			: "memory"

		);

}



/*

 *	Print a string through the BIOS

 */

static void sh_console_write(struct console *co, const char *s,

				 unsigned count)

{

	sh_bios_console_write(s, count);

}



/*

 *	Setup initial baud/bits/parity. We do two things here:

 *	- construct a cflag setting for the first rs_open()

 *	- initialize the serial port

 *	Return non-zero if we didn't find a serial port.

 */

static int __init sh_console_setup(struct console *co, char *options)

{

	int	cflag = CREAD | HUPCL | CLOCAL;



	/*

	 *	Now construct a cflag setting.

	 *	TODO: this is a totally bogus cflag, as we have

	 *	no idea what serial settings the BIOS is using, or

	 *	even if its using the serial port at all.

	 */

	cflag |= B115200 | CS8 | /*no parity*/0;



	co->cflag = cflag;



	return 0;

}



static struct console bios_console = {

	.name		= "bios",

	.write		= sh_console_write,

	.setup		= sh_console_setup,

	.flags		= CON_PRINTBUFFER,

	.index		= -1,

};



static struct console *early_console;



static int __init setup_early_printk(char *buf)

{

	int keep_early = 0;



	if (!buf)

		return 0;



	if (strstr(buf, "keep"))

		keep_early = 1;



	if (!strncmp(buf, "bios", 4))

		early_console = &bios_console;



	if (likely(early_console)) {

		if (keep_early)

			early_console->flags &= ~CON_BOOT;

		else

			early_console->flags |= CON_BOOT;

		register_console(early_console);

	}



	return 0;

}

early_param("earlyprintk", setup_early_printk);