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

Commit 7f853352 authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

[PATCH] ppc64: Split SCC and 15550 udbg code 



Split scc and 15550 functions from udbg each into their own file.
This makes them more symetric with the lpar and btext code.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 37548d58

arch/ppc64/kernel/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o prom.o 


obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \

			     pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \

			     pSeries_setup.o pSeries_iommu.o

			     pSeries_setup.o pSeries_iommu.o udbg_16550.o



obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \

			 bpa_iic.o spider-pic.o
@@ -58,9 +58,11 @@ obj-$(CONFIG_XICS) += xics.o 
obj-$(CONFIG_MPIC)		+= mpic.o



obj-$(CONFIG_PPC_PMAC)		+= pmac_setup.o pmac_feature.o pmac_pci.o \

				   pmac_time.o pmac_nvram.o pmac_low_i2c.o

				   pmac_time.o pmac_nvram.o pmac_low_i2c.o \

				   udbg_scc.o



obj-$(CONFIG_PPC_MAPLE)		+= maple_setup.o maple_pci.o maple_time.o

obj-$(CONFIG_PPC_MAPLE)		+= maple_setup.o maple_pci.o maple_time.o \

				   udbg_16550.o



obj-$(CONFIG_U3_DART)		+= u3_iommu.o

arch/ppc64/kernel/udbg.c

+1 −224
Original line number Diff line number Diff line 
/*

 * NS16550 Serial Port (uart) debugging stuff.

 * polling mode stateless debugging stuff, originally for NS16550 Serial Ports

 *

 * c 2001 PPC 64 Team, IBM Corp

 *
@@ -19,229 +19,6 @@ 
#include <asm/machdep.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/pmac_feature.h>



extern u8 real_readb(volatile u8 __iomem  *addr);

extern void real_writeb(u8 data, volatile u8 __iomem *addr);



struct NS16550 {

	/* this struct must be packed */

	unsigned char rbr;  /* 0 */

	unsigned char ier;  /* 1 */

	unsigned char fcr;  /* 2 */

	unsigned char lcr;  /* 3 */

	unsigned char mcr;  /* 4 */

	unsigned char lsr;  /* 5 */

	unsigned char msr;  /* 6 */

	unsigned char scr;  /* 7 */

};



#define thr rbr

#define iir fcr

#define dll rbr

#define dlm ier

#define dlab lcr



#define LSR_DR   0x01  /* Data ready */

#define LSR_OE   0x02  /* Overrun */

#define LSR_PE   0x04  /* Parity error */

#define LSR_FE   0x08  /* Framing error */

#define LSR_BI   0x10  /* Break */

#define LSR_THRE 0x20  /* Xmit holding register empty */

#define LSR_TEMT 0x40  /* Xmitter empty */

#define LSR_ERR  0x80  /* Error */



static volatile struct NS16550 __iomem *udbg_comport;



void udbg_init_uart(void __iomem *comport, unsigned int speed)

{

	u16 dll = speed ? (115200 / speed) : 12;



	if (comport) {

		udbg_comport = (struct NS16550 __iomem *)comport;

		out_8(&udbg_comport->lcr, 0x00);

		out_8(&udbg_comport->ier, 0xff);

		out_8(&udbg_comport->ier, 0x00);

		out_8(&udbg_comport->lcr, 0x80);	/* Access baud rate */

		out_8(&udbg_comport->dll, dll & 0xff);	/* 1 = 115200,  2 = 57600,

							   3 = 38400, 12 = 9600 baud */

		out_8(&udbg_comport->dlm, dll >> 8);	/* dll >> 8 which should be zero

							   for fast rates; */

		out_8(&udbg_comport->lcr, 0x03);	/* 8 data, 1 stop, no parity */

		out_8(&udbg_comport->mcr, 0x03);	/* RTS/DTR */

		out_8(&udbg_comport->fcr ,0x07);	/* Clear & enable FIFOs */

		ppc_md.udbg_putc = udbg_putc;		/* set access methods */

		ppc_md.udbg_getc = udbg_getc;

		ppc_md.udbg_getc_poll = udbg_getc_poll;

	}

}



#ifdef CONFIG_PPC_PMAC



#define	SCC_TXRDY	4

#define SCC_RXRDY	1



static volatile u8 __iomem *sccc;

static volatile u8 __iomem *sccd;



