From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] irqchip: atmel-aic-common: prevent clobbering of priority when changing IRQ type
Date: Wed, 7 Jan 2015 10:04:11 +0100 [thread overview]
Message-ID: <54ACF68B.2040000@atmel.com> (raw)
In-Reply-To: <20150107030922.GF24989@titan.lakedaemon.net>
Le 07/01/2015 04:09, Jason Cooper a ?crit :
> atmel maintainers,
>
> On Tue, Jan 06, 2015 at 06:47:23PM -0800, gavinli at thegavinli.com wrote:
>> From: Gavin Li <git@thegavinli•com>
>>
>> This patch makes the bitmask for AIC_SRCTYPE consistent
>> with that of its valid values, and prevents the priority
>> field at bits 2:0 from being clobbered by an incorrect
>> AND with the AIC_SRCTYPE mask.
>>
>> Signed-off-by: Gavin Li <gavinli@thegavinli•com>
>> ---
>> drivers/irqchip/irq-atmel-aic-common.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Please give an Acked-by if this looks good to you. I'd like to get it
> pushed fairly soon.
Hi Jason,
After a private message with Boris, here is our:
Acked-by: Boris Brezillon <boris.brezillon@free-electrons•com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
It is indeed a pretty important fix.
(I added the linux-arm-kernel mailing-list for the record).
Moreover, can you please add a stable tag like:
Cc: <stable@vger•kernel.org> # 3.17+
Thanks a lot Gavin Li for having spotted this bug!
Bye,
>> diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
>> index cc4f9d8..fa22e5b 100644
>> --- a/drivers/irqchip/irq-atmel-aic-common.c
>> +++ b/drivers/irqchip/irq-atmel-aic-common.c
>> @@ -28,7 +28,7 @@
>> #define AT91_AIC_IRQ_MIN_PRIORITY 0
>> #define AT91_AIC_IRQ_MAX_PRIORITY 7
>>
>> -#define AT91_AIC_SRCTYPE GENMASK(7, 6)
>> +#define AT91_AIC_SRCTYPE GENMASK(6, 5)
>> #define AT91_AIC_SRCTYPE_LOW (0 << 5)
>> #define AT91_AIC_SRCTYPE_FALLING (1 << 5)
>> #define AT91_AIC_SRCTYPE_HIGH (2 << 5)
>> @@ -74,7 +74,7 @@ int aic_common_set_type(struct irq_data *d, unsigned type, unsigned *val)
>> return -EINVAL;
>> }
>>
>> - *val &= AT91_AIC_SRCTYPE;
>> + *val &= ~AT91_AIC_SRCTYPE;
>> *val |= aic_type;
>>
>> return 0;
>> --
>> 2.2.1
>>
>
--
Nicolas Ferre
next parent reply other threads:[~2015-01-07 9:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1420598843-8409-1-git-send-email-gavinli@thegavinli.com>
[not found] ` <20150107030922.GF24989@titan.lakedaemon.net>
2015-01-07 9:04 ` Nicolas Ferre [this message]
2015-01-07 12:38 ` [PATCH] irqchip: atmel-aic-common: prevent clobbering of priority when changing IRQ type Jason Cooper
2015-01-07 12:51 ` Jason Cooper
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=54ACF68B.2040000@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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