upgpkg: linux-surfacepro3-rt 4.9.20-2.27

3 files changed, 11 insertions, 151 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5479e82d7a00..7cb93ef1907b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-surfacepro3-rt
-	pkgver = 4.9.13
+	pkgver = 4.9.20
 	pkgrel = 2.27
 	url = https://github.com/alyptik/linux-surfacepro3-rt
 	arch = i686
@@ -12,10 +12,10 @@ pkgbase = linux-surfacepro3-rt
 	makedepends = bc
 	makedepends = elfutils
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.13.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.13.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.13-rt12.patch.xz
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.13-rt12.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.20.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.20.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.20-rt16.patch.xz
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.20-rt16.patch.sign
 	source = https://raw.githubusercontent.com/alyptik/linux-surfacepro3-rt/github/bfq.patch
 	source = https://raw.githubusercontent.com/alyptik/linux-surfacepro3-rt/github/bfs.patch
 	source = https://raw.githubusercontent.com/alyptik/linux-surfacepro3-rt/github/bfs-fixes1.patch
@@ -26,7 +26,6 @@ pkgbase = linux-surfacepro3-rt
 	source = xattr.patch
 	source = touchscreen_multitouch_fixes1.patch
 	source = touchscreen_multitouch_fixes2.patch
-	source = wifi.patch
 	source = multitouch.patch
 	source = change-default-console-loglevel.patch
 	source = config
@@ -37,9 +36,9 @@ pkgbase = linux-surfacepro3-rt
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
 	validpgpkeys = A2F5DE1C32B6B93E3E4884BF2E02D725AF202DC1
-	sha256sums = 36464aec4fb32ed192252645819abb55ceb21eef17b3f7210b4a673e7486a268
+	sha256sums = 48660806dd32fb8dcbcf5932291bf6cc7d29240070372230871e0f56fea81341
 	sha256sums = SKIP
-	sha256sums = 90dfb1397a12d39894265fdb092ca87037cc9f4d3f8417ca45e731d6b79b1ba1
+	sha256sums = 14473bfbf91aae9a998d96267a3b575e3eae9f9dcbb9caef1ba0f0a5b5109442
 	sha256sums = SKIP
 	sha256sums = 242d32d0fe819852e74d93b8a044cf24a40a9474d6f00ca93a19aa98298dcefa
 	sha256sums = 51f91681b708149fe91e565f5c40811477428e2aa86f8726a20e0e7c55c5407c
@@ -51,7 +50,6 @@ pkgbase = linux-surfacepro3-rt
 	sha256sums = 4633ae19b9a9871a3cfffba98ec7c3cd240f64bef8a0eebcf1212219c80972fd
 	sha256sums = cc78e8844d9ec4bd29cce392a3e4683061646e1ad7c100c4958a5cadabb25b52
 	sha256sums = 34b4e00ffcf9efc43ab47444d14febb94432d340d0f1d5bcd56153879d1be113
-	sha256sums = 52e7c895aeb505bc8d3b5321a346fcdbb749f8035cacc97a237c24c1f527adbc
 	sha256sums = 87bde6cc0f45629aa8406b364dfbbe2c59bce2621b451b6e504160f96cf9475f
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 0fcd0b22fe9ec58ba41b81b463f68d619b6898a5c405fb26c85237a183240371
diff --git a/PKGBUILD b/PKGBUILD
index 2c462e37e985..3dfab62ea0f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Matthew Wardrop <mister.wardrop@gmail.com>
 
 pkgbase=linux-surfacepro3-rt
-_srcname=linux-4.9.13
+_srcname=linux-4.9.20
 pkgver=${_srcname#linux-}
-_rtver=rt12
+_rtver=rt16
 pkgrel=2.27
 arch=('i686' 'x86_64')
 url="https://github.com/alyptik/linux-surfacepro3-rt"
@@ -23,7 +23,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'https://raw.githubusercontent.com/alyptik/linux-surfacepro3-rt/github/bfs-fixes3.patch'
         'init.patch' 'kconfig.patch' 'xattr.patch'
 	'touchscreen_multitouch_fixes1.patch' 'touchscreen_multitouch_fixes2.patch'
-	'wifi.patch'
         'multitouch.patch'
         'change-default-console-loglevel.patch'
         # the main kernel config files
@@ -32,9 +31,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'linux.preset'
 )
 
