linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drivers: CCI: Correct use of ! and &
@ 2014-07-07 14:05 Himangi Saraogi
  2014-07-23 15:01 ` Punit Agrawal
  0 siblings, 1 reply; 6+ messages in thread
From: Himangi Saraogi @ 2014-07-07 14:05 UTC (permalink / raw)
  To: linux-kernel; +Cc: julia.lawall

In commit ae91d60ba88ef0bdb1b5e9b2363bd52fc45d2af7, a bug was fixed that
involved converting !x & y to !(x & y).  The code below shows the same
pattern, and thus should perhaps be fixed in the same way.

The Coccinelle semantic patch that makes this change is as follows:

// <smpl>
@@ expression E1,E2; @@
(
  !E1 & !E2
|
- !E1 & E2
+ !(E1 & E2)
)
// </smpl>

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
This is not tested and clearly changes the semantics, so it is only
something to consider.
 drivers/bus/arm-cci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 5a86da9..7af78df 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
 		hw_counter = &event->hw;
 
 		/* Did this counter overflow? */
-		if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
+		if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
+		      CCI_PMU_OVRFLW_FLAG))
 			continue;
 
 		pmu_write_register(CCI_PMU_OVRFLW_FLAG, idx, CCI_PMU_OVRFLW);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] drivers: CCI: Correct use of ! and &
  2014-07-07 14:05 [PATCH] drivers: CCI: Correct use of ! and & Himangi Saraogi
@ 2014-07-23 15:01 ` Punit Agrawal
  2014-07-23 15:05   ` Will Deacon
  0 siblings, 1 reply; 6+ messages in thread
From: Punit Agrawal @ 2014-07-23 15:01 UTC (permalink / raw)
  To: Himangi Saraogi; +Cc: linux-kernel, julia.lawall, linux-arm-kernel, will.deacon

Adding alkml and Will

Hi Himangi,

In future it would help if you send the patch to the the maintainers by
running the get_maintainers.pl script on the patch.

Himangi Saraogi <himangi774@gmail.com> writes:

> In commit ae91d60ba88ef0bdb1b5e9b2363bd52fc45d2af7, a bug was fixed that
> involved converting !x & y to !(x & y).  The code below shows the same
> pattern, and thus should perhaps be fixed in the same way.
>
> The Coccinelle semantic patch that makes this change is as follows:
>
> // <smpl>
> @@ expression E1,E2; @@
> (
>   !E1 & !E2
> |
> - !E1 & E2
> + !(E1 & E2)
> )
> // </smpl>
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
> This is not tested and clearly changes the semantics, so it is only
> something to consider.
>  drivers/bus/arm-cci.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
> index 5a86da9..7af78df 100644
> --- a/drivers/bus/arm-cci.c
> +++ b/drivers/bus/arm-cci.c
> @@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
>  		hw_counter = &event->hw;
>  
>  		/* Did this counter overflow? */
> -		if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
> +		if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
> +		      CCI_PMU_OVRFLW_FLAG))
>  			continue;


Going back to the manual, this fix looks correct.

Acked-by: Punit Agrawal <punit.agrawal@arm.com>

Will, would this go via your tree?

>  
>  		pmu_write_register(CCI_PMU_OVRFLW_FLAG, idx, CCI_PMU_OVRFLW);

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drivers: CCI: Correct use of ! and &
  2014-07-23 15:01 ` Punit Agrawal
@ 2014-07-23 15:05   ` Will Deacon
  2014-07-29 11:34     ` Punit Agrawal
  0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2014-07-23 15:05 UTC (permalink / raw)
  To: Punit Agrawal
  Cc: Himangi Saraogi, linux-kernel, julia.lawall, linux-arm-kernel

On Wed, Jul 23, 2014 at 04:01:56PM +0100, Punit Agrawal wrote:
> > diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
> > index 5a86da9..7af78df 100644
> > --- a/drivers/bus/arm-cci.c
> > +++ b/drivers/bus/arm-cci.c
> > @@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
> >  		hw_counter = &event->hw;
> >  
> >  		/* Did this counter overflow? */
> > -		if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
> > +		if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
> > +		      CCI_PMU_OVRFLW_FLAG))
> >  			continue;
> 
> 
> Going back to the manual, this fix looks correct.
> 
> Acked-by: Punit Agrawal <punit.agrawal@arm.com>
> 
> Will, would this go via your tree?

Given that you're happy with it, I don't mind which tree it goes in.
Probably deserves a CC stable on it too.

If you get stuck, put it in rmk's patch system.

Will

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drivers: CCI: Correct use of ! and &
  2014-07-23 15:05   ` Will Deacon
@ 2014-07-29 11:34     ` Punit Agrawal
  2014-07-29 16:41       ` Olof Johansson
  0 siblings, 1 reply; 6+ messages in thread
From: Punit Agrawal @ 2014-07-29 11:34 UTC (permalink / raw)
  To: arm, arnd
  Cc: Himangi Saraogi, linux-kernel, julia.lawall, linux-arm-kernel,
	Will Deacon

Hi Arnd,

Will Deacon <will.deacon@arm.com> writes:

> On Wed, Jul 23, 2014 at 04:01:56PM +0100, Punit Agrawal wrote:
>> > diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
>> > index 5a86da9..7af78df 100644
>> > --- a/drivers/bus/arm-cci.c
>> > +++ b/drivers/bus/arm-cci.c
>> > @@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
>> >  		hw_counter = &event->hw;
>> >  
>> >  		/* Did this counter overflow? */
>> > -		if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
>> > +		if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
>> > +		      CCI_PMU_OVRFLW_FLAG))
>> >  			continue;
>> 
>> 
>> Going back to the manual, this fix looks correct.
>> 
>> Acked-by: Punit Agrawal <punit.agrawal@arm.com>
>> 
>> Will, would this go via your tree?
>
> Given that you're happy with it, I don't mind which tree it goes in.
> Probably deserves a CC stable on it too.

The CCI PMU patches went via arm-soc. Are you happy to pick this fix with
the Ack and a Cc to stable.

Cheers,
Punit

>
> If you get stuck, put it in rmk's patch system.
>
> Will
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drivers: CCI: Correct use of ! and &
  2014-07-29 11:34     ` Punit Agrawal
