ti-compat-wireless: update wl12xx patches

5 files changed, 108 insertions, 45 deletions

diff --git a/multitech/recipes/compat-wireless/compat-wireless-stable.inc b/multitech/recipes/compat-wireless/compat-wireless-stable.inc
index f7e78d3..8cf156d 100644
--- a/multitech/recipes/compat-wireless/compat-wireless-stable.inc
+++ b/multitech/recipes/compat-wireless/compat-wireless-stable.inc
@@ -3,8 +3,7 @@ HOMEPAGE = "http://wireless.kernel.org/en/users/Download"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
 RDEPENDS = "wireless-tools"
-PR = "r0"
-
+INC_PR = "r0"
 
 S = "${WORKDIR}/compat-wireless-${COMPAT_WIRELESS_VERSION}"
 
diff --git a/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch b/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch
index 9db2a03..1b7ae64 100644
--- a/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch
+++ b/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch
@@ -1,51 +1,25 @@
---- a/drivers/net/wireless/wl12xx/sdio.c	2011-12-20 06:20:19.000000000 -0600
-+++ b/drivers/net/wireless/wl12xx/sdio.c	2012-06-20 12:51:18.000000000 -0500
-@@ -169,6 +169,10 @@
- 	struct sdio_func *func = wl_to_func(wl);
- 	int ret;
- 
-+       // MTPCIE:
-+        if (wl->set_power)
-+                wl->set_power(1);
-+
- 	/* If enabled, tell runtime PM not to power off the card */
- 	if (pm_runtime_enabled(&func->dev)) {
- 		ret = pm_runtime_get_sync(&func->dev);
-@@ -193,6 +197,10 @@
- 	struct sdio_func *func = wl_to_func(wl);
- 	int ret;
- 
-+        // MTPCIE:
-+        if (wl->set_power)
-+                wl->set_power(0);
-+
- 	sdio_disable_func(func);
- 	sdio_release_host(func);
- 
-@@ -265,14 +273,18 @@
+Index: compat-wireless/drivers/net/wireless/wl12xx/sdio.c
+===================================================================
+--- compat-wireless.orig/drivers/net/wireless/wl12xx/sdio.c	2013-02-18 11:47:02.831869486 -0600
++++ compat-wireless/drivers/net/wireless/wl12xx/sdio.c	2013-02-18 12:21:04.472513066 -0600
+@@ -277,14 +277,19 @@
  	wl->irq = wlan_data->irq;
  	if (wl->ref_clock < 0)
  		wl->ref_clock = wlan_data->board_ref_clock;
--	if (wl->tcxo_clock < 0)
--		wl->tcxo_clock = wlan_data->board_tcxo_clock;
--	wl->platform_quirks = wlan_data->platform_quirks;
--
--	if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
--		irqflags = IRQF_TRIGGER_RISING;
--	else
--		irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
-+        // MTPCIE:
-+        if (wlan_data->set_power)
-+                wl->set_power = wlan_data->set_power;
-+
-+	//if (wl->tcxo_clock < 0)
-+	//	wl->tcxo_clock = wlan_data->board_tcxo_clock;
-+	//wl->platform_quirks = wlan_data->platform_quirks;
 +
-+	//if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
++	/* MTPCIE: force irq trigger
+ 	if (wl->tcxo_clock < 0)
+ 		wl->tcxo_clock = wlan_data->board_tcxo_clock;
+ 	wl->platform_quirks = wlan_data->platform_quirks;
+ 
+ 	if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
+-		irqflags = IRQF_TRIGGER_RISING;
++	*/
 +		irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
-+	//else
-+	//	irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
++	/*
+ 	else
+ 		irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
++	*/
  
  	ret = request_threaded_irq(wl->irq, wl1271_hardirq, wl1271_irq,
  				   irqflags,
diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch
new file mode 100644
index 0000000..ab438f0
--- /dev/null
+++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch
@@ -0,0 +1,45 @@
+Index: compat-wireless/drivers/net/wireless/wl12xx/cmd.c
+===================================================================
+--- compat-wireless.orig/drivers/net/wireless/wl12xx/cmd.c	2012-12-31 09:58:56.746126785 -0600
++++ compat-wireless/drivers/net/wireless/wl12xx/cmd.c	2012-12-31 10:02:03.246660822 -0600
+@@ -1214,7 +1214,7 @@
+ 	skb_reserve(skb, sizeof(*hdr) + WL1271_EXTRA_SPACE_MAX);
+ 
+ 	tmpl = (struct wl12xx_arp_rsp_template *)skb_put(skb, sizeof(*tmpl));
+-	memset(tmpl, 0, sizeof(tmpl));
++	memset(tmpl, 0, sizeof(*tmpl));
+ 
+ 	/* llc layer */
+ 	memcpy(tmpl->llc_hdr, rfc1042_header, sizeof(rfc1042_header));
+@@ -1263,7 +1263,7 @@
+ 
+ 	/* mac80211 header */
+ 	hdr = (struct ieee80211_hdr_3addr *)skb_push(skb, sizeof(*hdr));
+-	memset(hdr, 0, sizeof(hdr));
++	memset(hdr, 0, sizeof(*hdr));
+ 	fc = IEEE80211_FTYPE_DATA | IEEE80211_FCTL_TODS;
+ 	if (wl->qos)
+ 		fc |= IEEE80211_STYPE_QOS_DATA;
+Index: compat-wireless/drivers/net/wireless/wl12xx/main.c
+===================================================================
+--- compat-wireless.orig/drivers/net/wireless/wl12xx/main.c	2012-12-31 09:59:00.246129356 -0600
++++ compat-wireless/drivers/net/wireless/wl12xx/main.c	2012-12-31 10:01:26.746205394 -0600
+@@ -4142,10 +4142,14 @@
+ 				goto out;
+ 			}
+ 
+-			ret = wl1271_acx_arp_ip_filter(wl,
+-				(ACX_ARP_FILTER_ARP_FILTERING |
+-				 ACX_ARP_FILTER_AUTO_ARP),
+-				addr);
++//Possible Firmware Issue with TI chip and Auto-ARP Response while using encryption.
++//Disabling Auto-ARP for now.
++//			ret = wl1271_acx_arp_ip_filter(wl,
++//				(ACX_ARP_FILTER_ARP_FILTERING |
++//				 ACX_ARP_FILTER_AUTO_ARP),
++//				addr);
++			ret = wl1271_acx_arp_ip_filter(wl, 0, addr);
++
+ 		} else {
+ 			wl->ip_addr = 0;
+ 			ret = wl1271_acx_arp_ip_filter(wl, 0, addr);
diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch
new file mode 100644
index 0000000..3cd1342
--- /dev/null
+++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch
@@ -0,0 +1,37 @@
+Index: compat-wireless/drivers/net/wireless/wl12xx/sdio.c
+===================================================================
+--- compat-wireless.orig/drivers/net/wireless/wl12xx/sdio.c
++++ compat-wireless/drivers/net/wireless/wl12xx/sdio.c
+@@ -169,6 +169,10 @@ static int wl1271_sdio_power_on(struct w
+ 	struct sdio_func *func = wl_to_func(wl);
+ 	int ret;
+ 
++	// MTS: enable chip on power on
++	if (wl->set_power)
++		wl->set_power(1);
++
+ 	/* If enabled, tell runtime PM not to power off the card */
+ 	if (pm_runtime_enabled(&func->dev)) {
+ 		ret = pm_runtime_get_sync(&func->dev);
+@@ -193,6 +197,10 @@ static int wl1271_sdio_power_off(struct 
+ 	struct sdio_func *func = wl_to_func(wl);
+ 	int ret;
+ 
++	// MTS: disable chip on power off
++	if (wl->set_power)
++		wl->set_power(0);
++
+ 	sdio_disable_func(func);
+ 	sdio_release_host(func);
+ 
+@@ -262,6 +270,10 @@ static int __devinit wl1271_probe(struct
+ 		goto out_free;
+ 	}
+ 
++	// MTS: add set_power to control enable pin
++	if (wlan_data->set_power)
++		wl->set_power = wlan_data->set_power;
++
+ 	wl->irq = wlan_data->irq;
+ 	if (wl->ref_clock < 0)
+ 		wl->ref_clock = wlan_data->board_ref_clock;
diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx_R4SP2.bb b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx_R4SP2.bb
index 50906f4..d000351 100644
--- a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx_R4SP2.bb
+++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx_R4SP2.bb
@@ -1,5 +1,8 @@
 include compat-wireless-stable.inc
 
+LOCAL_PR = "${INC_PR}.1"
+MACHINE_KERNEL_PR_append = "${LOCAL_PR}"
+
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/768/5331/ti-compat-wireless-wl12xx-r4-12-12-20.tar.gz \
 	   http://processors.wiki.ti.com/images/2/23/R4_SP2_Patches.zip;name=r4sp2 \
 	file://${WORKDIR}/0004-added-driver-version.patch \
@@ -9,6 +12,11 @@ SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/768/5331/ti-compat-wirel
 	file://${WORKDIR}/0008-wl12xx-remove-warning-message-during-IBSS-Tx.patch \
 	file://${WORKDIR}/0012-mac80211-set-upasd-queues-and-max-sp-only-on-sta-addition.patch \
 	file://${WORKDIR}/0013-wl12xx-Make-sure-HW-is-available-in-sched-scan-ops.patch \
+	file://wl12xx-arp-reply.patch \
+	file://wl12xx-set-power.patch \
+	"
+
+SRC_URI_append_mt100eocg-pcie-dk = " \
 	file://wl12xx_sdio.patch \
 	"