Patchwork [Maverick,ti-omap4] SRU: Fix blaze board crash with tiwlan package installed

login
register
mail settings
Submitter Tim Gardner
Date Oct. 22, 2010, 2:25 p.m.
Message ID <4CC19EBF.40108@canonical.com>
Download mbox | patch
Permalink /patch/68862/
State Accepted
Delegated to: Tim Gardner
Headers show

Comments

Tim Gardner - Oct. 22, 2010, 2:25 p.m.
Thusly ?
Sebastien Jan - Oct. 22, 2010, 2:33 p.m.
On Fri, Oct 22, 2010 at 4:25 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
> Thusly ?
>
> --
> Tim Gardner tim.gardner@canonical.com
>

This shall be ok, but I'd like to give it a try on HW before ack
(there is a GPIO involved and would prefer to double check on blaze
HW).
Sebastien Jan - Oct. 22, 2010, 3:29 p.m.
On Fri, Oct 22, 2010 at 4:33 PM, Jan, Sebastien <s-jan@ti.com> wrote:
> On Fri, Oct 22, 2010 at 4:25 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
>> Thusly ?
>>
>> --
>> Tim Gardner tim.gardner@canonical.com
>>
>
> This shall be ok, but I'd like to give it a try on HW before ack
> (there is a GPIO involved and would prefer to double check on blaze
> HW).

Boot-tested on OMAP4 blaze board.
Tim Gardner - Oct. 22, 2010, 3:58 p.m.
On 10/22/2010 09:29 AM, Jan, Sebastien wrote:
> On Fri, Oct 22, 2010 at 4:33 PM, Jan, Sebastien<s-jan@ti.com>  wrote:
>> On Fri, Oct 22, 2010 at 4:25 PM, Tim Gardner<tim.gardner@canonical.com>  wrote:
>>> Thusly ?
>>>
>>> --
>>> Tim Gardner tim.gardner@canonical.com
>>>
>>
>> This shall be ok, but I'd like to give it a try on HW before ack
>> (there is a GPIO involved and would prefer to double check on blaze
>> HW).
>
> Boot-tested on OMAP4 blaze board.

pushed and uploaded

Patch

From ef436ef3cd34f5def720f3735900af36130ad37a Mon Sep 17 00:00:00 2001
From: Sebastien Jan <s-jan@ti.com>
Date: Mon, 18 Oct 2010 18:00:55 +0200
Subject: [PATCH] wlan: register wlan device only on pandaboard

BugLink: https://bugs.launchpad.net/bugs/665039

Registering the wlan device on blaze triggers the loading
of user-space wlan drivers for 1271 chip. These user-space
drivers are not compatible with the 1283 chip of the blaze and
cause a kernel crash.

The event is the same whatever the wlan controller, which
prevents managing different wlan drivers in user-space.

This patch registers the wlan device only on pandaboard.
Long term, we would like to generate different events depending
on the wlan controller.

Signed-off-by: Sebastien Jan <s-jan@ti.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 arch/arm/mach-omap2/board-4430sdp-wifi.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp-wifi.c b/arch/arm/mach-omap2/board-4430sdp-wifi.c
index aa731ef..a950f45 100644
--- a/arch/arm/mach-omap2/board-4430sdp-wifi.c
+++ b/arch/arm/mach-omap2/board-4430sdp-wifi.c
@@ -25,6 +25,7 @@ 
 
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/mach-types.h>
 #include <plat/wifi_tiwlan.h>
 
 #define SDP4430_WIFI_PMENA_GPIO	 43
@@ -120,6 +121,9 @@  static int __init sdp4430_wifi_init(void)
 {
 	int ret;
 
+	if (!machine_is_omap4_panda())
+		return -ENODEV;
+
 	printk(KERN_WARNING"%s: start\n", __func__);
 	ret = gpio_request(SDP4430_WIFI_IRQ_GPIO, "wifi_irq");
 	if (ret < 0) {
-- 
1.7.0.4