-sha256sums=('36464aec4fb32ed192252645819abb55ceb21eef17b3f7210b4a673e7486a268'
+sha256sums=('48660806dd32fb8dcbcf5932291bf6cc7d29240070372230871e0f56fea81341'
             'SKIP'
-            '90dfb1397a12d39894265fdb092ca87037cc9f4d3f8417ca45e731d6b79b1ba1'
+            '14473bfbf91aae9a998d96267a3b575e3eae9f9dcbb9caef1ba0f0a5b5109442'
             'SKIP'
             '242d32d0fe819852e74d93b8a044cf24a40a9474d6f00ca93a19aa98298dcefa'
             '51f91681b708149fe91e565f5c40811477428e2aa86f8726a20e0e7c55c5407c'
@@ -46,7 +45,6 @@ sha256sums=('36464aec4fb32ed192252645819abb55ceb21eef17b3f7210b4a673e7486a268'
             '4633ae19b9a9871a3cfffba98ec7c3cd240f64bef8a0eebcf1212219c80972fd'
             'cc78e8844d9ec4bd29cce392a3e4683061646e1ad7c100c4958a5cadabb25b52'
             '34b4e00ffcf9efc43ab47444d14febb94432d340d0f1d5bcd56153879d1be113'
-            '52e7c895aeb505bc8d3b5321a346fcdbb749f8035cacc97a237c24c1f527adbc'
             '87bde6cc0f45629aa8406b364dfbbe2c59bce2621b451b6e504160f96cf9475f'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '0fcd0b22fe9ec58ba41b81b463f68d619b6898a5c405fb26c85237a183240371'
diff --git a/wifi.patch b/wifi.patch
deleted file mode 100644
index e02dc4864b60..000000000000
--- a/wifi.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-+++ a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-@@ -394,6 +394,8 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
- 			    "info: ignore timeout value for IEEE Power Save\n");
-
- 	ps_mode = enabled;
-+mwifiex_dbg(priv->adapter, ERROR, "jpw: hacking ps_mode to false\n");
-+	ps_mode = 0;
-
- 	return mwifiex_drv_set_power(priv, &ps_mode);
- }
---- a/drivers/net/wireless/marvell/mwifiex/pcie.c
-+++ a/drivers/net/wireless/marvell/mwifiex/pcie.c
-@@ -428,6 +428,8 @@ static int mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)
-  */
- static int mwifiex_pcie_disable_host_int(struct mwifiex_adapter *adapter)
- {
-+//	mwifiex_dbg(adapter, ERROR,
-+//				    "disable_host_int");
- 	if (mwifiex_pcie_ok_to_access_hw(adapter)) {
- 		if (mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK,
- 				      0x00000000)) {
-@@ -436,6 +438,9 @@ static int mwifiex_pcie_disable_host_int(struct mwifiex_adapter *adapter)
- 			return -1;
- 		}
- 	}
-+	else
-+		mwifiex_dbg(adapter, ERROR,
-+			    "Did NOT really disable host interrupt.\n");
-
- 	return 0;
- }
-@@ -448,6 +453,8 @@ static int mwifiex_pcie_disable_host_int(struct mwifiex_adapter *adapter)
-  */
- static int mwifiex_pcie_enable_host_int(struct mwifiex_adapter *adapter)
- {
-+//	mwifiex_dbg(adapter, ERROR,
-+//				    "enable_host_int");
- 	if (mwifiex_pcie_ok_to_access_hw(adapter)) {
- 		/* Simply write the mask to the register */
- 		if (mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK,
-@@ -1600,6 +1607,9 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
-
- 	mwifiex_dbg(adapter, CMD,
- 		    "info: Rx CMD Response\n");
-+//	mwifiex_dbg(adapter, ERROR,
-+//		    "jpw: %s skb %p, skb->len %d, skb->data_len %d, skb->head %p, skb->data %p, skb->tail %d, skb->end %d\n",
-+//                  __func__, skb, skb->len, skb->data_len, skb->head, skb->data, skb->tail, skb->end);
-
- 	mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_FROMDEVICE);
-
-@@ -1629,6 +1632,14 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
- 	pkt_len = *((__le16 *)skb->data);
- 	rx_len = le16_to_cpu(pkt_len);
-+	if (rx_len == 0) {
-+		mwifiex_dbg(adapter, ERROR,
-+				    "0 byte cmdrsp\n");
-+		mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
-+					   PCI_DMA_FROMDEVICE);
-+		return 0;
-+	}
-+
-	skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
- 	skb_trim(skb, rx_len);
- 	skb_pull(skb, INTF_HEADER_LEN);
-
-@@ -1678,6 +1696,9 @@ static int mwifiex_pcie_cmdrsp_complete(struct mwifiex_adapter *adapter,
- 	struct pcie_service_card *card = adapter->card;
-
- 	if (skb) {
-+//	mwifiex_dbg(adapter, ERROR,
-+//		    "jpw: %s skb %p, skb->len %d, skb->data_len %d, skb->head %p, skb->data %p, skb->tail %d, skb->end %d\n",
-+//                   __func__, skb, skb->len, skb->data_len, skb->head, skb->data, skb->tail, skb->end);
- 		card->cmdrsp_buf = skb;
- 		skb_push(card->cmdrsp_buf, INTF_HEADER_LEN);
- 		if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
-@@ -2195,6 +2216,7 @@ static int mwifiex_process_pcie_int(struct mwifiex_adapter *adapter)
- 	pcie_ireg = adapter->int_status;
- 	adapter->int_status = 0;
- 	spin_unlock_irqrestore(&adapter->int_lock, flags);
-+	mwifiex_dbg(adapter, INTR, "popped ireg: 0x%08x\n", pcie_ireg);
-
- 	while (pcie_ireg & HOST_INTR_MASK) {
- 		if (pcie_ireg & HOST_INTR_DNLD_DONE) {
-@@ -2234,7 +2256,7 @@ static int mwifiex_process_pcie_int(struct mwifiex_adapter *adapter)
- 			if (ret)
- 				return ret;
- 		}
--
-+#if defined(JPW_EXPERIMENT_1)
- 		if (mwifiex_pcie_ok_to_access_hw(adapter)) {
- 			if (mwifiex_read_reg(adapter, PCIE_HOST_INT_STATUS,
- 					     &pcie_ireg)) {
-@@ -2254,6 +2276,7 @@ static int mwifiex_process_pcie_int(struct mwifiex_adapter *adapter)
- 			}
-
- 		}
-+#endif
- 	}
- 	mwifiex_dbg(adapter, INTR,
- 		    "info: cmd_sent=%d data_sent=%d\n",
---- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-+++ a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-@@ -2237,7 +2237,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
- 		if (ret)
- 			return -1;
-
--		if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
-+		if (0 && priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
- 			/* Enable IEEE PS by default */
- 			priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
- 			ret = mwifiex_send_cmd(priv,
-@@ -2300,7 +2300,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
- 	if (ret)
- 		return -1;
-
--	if (!disable_auto_ds &&
-+	if (0 && !disable_auto_ds &&
- 	    first_sta && priv->adapter->iface_type != MWIFIEX_USB &&
- 	    priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
- 		/* Enable auto deep sleep */
---- a/drivers/net/wireless/marvell/mwifiex/util.c
-+++ a/drivers/net/wireless/marvell/mwifiex/util.c
-@@ -406,8 +406,11 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,
- 	u16 pkt_len;
- 	struct ieee80211_hdr *ieee_hdr;
-
--	if (!skb)
-+	if (!skb) {
-+		mwifiex_dbg(priv->adapter, ERROR,
-+			    "no skb");
- 		return -1;
-+	}
-
- 	if (!priv->mgmt_frame_mask ||
- 	    priv->wdev.iftype == NL80211_IFTYPE_UNSPECIFIED) {