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

[Sebastien Jan]

SRU justification:

Impact: When booting official Maverick pre-installed images on OMAP4 
blaze board, with standard wlan packages installed (tiwlan-wl1271*), the 
blaze board crashes on wlan driver init.

Fix: The problem is fixed by registering the wlan device exclusively on 
pandaboard (the wlan device on blaze board is not compatible).

Testcase: install the standard TI packages on the Maverick OMAP4 
pre-installed image running on a blaze board. On next boot, the platform 
crashes while loading the wlan driver.

BugLink: 
https://bugs.launchpad.net/ubuntu/+source/linux-ti-omap4/+bug/665039

This issue is fixed by the below (and also attached) patch.


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

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 at ti.com>
---
  arch/arm/mach-omap2/board-4430sdp-wifi.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp-wifi.c 
b/arch/arm/mach-omap2/board-4430sdp-wifi.c
index aa731ef..eea7cad 100644
--- a/arch/arm/mach-omap2/board-4430sdp-wifi.c
+++ b/arch/arm/mach-omap2/board-4430sdp-wifi.c
@@ -129,7 +129,8 @@ static int __init sdp4430_wifi_init(void)
         }
         gpio_direction_input(SDP4430_WIFI_IRQ_GPIO);
  #ifdef CONFIG_WIFI_CONTROL_FUNC
-       ret = platform_device_register(&sdp4430_wifi_device);
+       if (machine_is_omap4_panda())
+               ret = platform_device_register(&sdp4430_wifi_device);
  #endif
  out:
         return ret;
-- 
1.7.0.4


0001-wlan-register-wlan-device-only-on-pandaboard.patch

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

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 at ti.com>
---
  arch/arm/mach-omap2/board-4430sdp-wifi.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp-wifi.c 
b/arch/arm/mach-omap2/board-4430sdp-wifi.c
index aa731ef..eea7cad 100644
--- a/arch/arm/mach-omap2/board-4430sdp-wifi.c
+++ b/arch/arm/mach-omap2/board-4430sdp-wifi.c
@@ -129,7 +129,8 @@ static int __init sdp4430_wifi_init(void)
  	}
  	gpio_direction_input(SDP4430_WIFI_IRQ_GPIO);
  #ifdef CONFIG_WIFI_CONTROL_FUNC
-	ret = platform_device_register(&sdp4430_wifi_device);
+	if (machine_is_omap4_panda())
+		ret = platform_device_register(&sdp4430_wifi_device);
  #endif
  out:
  	return ret;
-- 1.7.0.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-wlan-register-wlan-device-only-on-pandaboard.patch
Type: text/x-patch
Size: 1378 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20101022/3fdb1f86/attachment.bin>