| Message ID | 1406748194-21094-1-git-send-email-broonie@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Mark, On Wed, Jul 30, 2014 at 08:23:14PM +0100, Mark Brown wrote: > From: Mark Brown <broonie@linaro.org> > > This is only really needed for gic_write_sgi1r in the !SMP case since it > is only referenced in the SMP initialisation code but it seems better to > have these functions all next to each other and declared consistently. > > Signed-off-by: Mark Brown <broonie@linaro.org> > --- > drivers/irqchip/irq-gic-v3.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied to irqchip/urgent thx, Jason.
Hello, typo in the Subject line. s/maybey/maybe/ Best regards Uwe
Uwe, On Mon, Aug 18, 2014 at 09:11:04AM +0200, Uwe Kleine-König wrote: > > typo in the Subject line. s/maybey/maybe/ Yep, I forgot to mention I fixed that when I applied it. thx, Jason.
On Sun, Aug 17, 2014 at 01:04:53PM -0400, Jason Cooper wrote: > On Wed, Jul 30, 2014 at 08:23:14PM +0100, Mark Brown wrote: > > From: Mark Brown <broonie@linaro.org> > > This is only really needed for gic_write_sgi1r in the !SMP case since it > > is only referenced in the SMP initialisation code but it seems better to > > have these functions all next to each other and declared consistently. > > Signed-off-by: Mark Brown <broonie@linaro.org> > > --- > > drivers/irqchip/irq-gic-v3.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > Applied to irqchip/urgent This appears to have disappeared from -next and the warning is back.
Mark, Stephen, On Sat, Sep 06, 2014 at 01:54:12PM +0100, Mark Brown wrote: > On Sun, Aug 17, 2014 at 01:04:53PM -0400, Jason Cooper wrote: > > On Wed, Jul 30, 2014 at 08:23:14PM +0100, Mark Brown wrote: > > > From: Mark Brown <broonie@linaro.org> > > > > This is only really needed for gic_write_sgi1r in the !SMP case since it > > > is only referenced in the SMP initialisation code but it seems better to > > > have these functions all next to each other and declared consistently. > > > > Signed-off-by: Mark Brown <broonie@linaro.org> > > > --- > > > drivers/irqchip/irq-gic-v3.c | 10 +++++----- > > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > Applied to irqchip/urgent > > This appears to have disappeared from -next and the warning is back. Hmm, interesting. Here's what I have in irqchip/for-next,irqchip/urgent: c44e9d77fd1c irqchip: gic-v3: Tag all low level accessors __maybe_unused ddc86821ee2c irqchip: gic-v3: Only define gic_peek_irq() when building SMP and: $ git tag --contains c44e9d77fd1c | grep ^next | sort -V next-20140820 next-20140822 next-20140823 next-20140825 next-20140826 next-20140827 next-20140828 next-20140829 To see whether I forgot to add /urgent to /for-next or if irqchip/for-next was dropped, I did the same search against the first commit I added to irqchip/core: $ git tag --contains 1c36d42c4ffe | grep ^next | sort -V next-20140822 next-20140823 next-20140825 next-20140826 next-20140827 next-20140828 next-20140829 Also dropped on the 30th. So, unless I really screwed up, -next is no longer pulling irqchip/for-next. Stephen, could you please look and see if this is the case? thx, Jason.
Hi Jason, On Sun, 7 Sep 2014 10:02:55 -0400 Jason Cooper <jason@lakedaemon.net> wrote: > > On Sat, Sep 06, 2014 at 01:54:12PM +0100, Mark Brown wrote: > > On Sun, Aug 17, 2014 at 01:04:53PM -0400, Jason Cooper wrote: > > > On Wed, Jul 30, 2014 at 08:23:14PM +0100, Mark Brown wrote: > > > > From: Mark Brown <broonie@linaro.org> > > > > > > This is only really needed for gic_write_sgi1r in the !SMP case since it > > > > is only referenced in the SMP initialisation code but it seems better to > > > > have these functions all next to each other and declared consistently. > > > > > > Signed-off-by: Mark Brown <broonie@linaro.org> > > > > --- > > > > drivers/irqchip/irq-gic-v3.c | 10 +++++----- > > > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > > Applied to irqchip/urgent > > > > This appears to have disappeared from -next and the warning is back. > > Hmm, interesting. Here's what I have in irqchip/for-next,irqchip/urgent: > > c44e9d77fd1c irqchip: gic-v3: Tag all low level accessors __maybe_unused > ddc86821ee2c irqchip: gic-v3: Only define gic_peek_irq() when building SMP > > and: > > $ git tag --contains c44e9d77fd1c | grep ^next | sort -V > next-20140820 > next-20140822 > next-20140823 > next-20140825 > next-20140826 > next-20140827 > next-20140828 > next-20140829 > > To see whether I forgot to add /urgent to /for-next or if > irqchip/for-next was dropped, I did the same search against the first > commit I added to irqchip/core: > > $ git tag --contains 1c36d42c4ffe | grep ^next | sort -V > next-20140822 > next-20140823 > next-20140825 > next-20140826 > next-20140827 > next-20140828 > next-20140829 > > Also dropped on the 30th. So, unless I really screwed up, -next is no > longer pulling irqchip/for-next. > > Stephen, could you please look and see if this is the case? I am fetching it ok. Unfortunately, in the hand over to Mark last week he ended up with an old version of my control file and so that tree was net being included. Sorry about that, it should be fixed in next-20140908.
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 41b98ba7ffd1..f1ba38f11f7a 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -104,7 +104,7 @@ static void gic_redist_wait_for_rwp(void) } /* Low level accessors */ -static u64 gic_read_iar(void) +static u64 __maybe_unused gic_read_iar(void) { u64 irqstat; @@ -112,24 +112,24 @@ static u64 gic_read_iar(void) return irqstat; } -static void gic_write_pmr(u64 val) +static void __maybe_unused gic_write_pmr(u64 val) { asm volatile("msr_s " __stringify(ICC_PMR_EL1) ", %0" : : "r" (val)); } -static void gic_write_ctlr(u64 val) +static void __maybe_unused gic_write_ctlr(u64 val) { asm volatile("msr_s " __stringify(ICC_CTLR_EL1) ", %0" : : "r" (val)); isb(); } -static void gic_write_grpen1(u64 val) +static void __maybe_unused gic_write_grpen1(u64 val) { asm volatile("msr_s " __stringify(ICC_GRPEN1_EL1) ", %0" : : "r" (val)); isb(); } -static void gic_write_sgi1r(u64 val) +static void __maybe_unused gic_write_sgi1r(u64 val) { asm volatile("msr_s " __stringify(ICC_SGI1R_EL1) ", %0" : : "r" (val)); }