@ 2014-07-29 16:41       ` Olof Johansson
  2014-07-30 10:32         ` Punit Agrawal
  0 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2014-07-29 16:41 UTC (permalink / raw)
  To: Punit Agrawal
  Cc: arm, Arnd Bergmann, Himangi Saraogi, linux-kernel, julia.lawall,
	linux-arm-kernel, Will Deacon

On Tue, Jul 29, 2014 at 4:34 AM, Punit Agrawal <punit.agrawal@arm.com> wrote:
> Hi Arnd,
>
> Will Deacon <will.deacon@arm.com> writes:
>
>> On Wed, Jul 23, 2014 at 04:01:56PM +0100, Punit Agrawal wrote:
>>> > diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
>>> > index 5a86da9..7af78df 100644
>>> > --- a/drivers/bus/arm-cci.c
>>> > +++ b/drivers/bus/arm-cci.c
>>> > @@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
>>> >            hw_counter = &event->hw;
>>> >
>>> >            /* Did this counter overflow? */
>>> > -          if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
>>> > +          if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
>>> > +                CCI_PMU_OVRFLW_FLAG))
>>> >                    continue;
>>>
>>>
>>> Going back to the manual, this fix looks correct.
>>>
>>> Acked-by: Punit Agrawal <punit.agrawal@arm.com>
>>>
>>> Will, would this go via your tree?
>>
>> Given that you're happy with it, I don't mind which tree it goes in.
>> Probably deserves a CC stable on it too.
>
> The CCI PMU patches went via arm-soc. Are you happy to pick this fix with
> the Ack and a Cc to stable.

Yeah, we've been merging most of the CCI patches.

Please resend the patch to arm@kernel.org if you want us to apply it.


Thanks,

-Olof

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drivers: CCI: Correct use of ! and &
  2014-07-29 16:41       ` Olof Johansson
@ 2014-07-30 10:32         ` Punit Agrawal
  0 siblings, 0 replies; 6+ messages in thread
From: Punit Agrawal @ 2014-07-30 10:32 UTC (permalink / raw)
  To: Olof Johansson
  Cc: arm, Arnd Bergmann, Himangi Saraogi, linux-kernel, julia.lawall,
	linux-arm-kernel, Will Deacon

Olof Johansson <olof@lixom.net> writes:

> On Tue, Jul 29, 2014 at 4:34 AM, Punit Agrawal <punit.agrawal@arm.com> wrote:
>> Hi Arnd,
>>
>> Will Deacon <will.deacon@arm.com> writes:
>>
>>> On Wed, Jul 23, 2014 at 04:01:56PM +0100, Punit Agrawal wrote:
>>>> > diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
>>>> > index 5a86da9..7af78df 100644
>>>> > --- a/drivers/bus/arm-cci.c
>>>> > +++ b/drivers/bus/arm-cci.c
>>>> > @@ -397,7 +397,8 @@ static irqreturn_t pmu_handle_irq(int irq_num, void *dev)
>>>> >            hw_counter = &event->hw;
>>>> >
>>>> >            /* Did this counter overflow? */
>>>> > -          if (!pmu_read_register(idx, CCI_PMU_OVRFLW) & CCI_PMU_OVRFLW_FLAG)
>>>> > +          if (!(pmu_read_register(idx, CCI_PMU_OVRFLW) &
>>>> > +                CCI_PMU_OVRFLW_FLAG))
>>>> >                    continue;
>>>>
>>>>
>>>> Going back to the manual, this fix looks correct.
>>>>
>>>> Acked-by: Punit Agrawal <punit.agrawal@arm.com>
>>>>
>>>> Will, would this go via your tree?
>>>
>>> Given that you're happy with it, I don't mind which tree it goes in.
>>> Probably deserves a CC stable on it too.
>>
>> The CCI PMU patches went via arm-soc. Are you happy to pick this fix with
>> the Ack and a Cc to stable.
>
> Yeah, we've been merging most of the CCI patches.
>
> Please resend the patch to arm@kernel.org if you want us to apply it.

Ok, thanks! I'll send the patch with the tags applied shortly.

>
>
> Thanks,
>
> -Olof
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-07-30 10:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-07 14:05 [PATCH] drivers: CCI: Correct use of ! and & Himangi Saraogi
2014-07-23 15:01 ` Punit Agrawal
2014-07-23 15:05   ` Will Deacon
2014-07-29 11:34     ` Punit Agrawal
2014-07-29 16:41       ` Olof Johansson
2014-07-30 10:32         ` Punit Agrawal

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).