TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: gic: Remove unnecessary irq spinlocks from gic_resume path

Browse Source 
Remove the unnecessary irq spinlocks from gic resume path since it
always gets called with interrupt disabled. It also fixes the bug
introduced by commit 6278db09f where it called spin_lock again on the same
lock.

CRs-Fixed: 370894
Change-Id: I94f81cc0d93f362ac233c9af637cbe75036903f9
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
This commit is contained in:
Trilok Soni
2012-05-26 11:58:59 +05:30
committed by Stephen Boyd
parent fc7b41b33d
commit e3c9bccad1
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm/common/gic.c
View File

@@ -248,28 +248,17 @@ static void gic_show_resume_irq(struct gic_chip_data *gic)
u32 enabled;
unsigned long pending[32];
void __iomem *base = gic_data_dist_base(gic);
#ifdef CONFIG_ARCH_MSM8625
unsigned long flags;
#endif
if (!msm_show_resume_irq_mask)
return;
#ifdef CONFIG_ARCH_MSM8625
raw_spin_lock_irqsave(&irq_controller_lock, flags);
#else
raw_spin_lock(&irq_controller_lock);
#endif
for (i = 0; i * 32 < gic->max_irq; i++) {
enabled = readl_relaxed(base + GIC_DIST_ENABLE_CLEAR + i * 4);
pending[i] = readl_relaxed(base + GIC_DIST_PENDING_SET + i * 4);
pending[i] &= enabled;
}
#ifdef CONFIG_ARCH_MSM8625
raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
#else
raw_spin_lock(&irq_controller_lock);
#endif
raw_spin_unlock(&irq_controller_lock);
for (i = find_first_bit(pending, gic->max_irq);
i < gic->max_irq;
@@ -283,22 +272,14 @@ static void gic_resume_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
gic_show_resume_irq(gic);
for (i = 0; i * 32 < gic->max_irq; i++) {
#ifdef CONFIG_ARCH_MSM8625
raw_spin_lock_irqsave(&irq_controller_lock, flags);
#endif
/* disable all of them */
writel_relaxed(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4);
/* enable the enabled set */
writel_relaxed(gic->enabled_irqs[i],
base + GIC_DIST_ENABLE_SET + i * 4);
#ifdef CONFIG_ARCH_MSM8625
raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
#endif
}
mb();
}