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

Commit 8b6d8c59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Cobalt: update defconfig
  [MIPS] kgdb: add arch support for the kernel's kgdb core
  [MIPS] kgdb: Remove existing implementation
  [MIPS] TXx9: Kconfig cleanup
  [MIPS] TXx9: Kill unused txx927.h
  [MIPS] TXx9: Support early_printk
  [MIPS] TXx9: Unify serial_txx9 setup
  [MIPS] TXx9: Random cleanup
  [MIPS] TXx9: Make tx4938-specific code more independent
  [MIPS] TXx9: Make tx3927-specific code more independent
  [MIPS] TXx9: Cleanup watchdog
  [MIPS] TXx9: Cleanup restart/halt/power_off
  [MIPS] TXx9: PCI error handling
  [MIPS] TXx9: Add some pci options
  [MIPS] Introduce pcibios_plat_setup
  [MIPS] TXx9: PCI fixes for tx3927/tx4927
  [MIPS] TXx9: Fix JMR3927 irq numbers
  [MIPS] RB532: Flags are unsigned long
  [MIPS] Initialization of Alchemy boards
  [MIPS] tlb-r4k: Nuke broken paranoia error test.
parents 94ad374a de1d7bb6

arch/mips/Kconfig

+1 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config MIPS 
	default y

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB

	# Horrible source of confusion.  Die, die, die ...

	select EMBEDDED

	select RTC_LIB
@@ -34,7 +35,6 @@ config BASLER_EXCITE 
	select SYS_HAS_CPU_RM9000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	help

	  The eXcite is a smart camera platform manufactured by

	  Basler Vision Technologies AG.
@@ -280,7 +280,6 @@ config PMC_MSP 
	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select IRQ_CPU

	select SERIAL_8250

	select SERIAL_8250_CONSOLE
@@ -306,7 +305,6 @@ config PMC_YOSEMITE 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_SMP

	help

	  Yosemite is an evaluation board for the RM9000x2 processor
@@ -359,7 +357,6 @@ config SGI_IP27 
	select SYS_HAS_CPU_R10000

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -475,7 +472,6 @@ config SIBYTE_SWARM 
	select SYS_HAS_CPU_SB1

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ZONE_DMA32 if 64BIT
@@ -868,7 +864,6 @@ config SOC_PNX8550 
	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select SYS_SUPPORTS_KGDB

	select GENERIC_GPIO



config SWAP_IO_SPACE

arch/mips/Kconfig.debug

+0 −22
Original line number Diff line number Diff line
@@ -34,28 +34,6 @@ config SMTC_IDLE_HOOK_DEBUG 
	  arch/mips/kernel/smtc.c.  This debugging option result in significant

	  overhead so should be disabled in production kernels.



config KGDB

	bool "Remote GDB kernel debugging"

	depends on DEBUG_KERNEL && SYS_SUPPORTS_KGDB

	select DEBUG_INFO

	help

	  If you say Y here, it will be possible to remotely debug the MIPS

	  kernel using gdb. This enlarges your kernel image disk size by

	  several megabytes and requires a machine with more than 16 MB,

	  better 32 MB RAM to avoid excessive linking time. This is only

	  useful for kernel hackers. If unsure, say N.



config SYS_SUPPORTS_KGDB

	bool



config GDB_CONSOLE

	bool "Console output to GDB"

	depends on KGDB

	help

	  If you are using GDB for remote debugging over a serial port and

	  would like kernel messages to be formatted into GDB $O packets so

	  that GDB prints them as program output, say 'Y'.



config SB1XXX_CORELIS

	bool "Corelis Debugger"

	depends on SIBYTE_SB1xxx_SOC

arch/mips/au1000/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -134,4 +134,3 @@ config SOC_AU1X00 
	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_APM_EMULATION
 
	select SYS_SUPPORTS_KGDB

arch/mips/au1000/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ obj-y += prom.o irq.o puts.o time.o reset.o \ 
	au1xxx_irqmap.o clocks.o platform.o power.o setup.o \

	sleeper.o cputable.o dma.o dbdma.o gpio.o



