From: Chao@marvell.com (Chao at marvell.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: GIC irq desciptor bug fix
Date: Thu, 2 Dec 2010 14:17:39 +0800 [thread overview]
Message-ID: <1291270659-24903-1-git-send-email-cxie4@marvell.com> (raw)
From: cxie4 <cxie4@marvell.com>
gic_set_cpu will directly use irq_desc[]. If CONFIG_SPARSE_IRQ is enabled, there is no
irq_desc[]. So we need use irq_to_desc(irq) to get the descriptor for irq.
Signed-off-by: cxie4 <cxie4@marvell.com>
---
arch/arm/common/gic.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 7dfa9a8..6599acb 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -160,9 +160,15 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)
unsigned int shift = (irq % 4) * 8;
unsigned int cpu = cpumask_first(mask_val);
u32 val;
+ struct irq_desc *desc;
spin_lock(&irq_controller_lock);
- irq_desc[irq].node = cpu;
+ desc = irq_to_desc(irq);
+ if (desc == NULL) {
+ spin_unlock(&irq_controller_lock);
+ return -EINVAL;
+ }
+ desc->node = cpu;
val = readl(reg) & ~(0xff << shift);
val |= 1 << (cpu + shift);
writel(val, reg);
--
1.6.3.3
next reply other threads:[~2010-12-02 6:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 6:17 Chao at marvell.com [this message]
2010-12-02 11:50 ` [PATCH] ARM: GIC irq desciptor bug fix Kyungmin Park
2010-12-03 20:54 ` Russell King - ARM Linux
2010-12-08 0:43 ` Ben Dooks
-- strict thread matches above, loose matches on Subject: below --
2010-12-03 1:12 Chao Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291270659-24903-1-git-send-email-cxie4@marvell.com \
--to=chao@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).