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

Commit a481b5d0 authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller
Browse files

sparc32, leon: code cleanup of timer/IRQ controller initialization 



Cleaned up leon_init_timers() by removing unnecessary double checking
and one indentation level. Changed LEON_IMASK to LEON_IMASK(cpu).

Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea044ec3

arch/sparc/kernel/leon_kernel.c

+72 −84
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ unsigned long leon3_gptimer_irq; /* interrupt controller irq number */ 
unsigned long leon3_gptimer_idx; /* Timer Index (0..6) within Timer Core */

int leon3_ticker_irq; /* Timer ticker IRQ */

unsigned int sparc_leon_eirq;

#define LEON_IMASK (&leon3_irqctrl_regs->mask[0])

#define LEON_IMASK(cpu) (&leon3_irqctrl_regs->mask[cpu])

#define LEON_IACK (&leon3_irqctrl_regs->iclear)

#define LEON_DO_ACK_HW 1
@@ -79,8 +79,8 @@ void leon_eirq_setup(unsigned int eirq) 
	 */

	irq_link(veirq);

	mask = 1 << eirq;

	oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK);

	LEON3_BYPASS_STORE_PA(LEON_IMASK, (oldmask | mask));

	oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(0));

	LEON3_BYPASS_STORE_PA(LEON_IMASK(0), (oldmask | mask));

	sparc_leon_eirq = eirq;

}
@@ -101,23 +101,23 @@ static inline unsigned long get_irqmask(unsigned int irq) 


static void leon_unmask_irq(struct irq_data *data)

{

	unsigned long mask, flags;

	unsigned long mask, oldmask, flags;



	mask = (unsigned long)data->chip_data;

	spin_lock_irqsave(&leon_irq_lock, flags);

	LEON3_BYPASS_STORE_PA(LEON_IMASK,

			      (LEON3_BYPASS_LOAD_PA(LEON_IMASK) | (mask)));

	oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(0));

	LEON3_BYPASS_STORE_PA(LEON_IMASK(0), (oldmask | mask));

	spin_unlock_irqrestore(&leon_irq_lock, flags);

}



static void leon_mask_irq(struct irq_data *data)

{

	unsigned long mask, flags;

	unsigned long mask, oldmask, flags;



	mask = (unsigned long)data->chip_data;

	spin_lock_irqsave(&leon_irq_lock, flags);

	LEON3_BYPASS_STORE_PA(LEON_IMASK,

			      (LEON3_BYPASS_LOAD_PA(LEON_IMASK) & ~(mask)));

	oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(0));

	LEON3_BYPASS_STORE_PA(LEON_IMASK(0), (oldmask & ~mask));

	spin_unlock_irqrestore(&leon_irq_lock, flags);

}
@@ -261,11 +261,11 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
			leon3_gptimer_irq = *(unsigned int *)pp->value;

	} while (0);



	if (leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq) {

		LEON3_BYPASS_STORE_PA(

			&leon3_gptimer_regs->e[leon3_gptimer_idx].val, 0);

		LEON3_BYPASS_STORE_PA(

			&leon3_gptimer_regs->e[leon3_gptimer_idx].rld,

	if (!(leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq))

		goto bad;



	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].val, 0);

	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].rld,

				(((1000000 / HZ) - 1)));

	LEON3_BYPASS_STORE_PA(

			&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl, 0);
@@ -275,17 +275,16 @@ void __init leon_init_timers(irq_handler_t counter_fn) 


	if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &

	      (1<<LEON3_GPTIMER_SEPIRQ))) {

			prom_printf("irq timer not configured with separate irqs\n");

		printk(KERN_ERR "timer not configured with separate irqs\n");

		BUG();

	}



		LEON3_BYPASS_STORE_PA(

			&leon3_gptimer_regs->e[leon3_gptimer_idx+1].val, 0);

		LEON3_BYPASS_STORE_PA(

			&leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld,

	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].val,

				0);

	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld,

				(((1000000/HZ) - 1)));

		LEON3_BYPASS_STORE_PA(

			&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl, 0);

	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl,

				0);

#endif



	/*
@@ -307,30 +306,24 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
		>> 16) & 0xf;

	if (eirq != 0)

		leon_eirq_setup(eirq);

	} else {

		goto bad;

	}



	irq = _leon_build_device_irq(NULL, leon3_gptimer_irq+leon3_gptimer_idx);

	err = request_irq(irq, counter_fn, IRQF_TIMER, "timer", NULL);



	if (err) {

		printk(KERN_ERR "leon_time_init: unable to attach IRQ%d\n",

		       irq);

		printk(KERN_ERR "unable to attach timer IRQ%d\n", irq);

		prom_halt();

	}



	if (leon3_gptimer_regs) {

	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl,

			      LEON3_GPTIMER_EN |

			      LEON3_GPTIMER_RL |

				      LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN);

			      LEON3_GPTIMER_LD |

			      LEON3_GPTIMER_IRQEN);



#ifdef CONFIG_SMP

	/* Install per-cpu IRQ handler for broadcasted ticker */

		irq = leon_build_device_irq(leon3_ticker_irq,

						handle_percpu_irq, "per-cpu",

						0);

	irq = leon_build_device_irq(leon3_ticker_irq, handle_percpu_irq,

				    "per-cpu", 0);

	err = request_irq(irq, leon_percpu_timer_interrupt,

			  IRQF_PERCPU | IRQF_TIMER, "ticker",

			  NULL);
@@ -345,8 +338,6 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
			      LEON3_GPTIMER_LD |

			      LEON3_GPTIMER_IRQEN);

#endif



	}

	return;

bad:

	printk(KERN_ERR "No Timer/irqctrl found\n");
@@ -363,9 +354,6 @@ void leon_load_profile_irq(int cpu, unsigned int limit) 
	BUG();

}









void __init leon_trans_init(struct device_node *dp)

{

	if (strcmp(dp->type, "cpu") == 0 && strcmp(dp->name, "<NULL>") == 0) {
@@ -420,8 +408,8 @@ void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu) 
	unsigned long mask, flags, *addr;

	mask = get_irqmask(irq_nr);

	spin_lock_irqsave(&leon_irq_lock, flags);

	addr = (unsigned long *)&(leon3_irqctrl_regs->mask[cpu]);

	LEON3_BYPASS_STORE_PA(addr, (LEON3_BYPASS_LOAD_PA(addr) | (mask)));

	addr = (unsigned long *)LEON_IMASK(cpu);

	LEON3_BYPASS_STORE_PA(addr, (LEON3_BYPASS_LOAD_PA(addr) | mask));

	spin_unlock_irqrestore(&leon_irq_lock, flags);

}