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

Commit 51387009 authored by Philippe Gerum's avatar Philippe Gerum Committed by Mike Frysinger
Browse files

Blackfin: merge Philippe's recent ipipe patch 



ipipe-2.6.28.9-blackfin-git95aafe6.patch

Singed-off-by: default avatarPhilippe Gerum <rpm@xenomai.org>
Signed-off-by: default avatarYi Li <yi.li@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent f75196c4

arch/blackfin/include/asm/ipipe.h

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 
#include <asm/atomic.h>

#include <asm/traps.h>



#define IPIPE_ARCH_STRING     "1.9-00"

#define IPIPE_ARCH_STRING     "1.9-01"

#define IPIPE_MAJOR_NUMBER    1

#define IPIPE_MINOR_NUMBER    9

#define IPIPE_PATCH_NUMBER    0

#define IPIPE_PATCH_NUMBER    1



#ifdef CONFIG_SMP

#error "I-pipe/blackfin: SMP not implemented"

arch/blackfin/kernel/ipipe.c

+6 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ int __ipipe_check_root(void) 
void __ipipe_enable_irqdesc(struct ipipe_domain *ipd, unsigned irq)

{

	struct irq_desc *desc = irq_to_desc(irq);

	int prio = desc->ic_prio;

	int prio = __ipipe_get_irq_priority(irq);



	desc->depth = 0;

	if (ipd != &ipipe_root &&
@@ -178,8 +178,7 @@ EXPORT_SYMBOL(__ipipe_enable_irqdesc); 


void __ipipe_disable_irqdesc(struct ipipe_domain *ipd, unsigned irq)

{

	struct irq_desc *desc = irq_to_desc(irq);

	int prio = desc->ic_prio;

	int prio = __ipipe_get_irq_priority(irq);



	if (ipd != &ipipe_root &&

	    atomic_dec_and_test(&__ipipe_irq_lvdepth[prio]))
@@ -310,12 +309,16 @@ int ipipe_trigger_irq(unsigned irq) 


asmlinkage void __ipipe_sync_root(void)

{

	void (*irq_tail_hook)(void) = (void (*)(void))__ipipe_irq_tail_hook;

	unsigned long flags;



	BUG_ON(irqs_disabled());



	local_irq_save_hw(flags);



	if (irq_tail_hook)

		irq_tail_hook();



	clear_thread_flag(TIF_IRQ_SYNC);



	if (ipipe_root_cpudom_var(irqpend_himask) != 0)

arch/blackfin/mach-common/ints-priority.c

+0 −7
Original line number Diff line number Diff line
@@ -1139,13 +1139,6 @@ int __init init_arch_irq(void) 
	bfin_write_SIC_IWR(IWR_DISABLE_ALL);

#endif



#ifdef CONFIG_IPIPE

	for (irq = 0; irq < NR_IRQS; irq++) {

		struct irq_desc *desc = irq_to_desc(irq);

		desc->ic_prio = __ipipe_get_irq_priority(irq);

	}

#endif /* CONFIG_IPIPE */



	return 0;

}