From: Matt Porter <mporter@kernel.crashing.org>
To: akpm@osdl.org
Cc: takeharu1219@ybb.ne.jp, linux-kernel@vger.kernel.org,
linuxppc-embedded@ozlabs.org
Subject: [PATCH][PPC32][2/2] 40x and Book E debug: 4xx platform support
Date: Fri, 29 Oct 2004 18:08:14 -0700 [thread overview]
Message-ID: <20041029180814.A15758@home.com> (raw)
In-Reply-To: <20041029175158.D13435@home.com>; from mporter@kernel.crashing.org on Fri, Oct 29, 2004 at 05:51:58PM -0700
This patch adds support to the 40x and 44x platform code for
initializing debug events and using the in-kernel kgdb stub.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
diff -Nru a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
--- a/arch/ppc/platforms/4xx/Kconfig 2004-10-29 17:22:22 -07:00
+++ b/arch/ppc/platforms/4xx/Kconfig 2004-10-29 17:22:22 -07:00
@@ -201,7 +201,7 @@
config PPC_GEN550
bool
- depends on 44x
+ depends on 4xx
default y
config PM
diff -Nru a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
--- a/arch/ppc/platforms/4xx/ebony.c 2004-10-29 17:22:22 -07:00
+++ b/arch/ppc/platforms/4xx/ebony.c 2004-10-29 17:22:22 -07:00
@@ -313,14 +313,6 @@
struct ocp_def *def;
struct ocp_func_emac_data *emacdata;
-#if !defined(CONFIG_BDI_SWITCH)
- /*
- * The Abatron BDI JTAG debugger does not tolerate others
- * mucking with the debug registers.
- */
- mtspr(SPRN_DBCR0, (DBCR0_TDE | DBCR0_IDM));
-#endif
-
/* Set mac_addr for each EMAC */
vpd_base = ioremap64(EBONY_VPD_BASE, EBONY_VPD_SIZE);
def = ocp_get_one_device(OCP_VENDOR_IBM, OCP_FUNC_EMAC, 0);
diff -Nru a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
--- a/arch/ppc/platforms/4xx/ocotea.c 2004-10-29 17:22:22 -07:00
+++ b/arch/ppc/platforms/4xx/ocotea.c 2004-10-29 17:22:22 -07:00
@@ -291,14 +291,6 @@
ibm440gx_tah_enable();
-#if !defined(CONFIG_BDI_SWITCH)
- /*
- * The Abatron BDI JTAG debugger does not tolerate others
- * mucking with the debug registers.
- */
- mtspr(SPRN_DBCR0, (DBCR0_TDE | DBCR0_IDM));
-#endif
-
/* Setup TODC access */
TODC_INIT(TODC_TYPE_DS1743,
0,
diff -Nru a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
--- a/arch/ppc/syslib/Makefile 2004-10-29 17:22:22 -07:00
+++ b/arch/ppc/syslib/Makefile 2004-10-29 17:22:22 -07:00
@@ -25,7 +25,6 @@
obj-$(CONFIG_PPC4xx_DMA) += ppc4xx_dma.o
obj-$(CONFIG_PPC4xx_EDMA) += ppc4xx_sgdma.o
ifeq ($(CONFIG_40x),y)
-obj-$(CONFIG_KGDB) += ppc4xx_kgdb.o
obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o ppc405_pci.o
endif
endif
diff -Nru a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c
--- a/arch/ppc/syslib/ibm44x_common.c 2004-10-29 17:22:22 -07:00
+++ b/arch/ppc/syslib/ibm44x_common.c 2004-10-29 17:22:22 -07:00
@@ -166,5 +166,17 @@
#ifdef CONFIG_KGDB
ppc_md.kgdb_map_scc = gen550_kgdb_map_scc;
#endif
+
+ /*
+ * The Abatron BDI JTAG debugger does not tolerate others
+ * mucking with the debug registers.
+ */
+#if !defined(CONFIG_BDI_SWITCH)
+ /* Enable internal debug mode */
+ mtspr(SPRN_DBCR0, (DBCR0_IDM));
+
+ /* Clear any residual debug events */
+ mtspr(SPRN_DBSR, 0xffffffff);
+#endif
}
diff -Nru a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c
--- a/arch/ppc/syslib/ppc4xx_setup.c 2004-10-29 17:22:22 -07:00
+++ b/arch/ppc/syslib/ppc4xx_setup.c 2004-10-29 17:22:22 -07:00
@@ -42,6 +42,8 @@
#include <asm/pci-bridge.h>
#include <asm/bootinfo.h>
+#include <syslib/gen550.h>
+
/* Function Prototypes */
extern void abort(void);
extern void ppc4xx_find_bridges(void);
@@ -56,8 +58,16 @@
void __init
ppc4xx_setup_arch(void)
{
- /* Setup PCI host bridges */
+#if !defined(CONFIG_BDI_SWITCH)
+ /*
+ * The Abatron BDI JTAG debugger does not tolerate others
+ * mucking with the debug registers.
+ */
+ mtspr(SPRN_DBCR0, (DBCR0_IDM));
+ mtspr(SPRN_DBSR, 0xffffffff);
+#endif
+ /* Setup PCI host bridges */
#ifdef CONFIG_PCI
ppc4xx_find_bridges();
#endif
@@ -189,34 +199,6 @@
/* Set the PIT reload value and just let it run. */
mtspr(SPRN_PIT, tb_ticks_per_jiffy);
}
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-
-/* We assume that the UART has already been initialized by the
- firmware or the boot loader */
-static void
-serial_putc(u8 * com_port, unsigned char c)
-{
- while ((readb(com_port + (UART_LSR)) & UART_LSR_THRE) == 0) ;
- writeb(c, com_port);
-}
-
-static void
-ppc4xx_progress(char *s, unsigned short hex)
-{
- char c;
-#ifdef SERIAL_DEBUG_IO_BASE
- u8 *com_port = (u8 *) SERIAL_DEBUG_IO_BASE;
-
- while ((c = *s++) != '\0') {
- serial_putc(com_port, c);
- }
- serial_putc(com_port, '\r');
- serial_putc(com_port, '\n');
-#else
- printk("%s\r\n");
-#endif
-}
-#endif /* CONFIG_SERIAL_TEXT_DEBUG */
/*
* IDE stuff.
@@ -319,13 +301,9 @@
ppc_md.setup_io_mappings = ppc4xx_map_io;
#ifdef CONFIG_SERIAL_TEXT_DEBUG
- ppc_md.progress = ppc4xx_progress;
+ ppc_md.progress = gen550_progress;
#endif
-/*
-** m8xx_setup.c, prep_setup.c use
-** defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
-*/
#if defined(CONFIG_PCI) && defined(CONFIG_IDE)
ppc_ide_md.ide_init_hwif = ppc4xx_ide_init_hwif_ports;
#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */
next prev parent reply other threads:[~2004-10-30 1:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-30 0:51 [PATCH][PPC32][1/2] 40x and Book E debug: core support Matt Porter
2004-10-30 1:08 ` Matt Porter [this message]
2004-11-01 19:20 ` [PATCH][PPC32][2/2] 40x and Book E debug: 4xx platform support Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041029180814.A15758@home.com \
--to=mporter@kernel.crashing.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-embedded@ozlabs.org \
--cc=takeharu1219@ybb.ne.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).