static unsigned char scc_inittab[] = {

    13, 0,		/* set baud rate divisor */

    12, 0,

    14, 1,		/* baud rate gen enable, src=rtxc */

    11, 0x50,		/* clocks = br gen */

    5,  0xea,		/* tx 8 bits, assert DTR & RTS */

    4,  0x46,		/* x16 clock, 1 stop */

    3,  0xc1,		/* rx enable, 8 bits */

};



void udbg_init_scc(struct device_node *np)

{

	u32 *reg;

	unsigned long addr;

	int i, x;



	if (np == NULL)

		np = of_find_node_by_name(NULL, "escc");

	if (np == NULL || np->parent == NULL)

		return;



	udbg_printf("found SCC...\n");

	/* Get address within mac-io ASIC */ 

	reg = (u32 *)get_property(np, "reg", NULL);

	if (reg == NULL)

		return;

	addr = reg[0];

	udbg_printf("local addr: %lx\n", addr);

	/* Get address of mac-io PCI itself */

	reg = (u32 *)get_property(np->parent, "assigned-addresses", NULL);

	if (reg == NULL)

		return;

	addr += reg[2];

	udbg_printf("final addr: %lx\n", addr);



	/* Setup for 57600 8N1 */

	addr += 0x20;

	sccc = (volatile u8 * __iomem) ioremap(addr & PAGE_MASK, PAGE_SIZE) ;

	sccc += addr & ~PAGE_MASK;

	sccd = sccc + 0x10;



	udbg_printf("ioremap result sccc: %p\n", sccc);

	mb();



	for (i = 20000; i != 0; --i)

		x = in_8(sccc);

	out_8(sccc, 0x09);		/* reset A or B side */

	out_8(sccc, 0xc0);

	for (i = 0; i < sizeof(scc_inittab); ++i)

		out_8(sccc, scc_inittab[i]);



	ppc_md.udbg_putc = udbg_putc;

	ppc_md.udbg_getc = udbg_getc;

	ppc_md.udbg_getc_poll = udbg_getc_poll;



	udbg_puts("Hello World !\n");

}



#endif /* CONFIG_PPC_PMAC */



#ifdef CONFIG_PPC_PMAC

static void udbg_real_putc(unsigned char c)

{

	while ((real_readb(sccc) & SCC_TXRDY) == 0)

		;

	real_writeb(c, sccd);

	if (c == '\n')

		udbg_real_putc('\r');

}



void udbg_init_pmac_realmode(void)

{

	sccc = (volatile u8 __iomem *)0x80013020ul;

	sccd = (volatile u8 __iomem *)0x80013030ul;



	ppc_md.udbg_putc = udbg_real_putc;

	ppc_md.udbg_getc = NULL;

	ppc_md.udbg_getc_poll = NULL;

}

#endif /* CONFIG_PPC_PMAC */



#ifdef CONFIG_PPC_MAPLE

void udbg_maple_real_putc(unsigned char c)

{

	if (udbg_comport) {

		while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)

			/* wait for idle */;

		real_writeb(c, &udbg_comport->thr); eieio();

		if (c == '\n')

			udbg_maple_real_putc('\r');

	}

}



void udbg_init_maple_realmode(void)

{

	udbg_comport = (volatile struct NS16550 __iomem *)0xf40003f8;



	ppc_md.udbg_putc = udbg_maple_real_putc;

	ppc_md.udbg_getc = NULL;

	ppc_md.udbg_getc_poll = NULL;

}

#endif /* CONFIG_PPC_MAPLE */



void udbg_putc(unsigned char c)

{

	if (udbg_comport) {

		while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0)

			/* wait for idle */;

		out_8(&udbg_comport->thr, c);

		if (c == '\n')

			udbg_putc('\r');

	}

#ifdef CONFIG_PPC_PMAC

	else if (sccc) {

		while ((in_8(sccc) & SCC_TXRDY) == 0)

			;

		out_8(sccd,  c);		

		if (c == '\n')

			udbg_putc('\r');

	}

#endif /* CONFIG_PPC_PMAC */

}



int udbg_getc_poll(void)

{

	if (udbg_comport) {

		if ((in_8(&udbg_comport->lsr) & LSR_DR) != 0)

			return in_8(&udbg_comport->rbr);

		else

			return -1;

	}

#ifdef CONFIG_PPC_PMAC

	else if (sccc) {

		if ((in_8(sccc) & SCC_RXRDY) != 0)

			return in_8(sccd);

		else

			return -1;

	}

#endif /* CONFIG_PPC_PMAC */

	return -1;

}



unsigned char udbg_getc(void)

