linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value
@ 2011-03-16 17:16 Aaro Koskinen
  2011-03-16 17:16 ` [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler setup Aaro Koskinen
  2011-03-17  5:52 ` [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Santosh Shilimkar
  0 siblings, 2 replies; 7+ messages in thread
From: Aaro Koskinen @ 2011-03-16 17:16 UTC (permalink / raw)
  To: linux-arm-kernel

Fix the return value for the successful case.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
---
 arch/arm/mach-omap2/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0d2d6a9..d478f53 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -65,7 +65,7 @@ static int __init omap3_l3_init(void)
 
 	WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
 
-	return PTR_ERR(od);
+	return IS_ERR(od) ? PTR_ERR(od) : 0;
 }
 postcore_initcall(omap3_l3_init);
 
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler setup
  2011-03-16 17:16 [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Aaro Koskinen
@ 2011-03-16 17:16 ` Aaro Koskinen
  2011-03-17  5:54   ` Santosh Shilimkar
  2011-03-17  5:52 ` [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Santosh Shilimkar
  1 sibling, 1 reply; 7+ messages in thread
From: Aaro Koskinen @ 2011-03-16 17:16 UTC (permalink / raw)
  To: linux-arm-kernel

The handler function may be called from the point it is registered.
Since the handler inspects IRQ numbers, we must set them up before
registration.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
---
 arch/arm/mach-omap2/omap_l3_smx.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_l3_smx.c b/arch/arm/mach-omap2/omap_l3_smx.c
index 265bff3..5f2da75 100644
--- a/arch/arm/mach-omap2/omap_l3_smx.c
+++ b/arch/arm/mach-omap2/omap_l3_smx.c
@@ -226,7 +226,6 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
 	struct omap3_l3         *l3;
 	struct resource         *res;
 	int                     ret;
-	int                     irq;
 
 	l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
 	if (!l3) {
@@ -249,18 +248,17 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
 		goto err2;
 	}
 
-	irq = platform_get_irq(pdev, 0);
-	ret = request_irq(irq, omap3_l3_app_irq,
+	l3->debug_irq = platform_get_irq(pdev, 0);
+	ret = request_irq(l3->debug_irq, omap3_l3_app_irq,
 		IRQF_DISABLED | IRQF_TRIGGER_RISING,
 		"l3-debug-irq", l3);
 	if (ret) {
 		dev_err(&pdev->dev, "couldn't request debug irq\n");
 		goto err3;
 	}
-	l3->debug_irq = irq;
 
-	irq = platform_get_irq(pdev, 1);
-	ret = request_irq(irq, omap3_l3_app_irq,
+	l3->app_irq = platform_get_irq(pdev, 1);
+	ret = request_irq(l3->app_irq, omap3_l3_app_irq,
 		IRQF_DISABLED | IRQF_TRIGGER_RISING,
 		"l3-app-irq", l3);
 
@@ -269,7 +267,6 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
 		goto err4;
 	}
 
-	l3->app_irq = irq;
 	goto err0;
 
 err4:
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value
  2011-03-16 17:16 [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Aaro Koskinen
  2011-03-16 17:16 ` [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler setup Aaro Koskinen
@ 2011-03-17  5:52 ` Santosh Shilimkar
  2011-03-17  8:19   ` Cousson, Benoit
  1 sibling, 1 reply; 7+ messages in thread
From: Santosh Shilimkar @ 2011-03-17  5:52 UTC (permalink / raw)
  To: linux-arm-kernel

> -----Original Message-----
> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-
> arm-kernel-bounces at lists.infradead.org] On Behalf Of Aaro Koskinen
> Sent: Wednesday, March 16, 2011 10:46 PM
> To: linux-omap at vger.kernel.org; linux-arm-
> kernel at lists.infradead.org; tony at atomide.com
> Cc: Aaro Koskinen
> Subject: [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init()
> return value
>
> Fix the return value for the successful case.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
> ---
>  arch/arm/mach-omap2/devices.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-
> omap2/devices.c
> index 0d2d6a9..d478f53 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -65,7 +65,7 @@ static int __init omap3_l3_init(void)
>
>  	WARN(IS_ERR(od), "could not build omap_device for %s\n",
> oh_name);
>
> -	return PTR_ERR(od);
> +	return IS_ERR(od) ? PTR_ERR(od) : 0;
>  }
>  postcore_initcall(omap3_l3_init);
>
Looks good.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler setup
  2011-03-16 17:16 ` [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler setup Aaro Koskinen
@ 2011-03-17  5:54   ` Santosh Shilimkar
  0 siblings, 0 replies; 7+ messages in thread
From: Santosh Shilimkar @ 2011-03-17  5:54 UTC (permalink / raw)
  To: linux-arm-kernel

> -----Original Message-----
> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-
> arm-kernel-bounces at lists.infradead.org] On Behalf Of Aaro Koskinen
> Sent: Wednesday, March 16, 2011 10:46 PM
> To: linux-omap at vger.kernel.org; linux-arm-
> kernel at lists.infradead.org; tony at atomide.com
> Cc: Aaro Koskinen
> Subject: [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler
> setup
>
> The handler function may be called from the point it is registered.
> Since the handler inspects IRQ numbers, we must set them up before
> registration.
>
Right. Thanks.

> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
> ---

Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

>  arch/arm/mach-omap2/omap_l3_smx.c |   11 ++++-------
>  1 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_l3_smx.c b/arch/arm/mach-
> omap2/omap_l3_smx.c
> index 265bff3..5f2da75 100644
> --- a/arch/arm/mach-omap2/omap_l3_smx.c
> +++ b/arch/arm/mach-omap2/omap_l3_smx.c
> @@ -226,7 +226,6 @@ static int __init omap3_l3_probe(struct
> platform_device *pdev)
>  	struct omap3_l3         *l3;
>  	struct resource         *res;
>  	int                     ret;
> -	int                     irq;
>
>  	l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
>  	if (!l3) {
> @@ -249,18 +248,17 @@ static int __init omap3_l3_probe(struct
> platform_device *pdev)
>  		goto err2;
>  	}
>
> -	irq = platform_get_irq(pdev, 0);
> -	ret = request_irq(irq, omap3_l3_app_irq,
> +	l3->debug_irq = platform_get_irq(pdev, 0);
> +	ret = request_irq(l3->debug_irq, omap3_l3_app_irq,
>  		IRQF_DISABLED | IRQF_TRIGGER_RISING,
>  		"l3-debug-irq", l3);
>  	if (ret) {
>  		dev_err(&pdev->dev, "couldn't request debug irq\n");
>  		goto err3;
>  	}
> -	l3->debug_irq = irq;
>
> -	irq = platform_get_irq(pdev, 1);
> -	ret = request_irq(irq, omap3_l3_app_irq,
> +	l3->app_irq = platform_get_irq(pdev, 1);
> +	ret = request_irq(l3->app_irq, omap3_l3_app_irq,
>  		IRQF_DISABLED | IRQF_TRIGGER_RISING,
>  		"l3-app-irq", l3);
>
> @@ -269,7 +267,6 @@ static int __init omap3_l3_probe(struct
> platform_device *pdev)
>  		goto err4;
>  	}
>
> -	l3->app_irq = irq;
>  	goto err0;
>
>  err4:
> --
> 1.5.6.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value
  2011-03-17  5:52 ` [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Santosh Shilimkar
@ 2011-03-17  8:19   ` Cousson, Benoit
  2011-03-17 10:06     ` Santosh Shilimkar
  0 siblings, 1 reply; 7+ messages in thread
From: Cousson, Benoit @ 2011-03-17  8:19 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Santosh,

On 3/17/2011 6:52 AM, Shilimkar, Santosh wrote:
>> -----Original Message-----
>> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-
>> arm-kernel-bounces at lists.infradead.org] On Behalf Of Aaro Koskinen
>> Sent: Wednesday, March 16, 2011 10:46 PM
>> To: linux-omap at vger.kernel.org; linux-arm-
>> kernel at lists.infradead.org; tony at atomide.com
>> Cc: Aaro Koskinen
>> Subject: [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init()
>> return value
>>
>> Fix the return value for the successful case.
>>
>> Signed-off-by: Aaro Koskinen<aaro.koskinen@nokia.com>
>> ---
>>   arch/arm/mach-omap2/devices.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-
>> omap2/devices.c
>> index 0d2d6a9..d478f53 100644
>> --- a/arch/arm/mach-omap2/devices.c
>> +++ b/arch/arm/mach-omap2/devices.c
>> @@ -65,7 +65,7 @@ static int __init omap3_l3_init(void)
>>
>>   	WARN(IS_ERR(od), "could not build omap_device for %s\n",
>> oh_name);
>>
>> -	return PTR_ERR(od);
>> +	return IS_ERR(od) ? PTR_ERR(od) : 0;
>>   }
>>   postcore_initcall(omap3_l3_init);

Maybe we should initialize that before, because in theory the timer12 
secure violation should have been captured easily with this code?

Regards,
Benoit

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value
  2011-03-17  8:19   ` Cousson, Benoit
@ 2011-03-17 10:06     ` Santosh Shilimkar
  2011-03-18 23:43       ` Tony Lindgren
  0 siblings, 1 reply; 7+ messages in thread
From: Santosh Shilimkar @ 2011-03-17 10:06 UTC (permalink / raw)
  To: linux-arm-kernel

> -----Original Message-----
> From: Cousson, Benoit [mailto:b-cousson at ti.com]
> Sent: Thursday, March 17, 2011 1:50 PM
> To: Shilimkar, Santosh
> Cc: Aaro Koskinen; linux-omap at vger.kernel.org; linux-arm-
> kernel at lists.infradead.org; tony at atomide.com
> Subject: Re: [PATCH 1/2] arm: mach-omap2: devices: fix
> omap3_l3_init() return value
>
> Hi Santosh,
>
> On 3/17/2011 6:52 AM, Shilimkar, Santosh wrote:
> >> -----Original Message-----
> >> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-
> >> arm-kernel-bounces at lists.infradead.org] On Behalf Of Aaro
> Koskinen
> >> Sent: Wednesday, March 16, 2011 10:46 PM
> >> To: linux-omap at vger.kernel.org; linux-arm-
> >> kernel at lists.infradead.org; tony at atomide.com
> >> Cc: Aaro Koskinen
> >> Subject: [PATCH 1/2] arm: mach-omap2: devices: fix
> omap3_l3_init()
> >> return value
> >>
> >> Fix the return value for the successful case.
> >>
> >> Signed-off-by: Aaro Koskinen<aaro.koskinen@nokia.com>
> >> ---
> >>   arch/arm/mach-omap2/devices.c |    2 +-
> >>   1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-
> >> omap2/devices.c
> >> index 0d2d6a9..d478f53 100644
> >> --- a/arch/arm/mach-omap2/devices.c
> >> +++ b/arch/arm/mach-omap2/devices.c
> >> @@ -65,7 +65,7 @@ static int __init omap3_l3_init(void)
> >>
> >>   	WARN(IS_ERR(od), "could not build omap_device for %s\n",
> >> oh_name);
> >>
> >> -	return PTR_ERR(od);
> >> +	return IS_ERR(od) ? PTR_ERR(od) : 0;
> >>   }
> >>   postcore_initcall(omap3_l3_init);
>
> Maybe we should initialize that before, because in theory the
> timer12 secure violation should have been captured easily with
> this code?
>
The firewall exceptions handling is removed from L3 handler because
PPA has the trap implemented. We faced issues when the trap was
enabled in both places.

