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

Commit 169e4b57 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: gic: Add flag to select 8625 QGIC2 back to back read/write workaround""

parents b0d7c3d4 83469fb2

drivers/irqchip/irq-gic.c

+44 −34
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 


#include "irqchip.h"



#include <mach/socinfo.h>



union gic_base {

	void __iomem *common_base;

	void __percpu __iomem **percpu_base;
@@ -60,7 +58,6 @@ struct gic_chip_data { 
	unsigned int irq_offset;

	union gic_base dist_base;

	union gic_base cpu_base;

	bool need_access_lock;

#ifdef CONFIG_CPU_PM

	u32 saved_spi_enable[DIV_ROUND_UP(1020, 32)];

	u32 saved_spi_conf[DIV_ROUND_UP(1020, 16)];
@@ -219,8 +216,14 @@ static int gic_suspend_one(struct gic_chip_data *gic) 
{

	unsigned int i;

	void __iomem *base = gic_data_dist_base(gic);

#ifdef CONFIG_ARCH_MSM8625

	unsigned long flags;

#endif



	for (i = 0; i * 32 < gic->gic_irqs; i++) {

#ifdef CONFIG_ARCH_MSM8625

		raw_spin_lock_irqsave(&irq_controller_lock, flags);

#endif

		gic->enabled_irqs[i]

			= readl_relaxed(base + GIC_DIST_ENABLE_SET + i * 4);

		/* disable all of them */
@@ -228,6 +231,9 @@ static int gic_suspend_one(struct gic_chip_data *gic) 
		/* enable the wakeup set */

		writel_relaxed(gic->wakeup_irqs[i],

			base + GIC_DIST_ENABLE_SET + i * 4);

#ifdef CONFIG_ARCH_MSM8625

		raw_spin_unlock_irqrestore(&irq_controller_lock, flags);

#endif

	}

	mb();

	return 0;
@@ -316,19 +322,18 @@ arch_initcall(gic_init_sys); 


static void gic_eoi_irq(struct irq_data *d)

{

	struct gic_chip_data *gic = irq_data_get_irq_chip_data(d);



	if (gic_arch_extn.irq_eoi) {

		raw_spin_lock(&irq_controller_lock);

		gic_arch_extn.irq_eoi(d);

		raw_spin_unlock(&irq_controller_lock);

	}



	if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

	raw_spin_lock(&irq_controller_lock);

#endif

	writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI);

	if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

	raw_spin_unlock(&irq_controller_lock);

#endif

}



static int gic_set_type(struct irq_data *d, unsigned int type)
@@ -448,11 +453,13 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs 
	void __iomem *cpu_base = gic_data_cpu_base(gic);



	do {

		if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

		raw_spin_lock(&irq_controller_lock);

#endif

		irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK);

		if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

		raw_spin_unlock(&irq_controller_lock);

#endif

		irqnr = irqstat & ~0x1c00;



		if (likely(irqnr > 15 && irqnr < 1021)) {
@@ -461,11 +468,13 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs 
			continue;

		}

		if (irqnr < 16) {

			if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

			raw_spin_lock(&irq_controller_lock);

#endif

			writel_relaxed(irqstat, cpu_base + GIC_CPU_EOI);

			if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

			raw_spin_unlock(&irq_controller_lock);

#endif

#ifdef CONFIG_SMP

			handle_IPI(irqnr, regs);

#endif
@@ -622,8 +631,9 @@ static void __cpuinit gic_cpu_init(struct gic_chip_data *gic) 
	 * Deal with the banked PPI and SGI interrupts - disable all

	 * PPI interrupts, ensure all SGI interrupts are enabled.

	 */

	if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

	raw_spin_lock(&irq_controller_lock);

#endif

	writel_relaxed(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);

	writel_relaxed(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);
@@ -643,8 +653,9 @@ static void __cpuinit gic_cpu_init(struct gic_chip_data *gic) 
		writel_relaxed(0xF, base + GIC_CPU_CTRL);

	else

		writel_relaxed(1, base + GIC_CPU_CTRL);

	if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

	raw_spin_unlock(&irq_controller_lock);

#endif

	mb();

}
@@ -872,8 +883,9 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) 
	int cpu;

	unsigned long sgir;

	unsigned long map = 0;

	unsigned long flags = 0;

	struct gic_chip_data *gic = &gic_data[0];

#ifdef CONFIG_ARCH_MSM8625

	unsigned long flags;

#endif



	/* Convert our logical CPU mask into a physical one. */

	for_each_cpu(cpu, mask)
@@ -882,19 +894,21 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) 
	sgir = (map << 16) | irq;

	if (is_cpu_secure())

		sgir |= (1 << 15);



	/*

	 * Ensure that stores to Normal memory are visible to the

	 * other CPUs before issuing the IPI.

	 */

	dsb();



	if (gic->need_access_lock)

#ifdef CONFIG_ARCH_MSM8625

	raw_spin_lock_irqsave(&irq_controller_lock, flags);

#endif

	/* this always happens on GIC0 */

	writel_relaxed(sgir, gic_data_dist_base(gic) + GIC_DIST_SOFTINT);

	if (gic->need_access_lock)

	writel_relaxed(sgir,

			gic_data_dist_base(&gic_data[0]) + GIC_DIST_SOFTINT);

#ifdef CONFIG_ARCH_MSM8625

	raw_spin_unlock_irqrestore(&irq_controller_lock, flags);

#endif

	mb();

}

#endif
@@ -1001,10 +1015,6 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start, 
	BUG_ON(gic_nr >= MAX_GIC_NR);



	gic = &gic_data[gic_nr];

	if (cpu_is_msm8625() &&

			(SOCINFO_VERSION_MAJOR(socinfo_get_version()) <= 1))

		gic->need_access_lock = true;



#ifdef CONFIG_GIC_NON_BANKED

	if (percpu_offset) { /* Frankein-GIC without banked registers... */

		unsigned int cpu;