* [PATCH 1/3] powerpc/mpic: Fix confusion between hw_irq and virq
@ 2012-04-20 3:29 Benjamin Herrenschmidt
2012-04-23 17:32 ` Grant Likely
0 siblings, 1 reply; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2012-04-20 3:29 UTC (permalink / raw)
To: linuxppc-dev
mpic_is_ipi() takes a virq and immediately converts it to a hw_irq.
However, one of the two call sites calls it with a ... hw_irq. The
other call site also happens to have the hw_irq at hand, so let's
change it to just take that as an argument. Also change mpic_is_tm()
for consistency.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/sysdev/mpic.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 9ac71eb..665b0f8 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -604,18 +604,14 @@ static struct mpic *mpic_find(unsigned int irq)
}
/* Determine if the linux irq is an IPI */
-static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int irq)
+static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int src)
{
- unsigned int src = virq_to_hw(irq);
-
return (src >= mpic->ipi_vecs[0] && src <= mpic->ipi_vecs[3]);
}
/* Determine if the linux irq is a timer */
-static unsigned int mpic_is_tm(struct mpic *mpic, unsigned int irq)
+static unsigned int mpic_is_tm(struct mpic *mpic, unsigned int src)
{
- unsigned int src = virq_to_hw(irq);
-
return (src >= mpic->timer_vecs[0] && src <= mpic->timer_vecs[7]);
}
@@ -1555,12 +1551,12 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
return;
raw_spin_lock_irqsave(&mpic_lock, flags);
- if (mpic_is_ipi(mpic, irq)) {
+ if (mpic_is_ipi(mpic, src)) {
reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) &
~MPIC_VECPRI_PRIORITY_MASK;
mpic_ipi_write(src - mpic->ipi_vecs[0],
reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
- } else if (mpic_is_tm(mpic, irq)) {
+ } else if (mpic_is_tm(mpic, src)) {
reg = mpic_tm_read(src - mpic->timer_vecs[0]) &
~MPIC_VECPRI_PRIORITY_MASK;
mpic_tm_write(src - mpic->timer_vecs[0],
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] powerpc/mpic: Fix confusion between hw_irq and virq
2012-04-20 3:29 [PATCH 1/3] powerpc/mpic: Fix confusion between hw_irq and virq Benjamin Herrenschmidt
@ 2012-04-23 17:32 ` Grant Likely
2012-04-23 20:22 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 4+ messages in thread
From: Grant Likely @ 2012-04-23 17:32 UTC (permalink / raw)
To: Benjamin Herrenschmidt, linuxppc-dev
On Fri, 20 Apr 2012 13:29:34 +1000, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> mpic_is_ipi() takes a virq and immediately converts it to a hw_irq.
>
> However, one of the two call sites calls it with a ... hw_irq. The
> other call site also happens to have the hw_irq at hand, so let's
> change it to just take that as an argument. Also change mpic_is_tm()
> for consistency.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Looks good to me. Are you pushing these up to Linus for v3.4?
g.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] powerpc/mpic: Fix confusion between hw_irq and virq
2012-04-23 17:32 ` Grant Likely
@ 2012-04-23 20:22 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2012-04-23 20:22 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev
On Mon, 2012-04-23 at 11:32 -0600, Grant Likely wrote:
> On Fri, 20 Apr 2012 13:29:34 +1000, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> > mpic_is_ipi() takes a virq and immediately converts it to a hw_irq.
> >
> > However, one of the two call sites calls it with a ... hw_irq. The
> > other call site also happens to have the hw_irq at hand, so let's
> > change it to just take that as an argument. Also change mpic_is_tm()
> > for consistency.
> >
> > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>
> Looks good to me. Are you pushing these up to Linus for v3.4?
Already did :-)
Cheers,
Ben.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] powerpc/mpic: Fix confusion between hw_irq and virq
@ 2012-04-20 3:28 Benjamin Herrenschmidt
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2012-04-20 3:28 UTC (permalink / raw)
To: linuxppc-dev
mpic_is_ipi() takes a virq and immediately converts it to a hw_irq.
However, one of the two call sites calls it with a ... hw_irq. The
other call site also happens to have the hw_irq at hand, so let's
change it to just take that as an argument. Also change mpic_is_tm()
for consistency.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/sysdev/mpic.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 9ac71eb..665b0f8 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -604,18 +604,14 @@ static struct mpic *mpic_find(unsigned int irq)
}
/* Determine if the linux irq is an IPI */
-static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int irq)
+static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int src)
{
- unsigned int src = virq_to_hw(irq);
-
return (src >= mpic->ipi_vecs[0] && src <= mpic->ipi_vecs[3]);
}
/* Determine if the linux irq is a timer */
-static unsigned int mpic_is_tm(struct mpic *mpic, unsigned int irq)
+static unsigned int mpic_is_tm(struct mpic *mpic, unsigned int src)
{
- unsigned int src = virq_to_hw(irq);
-
return (src >= mpic->timer_vecs[0] && src <= mpic->timer_vecs[7]);
}
@@ -1555,12 +1551,12 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
return;
raw_spin_lock_irqsave(&mpic_lock, flags);
- if (mpic_is_ipi(mpic, irq)) {
+ if (mpic_is_ipi(mpic, src)) {
reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) &
~MPIC_VECPRI_PRIORITY_MASK;
mpic_ipi_write(src - mpic->ipi_vecs[0],
reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
- } else if (mpic_is_tm(mpic, irq)) {
+ } else if (mpic_is_tm(mpic, src)) {
reg = mpic_tm_read(src - mpic->timer_vecs[0]) &
~MPIC_VECPRI_PRIORITY_MASK;
mpic_tm_write(src - mpic->timer_vecs[0],
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-23 20:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-20 3:29 [PATCH 1/3] powerpc/mpic: Fix confusion between hw_irq and virq Benjamin Herrenschmidt
2012-04-23 17:32 ` Grant Likely
2012-04-23 20:22 ` Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
2012-04-20 3:28 Benjamin Herrenschmidt
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).