Regards
Santosh

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value
  2011-03-17 10:06     ` Santosh Shilimkar
@ 2011-03-18 23:43       ` Tony Lindgren
  0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2011-03-18 23:43 UTC (permalink / raw)
  To: linux-arm-kernel

* Santosh Shilimkar <santosh.shilimkar@ti.com> [110317 03:04]:
> > From: Cousson, Benoit [mailto:b-cousson at ti.com]
> >
> > Maybe we should initialize that before, because in theory the
> > timer12 secure violation should have been captured easily with
> > this code?
> >
> The firewall exceptions handling is removed from L3 handler because
> PPA has the trap implemented. We faced issues when the trap was
> enabled in both places.

Applying these into fixes.

Tony

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-03-18 23:43 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-16 17:16 [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Aaro Koskinen
2011-03-16 17:16 ` [PATCH 2/2] arm: mach-omap2: omap_l3_smx: fix irq handler setup Aaro Koskinen
2011-03-17  5:54   ` Santosh Shilimkar
2011-03-17  5:52 ` [PATCH 1/2] arm: mach-omap2: devices: fix omap3_l3_init() return value Santosh Shilimkar
2011-03-17  8:19   ` Cousson, Benoit
2011-03-17 10:06     ` Santosh Shilimkar
2011-03-18 23:43       ` Tony Lindgren

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