Commit d7480a9f authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras
Browse files

[POWERPC] Celleb: support udbg 



This patch adds udbg support for Celleb platform.

Signed-off-by: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fe4a0cf1

arch/powerpc/kernel/udbg.c

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ void __init udbg_early_init(void) 
#elif defined(CONFIG_PPC_EARLY_DEBUG_ISERIES)

	/* For iSeries - hit Ctrl-x Ctrl-x to see the output */

	udbg_init_iseries();

#elif defined(CONFIG_PPC_EARLY_DEBUG_BEAT)

	udbg_init_debug_beat();

#endif

}

arch/powerpc/platforms/celleb/udbg_beat.c

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * udbg function for Beat

 *

 * (C) Copyright 2006 TOSHIBA CORPORATION

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 */



#include <linux/kernel.h>

#include <linux/console.h>



#include <asm/machdep.h>

#include <asm/prom.h>

#include <asm/udbg.h>



#include "beat.h"



#define	celleb_vtermno	0



static void udbg_putc_beat(char c)

{

	unsigned long rc;



	if (c == '\n')

		udbg_putc_beat('\r');



	rc = beat_put_term_char(celleb_vtermno, 1, (uint64_t)c << 56, 0);

}



/* Buffered chars getc */

static long inbuflen;

static long inbuf[2];	/* must be 2 longs */



static int udbg_getc_poll_beat(void)

{

	/* The interface is tricky because it may return up to 16 chars.

	 * We save them statically for future calls to udbg_getc().

	 */

	char ch, *buf = (char *)inbuf;

	int i;

	long rc;

	if (inbuflen == 0) {

		/* get some more chars. */

		inbuflen = 0;

		rc = beat_get_term_char(celleb_vtermno, &inbuflen, inbuf+0, inbuf+1);

		if (rc != 0)

			inbuflen = 0;	/* otherwise inbuflen is garbage */

	}

	if (inbuflen <= 0 || inbuflen > 16) {

		/* Catch error case as well as other oddities (corruption) */

		inbuflen = 0;

		return -1;

	}

	ch = buf[0];

	for (i = 1; i < inbuflen; i++)	/* shuffle them down. */

		buf[i-1] = buf[i];

	inbuflen--;

	return ch;

}



static int udbg_getc_beat(void)

{

	int ch;

	for (;;) {

		ch = udbg_getc_poll_beat();

		if (ch == -1) {

			/* This shouldn't be needed...but... */

			volatile unsigned long delay;

			for (delay=0; delay < 2000000; delay++)

				;

		} else {

			return ch;

		}

	}

}



/* call this from early_init() for a working debug console on

 * vterm capable LPAR machines

 */

void __init udbg_init_debug_beat(void)

{

	udbg_putc = udbg_putc_beat;

	udbg_getc = udbg_getc_beat;

	udbg_getc_poll = udbg_getc_poll_beat;

}

include/asm-powerpc/udbg.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ extern void __init udbg_init_maple_realmode(void); 
extern void __init udbg_init_iseries(void);

extern void __init udbg_init_rtas_panel(void);

extern void __init udbg_init_rtas_console(void);

extern void __init udbg_init_debug_beat(void);



#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_UDBG_H */