{

	if (udbg_comport) {

		while ((in_8(&udbg_comport->lsr) & LSR_DR) == 0)

			/* wait for char */;

		return in_8(&udbg_comport->rbr);

	}

#ifdef CONFIG_PPC_PMAC

	else if (sccc) {

		while ((in_8(sccc) & SCC_RXRDY) == 0)

			;

		return in_8(sccd);

	}

#endif /* CONFIG_PPC_PMAC */

	return 0;

}



void udbg_puts(const char *s)

{

arch/ppc64/kernel/udbg_16550.c

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

 * udbg for for NS16550 compatable serial ports

 *

 * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp

 *

 *      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.

 */

#include <linux/config.h>

#include <linux/types.h>

#include <asm/ppcdebug.h>

#include <asm/processor.h>

#include <asm/naca.h>

#include <asm/uaccess.h>

#include <asm/machdep.h>

#include <asm/io.h>

#include <asm/prom.h>



extern u8 real_readb(volatile u8 __iomem  *addr);

extern void real_writeb(u8 data, volatile u8 __iomem *addr);



struct NS16550 {

	/* this struct must be packed */

	unsigned char rbr;  /* 0 */

	unsigned char ier;  /* 1 */

	unsigned char fcr;  /* 2 */

	unsigned char lcr;  /* 3 */

	unsigned char mcr;  /* 4 */

	unsigned char lsr;  /* 5 */

	unsigned char msr;  /* 6 */

	unsigned char scr;  /* 7 */

};



#define thr rbr

#define iir fcr

#define dll rbr

#define dlm ier

#define dlab lcr



#define LSR_DR   0x01  /* Data ready */

#define LSR_OE   0x02  /* Overrun */

#define LSR_PE   0x04  /* Parity error */

#define LSR_FE   0x08  /* Framing error */

#define LSR_BI   0x10  /* Break */

#define LSR_THRE 0x20  /* Xmit holding register empty */

#define LSR_TEMT 0x40  /* Xmitter empty */

#define LSR_ERR  0x80  /* Error */



static volatile struct NS16550 __iomem *udbg_comport;



static void udbg_550_putc(unsigned char c)

{

	if (udbg_comport) {

		while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0)

			/* wait for idle */;

		out_8(&udbg_comport->thr, c);

		if (c == '\n')

			udbg_550_putc('\r');

	}

}



static int udbg_550_getc_poll(void)

{

	if (udbg_comport) {

		if ((in_8(&udbg_comport->lsr) & LSR_DR) != 0)

			return in_8(&udbg_comport->rbr);

		else

			return -1;

	}

	return -1;

}



static unsigned char udbg_550_getc(void)

{

	if (udbg_comport) {

		while ((in_8(&udbg_comport->lsr) & LSR_DR) == 0)

			/* wait for char */;

		return in_8(&udbg_comport->rbr);

	}

	return 0;

}



void udbg_init_uart(void __iomem *comport, unsigned int speed)

{

	u16 dll = speed ? (115200 / speed) : 12;



	if (comport) {

		udbg_comport = (struct NS16550 __iomem *)comport;

		out_8(&udbg_comport->lcr, 0x00);

		out_8(&udbg_comport->ier, 0xff);

		out_8(&udbg_comport->ier, 0x00);

		out_8(&udbg_comport->lcr, 0x80);	/* Access baud rate */

		out_8(&udbg_comport->dll, dll & 0xff);	/* 1 = 115200,  2 = 57600,

							   3 = 38400, 12 = 9600 baud */

		out_8(&udbg_comport->dlm, dll >> 8);	/* dll >> 8 which should be zero

							   for fast rates; */

		out_8(&udbg_comport->lcr, 0x03);	/* 8 data, 1 stop, no parity */

		out_8(&udbg_comport->mcr, 0x03);	/* RTS/DTR */

		out_8(&udbg_comport->fcr ,0x07);	/* Clear & enable FIFOs */

		ppc_md.udbg_putc = udbg_550_putc;

		ppc_md.udbg_getc = udbg_550_getc;

		ppc_md.udbg_getc_poll = udbg_550_getc_poll;

	}

}



#ifdef CONFIG_PPC_MAPLE

void udbg_maple_real_putc(unsigned char c)

{

	if (udbg_comport) {

		while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)

			/* wait for idle */;

		real_writeb(c, &udbg_comport->thr); eieio();

		if (c == '\n')

			udbg_maple_real_putc('\r');

	}

}



void udbg_init_maple_realmode(void)