obj-$(CONFIG_KGDB)		+= dbg_io.o

obj-$(CONFIG_PCI)		+= pci.o



EXTRA_CFLAGS += -Werror

arch/mips/au1000/common/dbg_io.c

deleted100644 → 0
+0 −109
Original line number Diff line number Diff line 
#include <linux/types.h>



#include <asm/mach-au1x00/au1000.h>



#ifdef CONFIG_KGDB



/*

 * FIXME the user should be able to select the

 * uart to be used for debugging.

 */

#define DEBUG_BASE  UART_DEBUG_BASE



#define         UART16550_BAUD_2400             2400

#define         UART16550_BAUD_4800             4800

#define         UART16550_BAUD_9600             9600

#define         UART16550_BAUD_19200            19200

#define         UART16550_BAUD_38400            38400

#define         UART16550_BAUD_57600            57600

#define         UART16550_BAUD_115200           115200



#define         UART16550_PARITY_NONE           0

#define         UART16550_PARITY_ODD            0x08

#define         UART16550_PARITY_EVEN           0x18

#define         UART16550_PARITY_MARK           0x28

#define         UART16550_PARITY_SPACE          0x38



#define         UART16550_DATA_5BIT             0x0

#define         UART16550_DATA_6BIT             0x1

#define         UART16550_DATA_7BIT             0x2

#define         UART16550_DATA_8BIT             0x3



#define         UART16550_STOP_1BIT             0x0

#define         UART16550_STOP_2BIT             0x4





#define UART_RX		0	/* Receive buffer */

#define UART_TX		4	/* Transmit buffer */

#define UART_IER	8	/* Interrupt Enable Register */

#define UART_IIR	0xC	/* Interrupt ID Register */

#define UART_FCR	0x10	/* FIFO Control Register */

#define UART_LCR	0x14	/* Line Control Register */

#define UART_MCR	0x18	/* Modem Control Register */

#define UART_LSR	0x1C	/* Line Status Register */

#define UART_MSR	0x20	/* Modem Status Register */

#define UART_CLK	0x28	/* Baud Rat4e Clock Divider */

#define UART_MOD_CNTRL	0x100	/* Module Control */



/* memory-mapped read/write of the port */

#define UART16550_READ(y)     (au_readl(DEBUG_BASE + y) & 0xff)

#define UART16550_WRITE(y, z) (au_writel(z & 0xff, DEBUG_BASE + y))



extern unsigned long calc_clock(void);



void debugInit(u32 baud, u8 data, u8 parity, u8 stop)

{

	if (UART16550_READ(UART_MOD_CNTRL) != 0x3)

		UART16550_WRITE(UART_MOD_CNTRL, 3);

	calc_clock();



	/* disable interrupts */

	UART16550_WRITE(UART_IER, 0);



	/* set up baud rate */

	{

		u32 divisor;



		/* set divisor */

		divisor = get_au1x00_uart_baud_base() / baud;

		UART16550_WRITE(UART_CLK, divisor & 0xffff);

	}



	/* set data format */

	UART16550_WRITE(UART_LCR, (data | parity | stop));

}



static int remoteDebugInitialized;



u8 getDebugChar(void)

{

	if (!remoteDebugInitialized) {

		remoteDebugInitialized = 1;

		debugInit(UART16550_BAUD_115200,

			  UART16550_DATA_8BIT,

			  UART16550_PARITY_NONE,

			  UART16550_STOP_1BIT);

	}



	while ((UART16550_READ(UART_LSR) & 0x1) == 0);

	return UART16550_READ(UART_RX);

}





int putDebugChar(u8 byte)

{

	if (!remoteDebugInitialized) {

		remoteDebugInitialized = 1;

		debugInit(UART16550_BAUD_115200,

			  UART16550_DATA_8BIT,

			  UART16550_PARITY_NONE,

			  UART16550_STOP_1BIT);

	}



	while ((UART16550_READ(UART_LSR) & 0x40) == 0);

	UART16550_WRITE(UART_TX, byte);



	return 1;

}



#endif