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

Commit 6b108049 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: ints-priority: unify duplicate vec to irq lookup logic 



Seems the ipipe code just copied & pasted the existing irq lookup logic,
so pull the logic out of do_irq() and into a local helper, and convert
the two users over to that.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent e9e334c3

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

+44 −68
Original line number Diff line number Diff line
@@ -1304,16 +1304,18 @@ int __init init_arch_irq(void) 
#ifdef CONFIG_DO_IRQ_L1

__attribute__((l1_text))

#endif

void do_irq(int vec, struct pt_regs *fp)

static int vec_to_irq(int vec)

{

	if (vec == EVT_IVTMR_P) {

		vec = IRQ_CORETMR;

	} else {

	struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst;

	struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop;

#if defined(SIC_ISR0)

	unsigned long sic_status[3];



	if (likely(vec == EVT_IVTMR_P))

		return IRQ_CORETMR;



#ifdef SIC_ISR

	sic_status[0] = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();

#else

	if (smp_processor_id()) {

# ifdef SICB_ISR0

		/* This will be optimized out in UP mode. */
@@ -1324,30 +1326,32 @@ void do_irq(int vec, struct pt_regs *fp) 
		sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();

		sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();

	}

#endif

#ifdef SIC_ISR2

	sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();

#endif



	for (;; ivg++) {

		if (ivg >= ivg_stop)

				return;

			return -1;

#ifdef SIC_ISR

		if (sic_status[0] & ivg->isrflag)

#else

		if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)

				break;

#endif

			return ivg->irqno;

	}

#else

		unsigned long sic_status;



		sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();



		for (;; ivg++) {

			if (ivg >= ivg_stop)

				return;

			if (sic_status & ivg->isrflag)

				break;

}



#ifdef CONFIG_DO_IRQ_L1

__attribute__((l1_text))

#endif

		vec = ivg->irqno;

	}

	asm_do_IRQ(vec, fp);

void do_irq(int vec, struct pt_regs *fp)

{

	int irq = vec_to_irq(vec);

	if (irq == -1)

		return;

	asm_do_IRQ(irq, fp);

}



#ifdef CONFIG_IPIPE
@@ -1385,37 +1389,9 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) 
	struct ivgx *ivg = ivg7_13[vec-IVG7].ifirst;

	int irq, s = 0;



	if (likely(vec == EVT_IVTMR_P))

		irq = IRQ_CORETMR;

	else {

#if defined(SIC_ISR0)

		unsigned long sic_status[3];



		sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();

		sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();

# ifdef SIC_ISR2

		sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();

# endif

		for (;; ivg++) {

			if (ivg >= ivg_stop)

				return 0;

			if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)

				break;

		}

#else

		unsigned long sic_status;



		sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();



		for (;; ivg++) {

			if (ivg >= ivg_stop)

	irq = vec_to_irq(vec);

	if (irq == -1)

		return 0;

			if (sic_status & ivg->isrflag)

				break;

		}

#endif

		irq = ivg->irqno;

	}



	if (irq == IRQ_SYSTMR) {

#if !defined(CONFIG_GENERIC_CLOCKEVENTS) || defined(CONFIG_TICKSOURCE_GPTMR0)