Commit d8f66c8c authored by Robin Getz's avatar Robin Getz Committed by Bryan Wu
Browse files

[Blackfin] arch: fix bug gdb testing on hardware has regression 

http://blackfin.uclinux.org/gf/project/toolchain/tracker/?action=TrackerItemEdit&tracker_item_id=3651



As Bernd predicted, this was only necessary because of other
problems in the kenel - fixing those, and this is not necessary, so
remove it.

Signed-off-by: default avatarRobin Getz <robin.getz@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent 13fe24f3

arch/blackfin/kernel/traps.c

+30 −7
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/cacheflush.h>

#include <asm/blackfin.h>

#include <asm/irq_handler.h>

#include <linux/irq.h>

#include <asm/trace.h>

#include <asm/fixed_code.h>
@@ -508,13 +509,6 @@ asmlinkage void trap_c(struct pt_regs *fp) 
	info.si_addr = (void *)fp->pc;

	force_sig_info(sig, &info, current);



	/* Ensure that bad return addresses don't end up in an infinite

	 * loop, due to speculative loads/reads. This needs to be done after

	 * the signal has been sent.

	 */

	if (trapnr == VEC_CPLB_I_M && sig != SIGTRAP)

		fp->pc = SAFE_USER_INSTRUCTION;



	trace_buffer_restore(j);

	return;

}
@@ -727,6 +721,9 @@ void dump_bfin_mem(void *retaddr) 
void show_regs(struct pt_regs *fp)

{

	char buf [150];

	struct irqaction *action;

	unsigned int i;

	unsigned long flags;



	printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\n");

	printk(KERN_NOTICE " SEQSTAT: %08lx  IPEND: %04lx  SYSCFG: %04lx\n",
@@ -735,6 +732,32 @@ void show_regs(struct pt_regs *fp) 
		(fp->seqstat & SEQSTAT_HWERRCAUSE) >> 14);

	printk(KERN_NOTICE "  EXCAUSE   : 0x%lx\n",

		fp->seqstat & SEQSTAT_EXCAUSE);

	for (i = 6; i <= 15 ; i++) {

		if (fp->ipend & (1 << i)) {

			decode_address(buf, bfin_read32(EVT0 + 4*i));

			printk(KERN_NOTICE "  physical IVG%i asserted : %s\n", i, buf);

		}

	}



	/* if no interrupts are going off, don't print this out */

	if (fp->ipend & ~0x3F) {

		for (i = 0; i < (NR_IRQS - 1); i++) {

			spin_lock_irqsave(&irq_desc[i].lock, flags);

			action = irq_desc[i].action;

			if (!action)

				goto unlock;



			decode_address(buf, (unsigned int)action->handler);

			printk(KERN_NOTICE "  logical irq %3d mapped  : %s", i, buf);

			for (action = action->next; action; action = action->next) {

				decode_address(buf, (unsigned int)action->handler);

				printk(", %s", buf);

			}

			printk("\n");

unlock:

			spin_unlock_irqrestore(&irq_desc[i].lock, flags);

		}

	}



	decode_address(buf, fp->rete);

	printk(KERN_NOTICE " RETE: %s\n", buf);