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

Commit 0bf3d933 authored by Sonic Zhang's avatar Sonic Zhang Committed by Bryan Wu
Browse files

Blackfin arch: fix bug - kgdb fails to continue after setting breakpoint on... 


Blackfin arch: fix bug - kgdb fails to continue after setting breakpoint on bf561-ezkit kernel with smp patch

Free spinlock before call IPI handlers.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>


Header from folded patch 'blackfin_arch__fix_bug_-_kgdb_fails_to_continue_after_setting_breakpoint_on_bf561-ezkit_kernel_with_smp_patch-1':

Blackfin arch: fix bug - kgdb fails to continue after setting breakpoint on bf561-ezkit kernel with smp patch

Don't test l1 code in SMP kernel.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 8bf6774d

arch/blackfin/kernel/kgdb_test.c

+7 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
static char cmdline[256];

static unsigned long len;



#ifndef CONFIG_SMP

static int num1 __attribute__((l1_data));



void kgdb_l1_test(void) __attribute__((l1_text));
@@ -32,6 +33,8 @@ void kgdb_l1_test(void) 
	printk(KERN_ALERT "L1(after change) : data variable addr = 0x%p, data value is %d\n", &num1, num1);

	return ;

}

#endif



#if L2_LENGTH



static int num2 __attribute__((l2));
@@ -59,7 +62,9 @@ int kgdb_test(char *name, int len, int count, int z) 
static int test_proc_output(char *buf)

{

	kgdb_test("hello world!", 12, 0x55, 0x10);

#ifndef CONFIG_SMP

	kgdb_l1_test();

#endif

#if L2_LENGTH

	kgdb_l2_test();

#endif

arch/blackfin/mach-common/smp.c

+5 −1
Original line number Diff line number Diff line
@@ -158,10 +158,14 @@ static irqreturn_t ipi_handler(int irq, void *dev_instance) 
			kfree(msg);

			break;

		case BFIN_IPI_CALL_FUNC:

			spin_unlock(&msg_queue->lock);

			ipi_call_function(cpu, msg);

			spin_lock(&msg_queue->lock);

			break;

		case BFIN_IPI_CPU_STOP:

			spin_unlock(&msg_queue->lock);

			ipi_cpu_stop(cpu);

			spin_lock(&msg_queue->lock);

			kfree(msg);

			break;

		default:
@@ -457,7 +461,7 @@ void smp_icache_flush_range_others(unsigned long start, unsigned long end) 
	smp_flush_data.start = start;

	smp_flush_data.end = end;



	if (smp_call_function(&ipi_flush_icache, &smp_flush_data, 1))

	if (smp_call_function(&ipi_flush_icache, &smp_flush_data, 0))

		printk(KERN_WARNING "SMP: failed to run I-cache flush request on other CPUs\n");

}

EXPORT_SYMBOL_GPL(smp_icache_flush_range_others);