{

	udbg_comport = (volatile struct NS16550 __iomem *)0xf40003f8;



	ppc_md.udbg_putc = udbg_maple_real_putc;

	ppc_md.udbg_getc = NULL;

	ppc_md.udbg_getc_poll = NULL;

}

#endif /* CONFIG_PPC_MAPLE */

arch/ppc64/kernel/udbg_scc.c

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

 * udbg for for zilog scc ports as found on Apple PowerMacs

 *

 * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp

 *

 *      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.

 */

#include <linux/config.h>

#include <linux/types.h>

#include <asm/ppcdebug.h>

#include <asm/processor.h>

#include <asm/naca.h>

#include <asm/uaccess.h>

#include <asm/machdep.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/pmac_feature.h>



extern u8 real_readb(volatile u8 __iomem  *addr);

extern void real_writeb(u8 data, volatile u8 __iomem *addr);



#define	SCC_TXRDY	4

#define SCC_RXRDY	1



static volatile u8 __iomem *sccc;

static volatile u8 __iomem *sccd;



static void udbg_scc_putc(unsigned char c)

{

	if (sccc) {

		while ((in_8(sccc) & SCC_TXRDY) == 0)

			;

		out_8(sccd,  c);

		if (c == '\n')

			udbg_scc_putc('\r');

	}

}



static int udbg_scc_getc_poll(void)

{

	if (sccc) {

		if ((in_8(sccc) & SCC_RXRDY) != 0)

			return in_8(sccd);

		else

			return -1;

	}

	return -1;

}



static unsigned char udbg_scc_getc(void)

{

	if (sccc) {

		while ((in_8(sccc) & SCC_RXRDY) == 0)

			;

		return in_8(sccd);

	}

	return 0;

}



static unsigned char scc_inittab[] = {

    13, 0,		/* set baud rate divisor */

    12, 0,

    14, 1,		/* baud rate gen enable, src=rtxc */

    11, 0x50,		/* clocks = br gen */

    5,  0xea,		/* tx 8 bits, assert DTR & RTS */

    4,  0x46,		/* x16 clock, 1 stop */

    3,  0xc1,		/* rx enable, 8 bits */

};



void udbg_init_scc(struct device_node *np)

{

	u32 *reg;

	unsigned long addr;

	int i, x;



	if (np == NULL)

		np = of_find_node_by_name(NULL, "escc");

	if (np == NULL || np->parent == NULL)

		return;



	udbg_printf("found SCC...\n");

	/* Get address within mac-io ASIC */

	reg = (u32 *)get_property(np, "reg", NULL);

	if (reg == NULL)

		return;

	addr = reg[0];

	udbg_printf("local addr: %lx\n", addr);

	/* Get address of mac-io PCI itself */

	reg = (u32 *)get_property(np->parent, "assigned-addresses", NULL);

	if (reg == NULL)

		return;

	addr += reg[2];

	udbg_printf("final addr: %lx\n", addr);



	/* Setup for 57600 8N1 */

	addr += 0x20;

	sccc = (volatile u8 * __iomem) ioremap(addr & PAGE_MASK, PAGE_SIZE) ;

	sccc += addr & ~PAGE_MASK;

	sccd = sccc + 0x10;



	udbg_printf("ioremap result sccc: %p\n", sccc);

	mb();



	for (i = 20000; i != 0; --i)

		x = in_8(sccc);

	out_8(sccc, 0x09);		/* reset A or B side */

	out_8(sccc, 0xc0);

	for (i = 0; i < sizeof(scc_inittab); ++i)

		out_8(sccc, scc_inittab[i]);



	ppc_md.udbg_putc = udbg_scc_putc;

	ppc_md.udbg_getc = udbg_scc_getc;

	ppc_md.udbg_getc_poll = udbg_scc_getc_poll;



	udbg_puts("Hello World !\n");

}



static void udbg_real_scc_putc(unsigned char c)

{

	while ((real_readb(sccc) & SCC_TXRDY) == 0)

		;

	real_writeb(c, sccd);

	if (c == '\n')

		udbg_real_scc_putc('\r');

}



void udbg_init_pmac_realmode(void)

{

	sccc = (volatile u8 __iomem *)0x80013020ul;

	sccd = (volatile u8 __iomem *)0x80013030ul;



	ppc_md.udbg_putc = udbg_real_scc_putc;

	ppc_md.udbg_getc = NULL;

	ppc_md.udbg_getc_poll = NULL;

}