Update v4.19 patches

Changes:
 - WiFi:
   - Add workaround for deep sleep on buggy hardware
   - Fix manual host-sleep activation
   - Fix DELBA requests
   - Ignore BTCOEX events as they are sometimes buggy (improves WiFi
     speeds)
   - Other small fixes

 - SAM:
   - Code cleanup and small fixes

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/3ef26cf9b4726be5e7a1cd8cdbb5bdc3c1447f39
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/a33f6762bee1b6c0650889445648377dde8508d7

patches/4.19/0001-surface3-power.patch

@@ -1,4 +1,4 @@
-From 8131f9416c55da408e5e7791b241f43f5de97a6a Mon Sep 17 00:00:00 2001
+From 5899a82a619093b012cbd2fe9b7b34cfa8efd240 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:00:43 +0200
 Subject: [PATCH] platform/x86: Surface 3 battery platform operation region

patches/4.19/0002-surface3-touchscreen-dma-fix.patch

@@ -1,4 +1,4 @@
-From 222fc42043d5045abd222a12268cbad57bf36ff3 Mon Sep 17 00:00:00 2001
+From 874cb462d0a2359247d4fb5b4a5318ab31719662 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Sun, 5 Jul 2020 14:56:20 +0300
 Subject: [PATCH] dmaengine: dw: Initialize channel before each transfer

patches/4.19/0003-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 348d2f5127b4caf7a796d3c50fab94e6c29e58e3 Mon Sep 17 00:00:00 2001
+From dbf8c9f80c210005e9870e3f44e7468450bd8383 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI

patches/4.19/0004-surface-buttons.patch

@@ -1,4 +1,4 @@
-From 9a56e863a396afe49914081db3bb45995072447c Mon Sep 17 00:00:00 2001
+From 3ac5629303e8387e02af44f8eb052dc0032b180b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Jul 2019 17:51:37 +0200
 Subject: [PATCH] platform/x86: surfacepro3_button: Fix device check
@@ -92,7 +92,7 @@ index 1b491690ce07..96627627060e 100644
 -- 
 2.31.1
 
-From 1e5095e3ff9a53113ca8ba45dfa0c4ef1e9d9115 Mon Sep 17 00:00:00 2001
+From bd7cff917b1255f3d24768c7893c92b8f2da2dfc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Jul 2019 17:52:01 +0200
 Subject: [PATCH] Input: soc_button_array - Add support for newer surface
@@ -297,7 +297,7 @@ index 55cd6e0b409c..8f21c062c85d 100644
 -- 
 2.31.1
 
-From fb105d6a3344a5d702d54e35de3c7e6753a91074 Mon Sep 17 00:00:00 2001
+From a0a9839e1d0070485c459172fefa70e325cc6831 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoide@redhat.com>
 Date: Sat, 5 Oct 2019 14:11:58 +0200
 Subject: [PATCH] Input: soc_button_array - partial revert of support for newer
@@ -386,7 +386,7 @@ index 8f21c062c85d..5983733d78dd 100644
 -- 
 2.31.1
 
-From e639e31f9337a7542e45bce048fe0643a4bb434a Mon Sep 17 00:00:00 2001
+From c0d76204f6c9d2a2e4ea9f7b83276e2398beb9b5 Mon Sep 17 00:00:00 2001
 From: "Tsuchiya Yuto (kitakar5525)" <kitakar@gmail.com>
 Date: Mon, 11 May 2020 17:40:21 +0900
 Subject: [PATCH] Input: soc_button_array - fix Wdiscarded-qualifiers for

patches/4.19/0005-suspend.patch

@@ -1,4 +1,4 @@
-From c81d791e66773b5ff8b2ae877eaa62d7c45e69ab Mon Sep 17 00:00:00 2001
+From e363f8ac4c2922e6e1e7176677423e1f894b8493 Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Sat, 28 Sep 2019 17:48:21 +0200
 Subject: [PATCH] nvme: Backport changes for suspend

patches/4.19/0006-ipts.patch

@@ -1,4 +1,4 @@
-From 1ad3aeab522dee2c95805c3f1c9686135c02f4a3 Mon Sep 17 00:00:00 2001
+From 3c843a542846d7a79f03d5c42d2ef0bd3082ad17 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 17:58:17 +0200
 Subject: [PATCH] Add support for Intel IPTS touch devices

patches/4.19/0007-wifi.patch

@@ -1,4 +1,4 @@
-From 2c0ab405ba4508f1ef216475a9c0615f074af32b Mon Sep 17 00:00:00 2001
+From e10c189c924a7e17c8aecca39ab4d09ef6fe2cac Mon Sep 17 00:00:00 2001
 From: Chuhong Yuan <hslester96@gmail.com>
 Date: Wed, 24 Jul 2019 19:27:45 +0800
 Subject: [PATCH] mwifiex: pcie: Use dev_get_drvdata
@@ -49,7 +49,7 @@ index 5907b34037c2..4e655038e3f3 100644
 -- 
 2.31.1
 
-From 446330f970e8e493a88b4796f37006b90492be7b Mon Sep 17 00:00:00 2001
+From ec0b61c1ad314f1a15602c518b3e0922053c2d72 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 28 Sep 2020 17:46:49 +0900
 Subject: [PATCH] mwifiex: pcie: add DMI-based quirk impl for Surface devices
@@ -257,7 +257,7 @@ index 000000000000..5326ae7e5671
 -- 
 2.31.1
 
-From 1a6273b1e8c7323771b0fd6c7ce17ab84a6f01b3 Mon Sep 17 00:00:00 2001
+From 1bff7cf754d8a594355169b042c2deb16d77d20b Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:25:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_d3cold quirk for Surface gen4+
@@ -458,7 +458,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
 -- 
 2.31.1
 
-From 8bda66c2f6ff1998fb1a74acb059f566cd58f690 Mon Sep 17 00:00:00 2001
+From 19c52e3d0bd6314e463489777cc8bfe737bb3044 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:32:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@@ -637,7 +637,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
 -- 
 2.31.1
 
-From d1453d41ff808912f99d999f9a6b800b5323f9ed Mon Sep 17 00:00:00 2001
+From 8359f0a43399b61943e9020b868cfcd471a01bdd Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Wed, 30 Sep 2020 18:08:24 +0900
 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@@ -699,7 +699,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
 -- 
 2.31.1
 
-From dcc6b7e694cf40fd21288ac280a8c616246c9220 Mon Sep 17 00:00:00 2001
+From b5d76682fcd86231e47bb0275ac668a12c6f920f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -854,7 +854,7 @@ index 3ef7440418e3..a95ebac06e13 100644
 -- 
 2.31.1
 
-From df0fb030a3b43803dfb51a7d66b9727455c5e963 Mon Sep 17 00:00:00 2001
+From e59f0ea01b0bdd349574e28f82b6f50ba8756354 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 10 Nov 2020 12:49:56 +0100
 Subject: [PATCH] mwifiex: Use non-posted PCI register writes
@@ -911,7 +911,7 @@ index d0e002cfc295..aae276fc1155 100644
 -- 
 2.31.1
 
-From 641787d4ff598a11ffdb444a55ecb0db206d2bae Mon Sep 17 00:00:00 2001
+From 1e06ac629459d93f07faac0cd3181731f5f80f7a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 3 Nov 2020 13:28:04 +0100
 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@@ -1078,7 +1078,7 @@ index a95ebac06e13..4ec2ae72f632 100644
 -- 
 2.31.1
 
-From 8a4ae1e71caaa86b3b3cb2317554babbc992addf Mon Sep 17 00:00:00 2001
+From 29c515485af77326c8133fe66c62fd73c584f007 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sun, 28 Mar 2021 21:10:06 +0200
 Subject: [PATCH] mwifiex: Try waking the firmware until we get an interrupt
@@ -1167,7 +1167,7 @@ index 6b06f2a76cdc..45dc0bfe26ba 100644
 -- 
 2.31.1
 
-From 9c2e97d2604d8784c97f143a0764835278cf230e Mon Sep 17 00:00:00 2001
+From 13ec36095733c9b4e3491eb639d11a3cd96cd09b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 25 Mar 2021 11:33:02 +0100
 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
@@ -1245,7 +1245,7 @@ index 1b0adf5c2376..283a90928f0e 100644
 -- 
 2.31.1
 
-From 344a1dcf42ef6b7257114dd27ff2c509e8c58f38 Mon Sep 17 00:00:00 2001
+From 1ab54f8aaa85597e14e6c8783ac27da752504ffb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:31:26 +0100
 Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type
@@ -1346,7 +1346,7 @@ index 650191db25cb..5badf7fef37e 100644
 -- 
 2.31.1
 
-From 9ce293468a22681f041f4cb4d8e586c69dac73ef Mon Sep 17 00:00:00 2001
+From 512cb7da6756d971812dbc927f700d7f00beae1f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:44:39 +0100
 Subject: [PATCH] mwifiex: Use function to check whether interface type change
@@ -1579,7 +1579,7 @@ index 5badf7fef37e..e73334679992 100644
 -- 
 2.31.1
 
-From c14b9f7281fab79719aa87588b0b4a4177436d73 Mon Sep 17 00:00:00 2001
+From 89b509e851c8c4ed7e908da6c83dbb8728db39b6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 13:33:04 +0100
 Subject: [PATCH] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION
@@ -1647,7 +1647,7 @@ index e73334679992..99da637692cc 100644
 -- 
 2.31.1
 
-From 1a64da873c980ba44b7912c7a029849b7e36b896 Mon Sep 17 00:00:00 2001
+From d73c923b020030f924e9ace0a9cae681d3c697f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 14:42:54 +0100
 Subject: [PATCH] mwifiex: Use helper function for counting interface types
@@ -1823,7 +1823,7 @@ index 99da637692cc..feb3a858d8c1 100644
 -- 
 2.31.1
 
-From 28a97a34b6b399435390208af5b9feaf53c82b32 Mon Sep 17 00:00:00 2001
+From 8c97fa4be0ccb94ca11f51b31d8c7831344664cc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:56:58 +0100
 Subject: [PATCH] mwifiex: Update virtual interface counters right after
@@ -1926,7 +1926,7 @@ index feb3a858d8c1..54d9e789aa14 100644
 -- 
 2.31.1
 
-From 22d207561facfabf24fe2730dbfeef6054ad68a9 Mon Sep 17 00:00:00 2001
+From aca2858e16b653898a6d8e48369a5007f423cefb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 13:42:40 +0100
 Subject: [PATCH] mwifiex: Allow switching interface type from P2P_CLIENT to
@@ -2015,7 +2015,7 @@ index 54d9e789aa14..ec5ed00b4b89 100644
 -- 
 2.31.1
 
-From e59c6ded774773fc82dd8e72563bdd8aacea9903 Mon Sep 17 00:00:00 2001
+From f691465e501cc8f33040b66756008f4cd387877e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:31:08 +0100
 Subject: [PATCH] mwifiex: Handle interface type changes from AP to STATION
@@ -2042,7 +2042,7 @@ index ec5ed00b4b89..0fc554abfea3 100644
 -- 
 2.31.1
 
-From e589acbb316c3d22fe92b879894f4373336dae24 Mon Sep 17 00:00:00 2001
+From 8c038b668306afa9a5708a96cf34fdbade785d40 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:32:16 +0100
 Subject: [PATCH] mwifiex: Properly initialize private structure on interface
@@ -2097,7 +2097,7 @@ index 0fc554abfea3..7c6d31eb058c 100644
 -- 
 2.31.1
 
-From 92509b4c26503824665928fd299bfb7153c3cfdf Mon Sep 17 00:00:00 2001
+From 427ed42bb4a82f036d71601b60a830435b860ce7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sat, 27 Mar 2021 12:19:14 +0100
 Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual
@@ -2129,3 +2129,443 @@ index 7c6d31eb058c..16a94f06a518 100644
 -- 
 2.31.1
 
+From 67bb17da07e50c8819e31cb66a879f6881340b3b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 14:30:28 +0200
+Subject: [PATCH] mwifiex: Deactive host sleep using HSCFG after it was
+ activated manually
+
+When powersaving (so either wifi powersaving or deep sleep, depending on
+which state the firmware is in) is disabled, the way the firmware goes
+into host sleep is different: Usually the firmware implicitely enters
+host sleep on the next SLEEP event we get when we configured host sleep
+via HSCFG before. When powersaving is disabled though, there are no
+SLEEP events, the way we enter host sleep in that case is different: The
+firmware will send us a HS_ACT_REQ event and after that we "manually"
+make the firmware enter host sleep by sending it another HSCFG command
+with the action HS_ACTIVATE.
+
+Now waking up from host sleep appears to be different depending on
+whether powersaving is enabled again: When powersaving is enabled, the
+firmware implicitely leaves host sleep as soon as it wakes up and sends
+us an AWAKE event. When powersaving is disabled though, it apparently
+doesn't implicitely leave host sleep, but instead we need to send it a
+HSCFG command with the HS_CONFIGURE action and the HS_CFG_CANCEL
+condition. We didn't do that so far, which is why waking up from host
+sleep was broken when powersaving is disabled.
+
+So add some additional state to mwifiex_adapter where we keep track of
+whether host sleep was activated manually via HS_ACTIVATE, and if that
+was the case, deactivate it manually again via HS_CFG_CANCEL.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c | 21 +++++++++++++++++++
+ drivers/net/wireless/marvell/mwifiex/main.c   | 18 ++++++++++++++++
+ drivers/net/wireless/marvell/mwifiex/main.h   |  1 +
+ .../net/wireless/marvell/mwifiex/sta_cmd.c    |  4 ++++
+ 4 files changed, 44 insertions(+)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+index 60db2b969e20..c7db969aa11d 100644
+--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
++++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+@@ -604,6 +604,11 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no,
+ 		return -1;
+ 	}
+ 
++	if (priv->adapter->hs_activated_manually &&
++	    cmd_no != HostCmd_CMD_802_11_HS_CFG_ENH) {
++		mwifiex_cancel_hs(priv, MWIFIEX_ASYNC_CMD);
++		priv->adapter->hs_activated_manually = false;
++	}
+ 
+ 	/* Get a new command node */
+ 	cmd_node = mwifiex_get_cmd_node(adapter);
+@@ -711,6 +716,15 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
+ 		}
+ 	}
+ 
++	/* Same with exit host sleep cmd, luckily that can't happen at the same time as EXIT_PS */
++	if (command == HostCmd_CMD_802_11_HS_CFG_ENH) {
++		struct host_cmd_ds_802_11_hs_cfg_enh *hs_cfg =
++			&host_cmd->params.opt_hs_cfg;
++
++		if (le16_to_cpu(hs_cfg->action) == HS_ACTIVATE)
++				add_tail = false;
++	}
++
+ 	spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+ 	if (add_tail)
+ 		list_add_tail(&cmd_node->list, &adapter->cmd_pending_q);
+@@ -1215,6 +1229,13 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter)
+ 		    __func__);
+ 
+ 	adapter->if_ops.wakeup(adapter);
++
++	if (adapter->hs_activated_manually) {
++		mwifiex_cancel_hs(mwifiex_get_priv (adapter, MWIFIEX_BSS_ROLE_ANY),
++				  MWIFIEX_ASYNC_CMD);
++		adapter->hs_activated_manually = false;
++	}
++
+ 	adapter->hs_activated = false;
+ 	clear_bit(MWIFIEX_IS_HS_CONFIGURED, &adapter->work_flags);
+ 	clear_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags);
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
+index ceac611ef086..fd55f502dd2e 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.c
++++ b/drivers/net/wireless/marvell/mwifiex/main.c
+@@ -402,6 +402,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 		     !adapter->scan_processing) &&
+ 		    !adapter->data_sent &&
+ 		    !skb_queue_empty(&adapter->tx_data_q)) {
++			if (adapter->hs_activated_manually) {
++				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),
++						  MWIFIEX_ASYNC_CMD);
++				adapter->hs_activated_manually = false;
++			}
++
+ 			mwifiex_process_tx_queue(adapter);
+ 			if (adapter->hs_activated) {
+ 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,
+@@ -419,6 +425,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 		    !mwifiex_bypass_txlist_empty(adapter) &&
+ 		    !mwifiex_is_tdls_chan_switching
+ 			(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA))) {
++			if (adapter->hs_activated_manually) {
++				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),
++						  MWIFIEX_ASYNC_CMD);
++				adapter->hs_activated_manually = false;
++			}
++
+ 			mwifiex_process_bypass_tx(adapter);
+ 			if (adapter->hs_activated) {
+ 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,
+@@ -435,6 +447,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 		    !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter) &&
+ 		    !mwifiex_is_tdls_chan_switching
+ 			(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA))) {
++			if (adapter->hs_activated_manually) {
++				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),
++						  MWIFIEX_ASYNC_CMD);
++				adapter->hs_activated_manually = false;
++			}
++
+ 			mwifiex_wmm_process_tx(adapter);
+ 			if (adapter->hs_activated) {
+ 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
+index 7e526014b638..96395854c085 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.h
++++ b/drivers/net/wireless/marvell/mwifiex/main.h
+@@ -986,6 +986,7 @@ struct mwifiex_adapter {
+ 	struct timer_list wakeup_timer;
+ 	struct mwifiex_hs_config_param hs_cfg;
+ 	u8 hs_activated;
++	u8 hs_activated_manually;
+ 	u16 hs_activate_wait_q_woken;
+ 	wait_queue_head_t hs_activate_wait_q;
+ 	u8 event_body[MAX_EVENT_SIZE];
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+index 4ed10cf82f9a..057c810a9ef7 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+@@ -396,6 +396,10 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
+ 	if (hs_activate) {
+ 		hs_cfg->action = cpu_to_le16(HS_ACTIVATE);
+ 		hs_cfg->params.hs_activate.resp_ctrl = cpu_to_le16(RESP_NEEDED);
++
++		adapter->hs_activated_manually = true;
++		mwifiex_dbg(priv->adapter, CMD,
++			    "cmd: Activating host sleep manually\n");
+ 	} else {
+ 		hs_cfg->action = cpu_to_le16(HS_CONFIGURE);
+ 		hs_cfg->params.hs_config.conditions = hscfg_param->conditions;
+-- 
+2.31.1
+
+From 85532e1cc361d5a003fc7eb934268f95a824786e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 14:23:05 +0200
+Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain
+ hardware revision
+
+The 88W8897 pcie card with the hardware revision 20 apparently has a
+hardware issue where the card wakes up from deep sleep randomly and very
+often, somewhat depending on the card activity, maybe the hardware has a
+floating wakeup pin or something.
+
+Those continuous wakeups prevent the card from entering host sleep when
+the computer suspends. And because the host won't answer to events from
+the card anymore while it's suspended, the firmwares internal
+powersaving state machine seems to get confused and the card can't sleep
+anymore at all after that.
+
+Since we can't work around that hardware bug in the firmware, let's
+get the hardware revision string from the firmware and match it with
+known bad revisions. Then disable auto deep sleep for those revisions,
+which makes sure we no longer get those spurious wakeups.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/main.c      | 14 ++++++++++++++
+ drivers/net/wireless/marvell/mwifiex/main.h      |  1 +
+ .../net/wireless/marvell/mwifiex/sta_cmdresp.c   | 16 ++++++++++++++++
+ 3 files changed, 31 insertions(+)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
+index fd55f502dd2e..7159033fcc2e 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.c
++++ b/drivers/net/wireless/marvell/mwifiex/main.c
+@@ -227,6 +227,19 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
+ 	return 0;
+ }
+ 
++static void maybe_quirk_fw_disable_ds(struct mwifiex_adapter *adapter)
++{
++	struct mwifiex_private *priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
++	struct mwifiex_ver_ext ver_ext;
++
++	set_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &adapter->work_flags);
++
++	memset(&ver_ext, 0, sizeof(ver_ext));
++	ver_ext.version_str_sel = 1;
++	mwifiex_send_cmd(priv, HostCmd_CMD_VERSION_EXT,
++			 HostCmd_ACT_GEN_GET, 0, &ver_ext, false);
++}
++
+ /*
+  * The main process.
+  *
+@@ -357,6 +370,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 			if (adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE) {
+ 				adapter->hw_status = MWIFIEX_HW_STATUS_READY;
+ 				mwifiex_init_fw_complete(adapter);
++				maybe_quirk_fw_disable_ds(adapter);
+ 			}
+ 		}
+ 
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
+index 96395854c085..fa84258f042a 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.h
++++ b/drivers/net/wireless/marvell/mwifiex/main.h
+@@ -524,6 +524,7 @@ enum mwifiex_adapter_work_flags {
+ 	MWIFIEX_IS_SUSPENDED,
+ 	MWIFIEX_IS_HS_CONFIGURED,
+ 	MWIFIEX_IS_HS_ENABLING,
++	MWIFIEX_IS_REQUESTING_FW_VEREXT,
+ };
+ 
+ struct mwifiex_band_config {
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+index 7003767eef42..3079ca3e3fdc 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+@@ -708,6 +708,22 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,
+ {
+ 	struct host_cmd_ds_version_ext *ver_ext = &resp->params.verext;
+ 
++	if (test_and_clear_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &priv->adapter->work_flags)) {
++		if (strncmp(ver_ext->version_str, "ChipRev:20, BB:9b(10.00), RF:40(21)", 128) == 0) {
++			struct mwifiex_ds_auto_ds auto_ds = {
++				.auto_ds = DEEP_SLEEP_OFF,
++			};
++
++			mwifiex_dbg(priv->adapter, MSG,
++				    "Bad HW revision detected, disabling deep sleep\n");
++
++			mwifiex_send_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,
++					 DIS_AUTO_PS, BITMAP_AUTO_DS, &auto_ds, false);
++		}
++
++		return 0;
++	}
++
+ 	if (version_ext) {
+ 		version_ext->version_str_sel = ver_ext->version_str_sel;
+ 		memcpy(version_ext->version_str, ver_ext->version_str,
+-- 
+2.31.1
+
+From 41fb0fbc01a1a6b63593f966640df0c88015e974 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Wed, 11 Nov 2020 15:17:07 +0100
+Subject: [PATCH] mwifiex: Don't log error on suspend if wake-on-wlan is
+ disabled
+
+It's not an error if someone chooses to put their computer to sleep, not
+wanting it to wake up because the person next door has just discovered
+what a magic packet is. So change the loglevel of this annoying message
+from ERROR to INFO.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+index 16a94f06a518..92d5c9aa5ec7 100644
+--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
++++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+@@ -3457,7 +3457,7 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
+ 	}
+ 
+ 	if (!wowlan) {
+-		mwifiex_dbg(adapter, ERROR,
++		mwifiex_dbg(adapter, INFO,
+ 			    "None of the WOWLAN triggers enabled\n");
+ 		ret = 0;
+ 		goto done;
+-- 
+2.31.1
+
+From 142526e86b5ed0b763d9aec1057cad9ca1d795e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Sun, 28 Mar 2021 21:42:54 +0200
+Subject: [PATCH] mwifiex: Log an error on command failure during key-material
+ upload
+
+Sometimes the KEY_MATERIAL command can fail with the 88W8897 firmware
+(when this happens exactly seems pretty random). This appears to prevent
+the access point from starting, so it seems like a good idea to log an
+error in that case.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+index 92d5c9aa5ec7..5786dcea79cc 100644
+--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
++++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+@@ -523,8 +523,14 @@ mwifiex_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
+ 	encrypt_key.is_igtk_def_key = true;
+ 	eth_broadcast_addr(encrypt_key.mac_addr);
+ 
+-	return mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+-				HostCmd_ACT_GEN_SET, true, &encrypt_key, true);
++	if (mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
++			     HostCmd_ACT_GEN_SET, true, &encrypt_key, true)) {
++		mwifiex_dbg(priv->adapter, ERROR,
++			    "Sending KEY_MATERIAL command failed\n");
++		return -1;
++	}
++
++	return 0;
+ }
+ 
+ /*
+-- 
+2.31.1
+
+From bd0c5925043a97c97f64cc9bda61659c878481dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 12:44:03 +0200
+Subject: [PATCH] mwifiex: Fix an incorrect comment
+
+We're sending DELBA requests here, not ADDBA requests.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/11n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c
+index 5d75c971004b..b36b2103d555 100644
+--- a/drivers/net/wireless/marvell/mwifiex/11n.c
++++ b/drivers/net/wireless/marvell/mwifiex/11n.c
+@@ -127,7 +127,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
+ 					   tx_ba_tbl->ra);
+ 	} else { /*
+ 		  * In case of failure, recreate the deleted stream in case
+-		  * we initiated the ADDBA
++		  * we initiated the DELBA
+ 		  */
+ 		if (!INITIATOR_BIT(del_ba_param_set))
+ 			return 0;
+-- 
+2.31.1
+
+From e0b794a9e1eb57fb491dacb40ae55c7d31e4ac1d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 12:45:59 +0200
+Subject: [PATCH] mwifiex: Send DELBA requests according to spec
+
+We're currently failing to set the initiator bit for DELBA requests:
+While we set the bit on our del_ba_param_set bitmask, we forget to
+actually copy that bitmask over to the command struct, which means we
+never actually set the initiator bit.
+
+Fix that and copy the bitmask over to the host_cmd_ds_11n_delba command
+struct.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/11n.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c
+index b36b2103d555..4ed6ae8a96f1 100644
+--- a/drivers/net/wireless/marvell/mwifiex/11n.c
++++ b/drivers/net/wireless/marvell/mwifiex/11n.c
+@@ -664,14 +664,15 @@ int mwifiex_send_delba(struct mwifiex_private *priv, int tid, u8 *peer_mac,
+ 	uint16_t del_ba_param_set;
+ 
+ 	memset(&delba, 0, sizeof(delba));
+-	delba.del_ba_param_set = cpu_to_le16(tid << DELBA_TID_POS);
+ 
+-	del_ba_param_set = le16_to_cpu(delba.del_ba_param_set);
++	del_ba_param_set = tid << DELBA_TID_POS;
++
+ 	if (initiator)
+ 		del_ba_param_set |= IEEE80211_DELBA_PARAM_INITIATOR_MASK;
+ 	else
+ 		del_ba_param_set &= ~IEEE80211_DELBA_PARAM_INITIATOR_MASK;
+ 
++	delba.del_ba_param_set = cpu_to_le16(del_ba_param_set);
+ 	memcpy(&delba.peer_mac_addr, peer_mac, ETH_ALEN);
+ 
+ 	/* We don't wait for the response of this command */
+-- 
+2.31.1
+
+From f603397580ee3d4ea8b0bb1ef795a0aa72d73113 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 12:57:41 +0200
+Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware
+
+The firmware of the pcie 88W8897 chip sends those events very
+unreliably, which means we sometimes end up actually capping the window
+size while bluetooth is disabled, artifically limiting wifi speeds even
+though it's not needed.
+
+Since we can't fix the firmware, let's just ignore those events, it
+seems that the Windows driver also doesn't change the rx/tx block ack
+buffer sizes when bluetooth gets enabled or disabled, so this is
+consistent with the Windows driver.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
+index a327fc5b36e3..6228971d9b8b 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
+@@ -1058,9 +1058,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
+ 							adapter->event_skb);
+ 		break;
+ 	case EVENT_BT_COEX_WLAN_PARA_CHANGE:
+-		dev_dbg(adapter->dev, "EVENT: BT coex wlan param update\n");
+-		mwifiex_bt_coex_wlan_param_update_event(priv,
+-							adapter->event_skb);
++		dev_dbg(adapter->dev, "EVENT: ignoring BT coex wlan param update\n");
+ 		break;
+ 	case EVENT_RXBA_SYNC:
+ 		dev_dbg(adapter->dev, "EVENT: RXBA_SYNC\n");
+-- 
+2.31.1
+

patches/4.19/0008-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 26fe91842c7a640d6ddfceabfa0b2cbca092411f Mon Sep 17 00:00:00 2001
+From e60340042e6fc20acbc46cfb1909b3a50595028b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 16 Aug 2020 23:39:56 +0200
 Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface

patches/4.19/0009-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 7df4920a59516d804982889b456393f5a30ad589 Mon Sep 17 00:00:00 2001
+From 127b15f1127b83241415552b1adb6a6fac9c25d1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -109,7 +109,7 @@ index 8ba4122fb340..f9a24b56fec0 100644
 -- 
 2.31.1
 
-From e59fdfb99872866899be9fb4fe030abcb8cbd13b Mon Sep 17 00:00:00 2001
+From 1144b9e15cca5e4fc87c2e4a5816aebf503f9b3c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 6 Sep 2020 04:01:19 +0200
 Subject: [PATCH] platform/x86: Add driver for Surface Book 1 dGPU switch

patches/4.19/0010-surface-sam.patch

@@ -1,4 +1,4 @@
-From 69fc71a9f54d04bdf79ca4ad61fa297679b46b29 Mon Sep 17 00:00:00 2001
+From be3abd9293aed06324dbb1fd43a3139cfbd1f0d3 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Mon, 26 Aug 2019 01:15:40 +0200
 Subject: [PATCH] ACPI: Fix buffer/integer type mismatch
@@ -81,7 +81,7 @@ index b272c329d45d..cf547883a993 100644
 -- 
 2.31.1
 
-From 8c4ff2b5bda6db8fb801e52adb7694c1bec82729 Mon Sep 17 00:00:00 2001
+From 114cbb77add118206c5f0fffa33116c7014452ee Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 24 Sep 2019 17:38:12 +0200
 Subject: [PATCH] serdev: Add ACPI devices by ResourceSource field
@@ -269,7 +269,7 @@ index c66a04d24f1d..1b18d12d217f 100644
 -- 
 2.31.1
 
-From ab254e9a2d5c1e7db38c45c877423f6277778039 Mon Sep 17 00:00:00 2001
+From f65b49b8b0c90d2e8e6c78977e677542dde302d2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:23:20 +0200
 Subject: [PATCH] Add file2alias support for Surface Aggregator devices
@@ -370,7 +370,7 @@ index 7f40b6aab689..76e3b1d7db45 100644
 -- 
 2.31.1
 
-From 0f233ac17093dead749ac79e772f062519e9b3ea Mon Sep 17 00:00:00 2001
+From 140baa02d4d494fb9213c7587dcfe97788bcbc5b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:44:30 +0200
 Subject: [PATCH] platform/x86: Add support for Surface System Aggregator
@@ -3291,7 +3291,7 @@ index 000000000000..80e4d185b66f
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/hid/surface-hid/surface_hid_core.c b/drivers/hid/surface-hid/surface_hid_core.c
 new file mode 100644
-index 000000000000..7b27ec392232
+index 000000000000..5571e74abe91
 --- /dev/null
 +++ b/drivers/hid/surface-hid/surface_hid_core.c
 @@ -0,0 +1,272 @@
@@ -3465,9 +3465,9 @@ index 000000000000..7b27ec392232
 +
 +	shid->hid->dev.parent = shid->dev;
 +	shid->hid->bus = BUS_HOST;
-+	shid->hid->vendor = cpu_to_le16(shid->attrs.vendor);
-+	shid->hid->product = cpu_to_le16(shid->attrs.product);
-+	shid->hid->version = cpu_to_le16(shid->hid_desc.hid_version);
++	shid->hid->vendor = get_unaligned_le16(&shid->attrs.vendor);
++	shid->hid->product = get_unaligned_le16(&shid->attrs.product);
++	shid->hid->version = get_unaligned_le16(&shid->hid_desc.hid_version);
 +	shid->hid->country = shid->hid_desc.country_code;
 +
 +	snprintf(shid->hid->name, sizeof(shid->hid->name), "Microsoft Surface %04X:%04X",
@@ -5535,7 +5535,7 @@ index 000000000000..7712baaed6a5
 +#endif /* _SURFACE_AGGREGATOR_BUS_H */
 diff --git a/drivers/platform/x86/surface_aggregator/controller.c b/drivers/platform/x86/surface_aggregator/controller.c
 new file mode 100644
-index 000000000000..2d4feab31b67
+index 000000000000..dd1f0ed9481c
 --- /dev/null
 +++ b/drivers/platform/x86/surface_aggregator/controller.c
 @@ -0,0 +1,2570 @@
@@ -6580,7 +6580,7 @@ index 000000000000..2d4feab31b67
 +	union acpi_object *obj;
 +	u64 val;
 +
-+	if (!(funcs & BIT(func)))
++	if (!(funcs & BIT_ULL(func)))
 +		return 0; /* Not supported, leave *ret at its default value */
 +
 +	obj = acpi_evaluate_dsm_typed(handle, &SSAM_SSH_DSM_GUID,
@@ -16619,7 +16619,7 @@ index a26b402c45d9..c8dd853ee382 100644
 +obj-$(CONFIG_CHARGER_SURFACE)	+= surface_charger.o
 diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c
 new file mode 100644
-index 000000000000..0aef4afdc6bf
+index 000000000000..749eb36538c9
 --- /dev/null
 +++ b/drivers/power/supply/surface_battery.c
 @@ -0,0 +1,806 @@
@@ -17368,7 +17368,7 @@ index 000000000000..0aef4afdc6bf
 +{
 +	return spwr_battery_recheck_full(dev_get_drvdata(dev));
 +}
-+SIMPLE_DEV_PM_OPS(surface_battery_pm_ops, NULL, surface_battery_resume);
++static SIMPLE_DEV_PM_OPS(surface_battery_pm_ops, NULL, surface_battery_resume);
 +
 +static int surface_battery_probe(struct ssam_device *sdev)
 +{
@@ -17431,7 +17431,7 @@ index 000000000000..0aef4afdc6bf
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
 new file mode 100644
-index 000000000000..4b30b482b457
+index 000000000000..560da0c301c1
 --- /dev/null
 +++ b/drivers/power/supply/surface_charger.c
 @@ -0,0 +1,282 @@
@@ -17663,7 +17663,7 @@ index 000000000000..4b30b482b457
 +{
 +	return spwr_ac_recheck(dev_get_drvdata(dev));
 +}
-+SIMPLE_DEV_PM_OPS(surface_ac_pm_ops, NULL, surface_ac_resume);
++static SIMPLE_DEV_PM_OPS(surface_ac_pm_ops, NULL, surface_ac_resume);
 +
 +static int surface_ac_probe(struct ssam_device *sdev)
 +{

patches/4.19/0011-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From 9ea5dc5bc5976aac913bd3db3e84fa1b66c387ef Mon Sep 17 00:00:00 2001
+From da86ab98828afb22e3d12611d65bf72d6d51ba82 Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Tue, 31 Jul 2018 07:50:37 +0200
 Subject: [PATCH] PCI: pciehp: Differentiate between surprise and safe removal
@@ -197,7 +197,7 @@ index 5c58c22e0c08..18f83e554c73 100644
 -- 
 2.31.1
 
-From 563278bab365acc5e1b2745b0e462a1a3a399f32 Mon Sep 17 00:00:00 2001
+From 458519630e47c29bb500b31854d299b843b3d3af Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Sun, 19 Aug 2018 16:29:00 +0200
 Subject: [PATCH] PCI: pciehp: Drop unnecessary includes
@@ -336,7 +336,7 @@ index 18f83e554c73..c512b2ed85ed 100644
 -- 
 2.31.1
 
-From 055136bd02eb536639f980900b50f31b53faf047 Mon Sep 17 00:00:00 2001
+From f5bce1b654a2b17d8ad48ad3f530dcd93c090cd1 Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Sun, 19 Aug 2018 16:29:00 +0200
 Subject: [PATCH] PCI: pciehp: Drop hotplug_slot_ops wrappers
@@ -549,7 +549,7 @@ index d4b7049cbc70..576362d0b1cd 100644
 -- 
 2.31.1
 
-From d200a6c07344742c21acf74d84c5f61502371d03 Mon Sep 17 00:00:00 2001
+From f08777b1e3e97d618a97307e97f5c6fb7d74d9e2 Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Sat, 8 Sep 2018 09:59:01 +0200
 Subject: [PATCH] PCI: pciehp: Tolerate Presence Detect hardwired to zero
@@ -747,7 +747,7 @@ index 576362d0b1cd..7f4173d6771a 100644
 -- 
 2.31.1
 
-From 60013685dccd7f7865f323ecb8e81111ce40751e Mon Sep 17 00:00:00 2001
+From a724b2d45de25754e69afa03561832b1d5180ce7 Mon Sep 17 00:00:00 2001
 From: Patrick Talbert <ptalbert@redhat.com>
 Date: Wed, 5 Sep 2018 09:12:53 +0200
 Subject: [PATCH] PCI/ASPM: Do not initialize link state when aspm_disabled is
@@ -792,7 +792,7 @@ index cb474338f39d..18aa830e79e4 100644
 -- 
 2.31.1
 
-From b2df07f0cf83c2ed183b7155db9160ffa8d42c1f Mon Sep 17 00:00:00 2001
+From f830f57a0a32c61fa9cd6b92e2a65cebbc5acd4b Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Sun, 19 Aug 2018 16:29:00 +0200
 Subject: [PATCH] PCI: Simplify disconnected marking
@@ -878,7 +878,7 @@ index 2c3b5bd59b18..dee5a7507403 100644
 -- 
 2.31.1
 
-From 864ef1878beb8087cf1c7ba7fce4c3d37c64e6a2 Mon Sep 17 00:00:00 2001
+From bbaa2783c5e4e487df4db2a1d5f785fb60783774 Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Tue, 18 Sep 2018 21:46:17 +0200
 Subject: [PATCH] PCI: pciehp: Unify controller and slot structs
@@ -2070,7 +2070,7 @@ index 8da87931bd45..b9c1396db6fe 100644
 -- 
 2.31.1
 
-From fca4679be3dd92828afcc063e6079ae9b8bb373f Mon Sep 17 00:00:00 2001
+From dee471eab47d4c6c6527ad3d1e16e5e38153bbb7 Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Sat, 8 Sep 2018 09:59:01 +0200
 Subject: [PATCH] PCI: pciehp: Rename controller struct members for clarity
@@ -2377,7 +2377,7 @@ index 4a17d71e15d3..e4d6ec960630 100644
 -- 
 2.31.1
 
-From 7030ad6a698bc505d2af0dd13db4913cea1b45fe Mon Sep 17 00:00:00 2001
+From 9db017b74752840f5d5c3d6661ca796c594ff7ad Mon Sep 17 00:00:00 2001
 From: Lukas Wunner <lukas@wunner.de>
 Date: Sat, 8 Sep 2018 09:59:01 +0200
 Subject: [PATCH] PCI: pciehp: Reshuffle controller struct for clarity
@@ -2508,7 +2508,7 @@ index 2499489158cc..df82a0335515 100644
 -- 
 2.31.1
 
-From 9a58d3ffa5ffde32585efe30cbbac5b18047745b Mon Sep 17 00:00:00 2001
+From 36f2e4792aad437364169cbb9e6f330b8acb9c9f Mon Sep 17 00:00:00 2001
 From: Keith Busch <keith.busch@intel.com>
 Date: Thu, 20 Sep 2018 10:27:17 -0600
 Subject: [PATCH] PCI: Make link active reporting detection generic
@@ -2705,7 +2705,7 @@ index ec6c48ecd7d5..74c8e9190fed 100644
 -- 
 2.31.1
 
-From 2a6ce44b116ec8858d601976996f8685cd5da6ab Mon Sep 17 00:00:00 2001
+From 0d9304cfbffe968534dbf0da6c8b947f56e5df1b Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:53:53 -0500
 Subject: [PATCH] PCI: Do not skip power-managed bridges in pci_enable_wake()
@@ -2756,7 +2756,7 @@ index 2d437c40f83b..4a874e8fa1d5 100644
 -- 
 2.31.1
 
-From c12b026ebd845b20f9dfeca3f42c5ce4c785c14b Mon Sep 17 00:00:00 2001
+From 879979682af005a19245fc456e7065e4d42e3fef Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:38:19 -0500
 Subject: [PATCH] PCI: pciehp: Disable hotplug interrupt during suspend
@@ -2870,7 +2870,7 @@ index 0693870a9e24..b5c7f5ef597a 100644
 -- 
 2.31.1
 
-From 93c933a2c440783ab35656050aacbf6d28ddce9c Mon Sep 17 00:00:00 2001
+From 92e5cabaa87688886169f08fae25718da54ffc1d Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:41:46 -0500
 Subject: [PATCH] PCI: pciehp: Do not handle events if interrupts are masked
@@ -2912,7 +2912,7 @@ index b5c7f5ef597a..242b9f30210a 100644
 -- 
 2.31.1
 
-From 7e76487fea4f4329159b0744c5ca10bc77f441f3 Mon Sep 17 00:00:00 2001
+From 919ab6e03de1eafbff857cdeaf97decb1b86ec54 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:41:47 -0500
 Subject: [PATCH] PCI/portdrv: Resume upon exit from system suspend if left
@@ -2965,7 +2965,7 @@ index 23a5a0c2c3fe..5badf8a1ce0a 100644
 -- 
 2.31.1
 
-From 1d3049a424616289c76506c409c8d3917506e198 Mon Sep 17 00:00:00 2001
+From 3625ebb484cd7da7ecad329f2bd430d32627ec3c Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:41:48 -0500
 Subject: [PATCH] PCI/portdrv: Add runtime PM hooks for port service drivers
@@ -3077,7 +3077,7 @@ index 5badf8a1ce0a..59d2567e2db2 100644
 -- 
 2.31.1
 
-From ba285a99a9115572b79aaf6d07c48f295a5e801e Mon Sep 17 00:00:00 2001
+From e43abe7ab035712c27e25ee36aea27e378ad8d25 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:41:49 -0500
 Subject: [PATCH] PCI: pciehp: Implement runtime PM callbacks
@@ -3134,7 +3134,7 @@ index 8e6e4ce869fb..e5de25ebc4cf 100644
 -- 
 2.31.1
 
-From fa6d4b666d30cd838647d120f3de1b4816d1c65a Mon Sep 17 00:00:00 2001
+From a69a1c5f31c170e5ebc5d010fc45f10763726218 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:57:05 -0500
 Subject: [PATCH] ACPI / property: Allow multiple property compatible _DSD
@@ -3429,7 +3429,7 @@ index 019468f072b7..2b2d92863923 100644
 -- 
 2.31.1
 
-From 1473e7800f86b94686b7ee13ff151e1b6c789d26 Mon Sep 17 00:00:00 2001
+From 26af51aa2e0d532171b1c6322838513475d24ef6 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 27 Sep 2018 16:57:14 -0500
 Subject: [PATCH] PCI / ACPI: Whitelist D3 for more PCIe hotplug ports
@@ -3594,7 +3594,7 @@ index e9ede82ee2c2..0a5efc437bd1 100644
 -- 
 2.31.1
 
-From d64d15ef19dc983b9db359425066c04ec54f7c7a Mon Sep 17 00:00:00 2001
+From 64aec19e3c8235ec093c2293639dffedd0b68638 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 7 Jan 2019 16:09:40 +0300
 Subject: [PATCH] PCI: pciehp: Assign ctrl->slot_ctrl before writing it to
@@ -3648,7 +3648,7 @@ index 242b9f30210a..7074d4923811 100644
 -- 
 2.31.1
 
-From 16af9df552ec67ee08687549605f3697e4fdf730 Mon Sep 17 00:00:00 2001
+From 61770ca4f0ac7836e68c90454cb3152193dae2d4 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Thu, 31 Jan 2019 20:07:46 +0300
 Subject: [PATCH] PCI: pciehp: Disable Data Link Layer State Changed event on
@@ -3737,7 +3737,7 @@ index 7074d4923811..a37ff79a6e9e 100644
 -- 
 2.31.1
 
-From cbeea26e49897efe9cf307daecaa42347e698287 Mon Sep 17 00:00:00 2001
+From 9191c5b4b0a0fb6bf2d2acc2e2620d8ebe8bc130 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 29 Oct 2020 22:04:38 +0100
 Subject: [PATCH] PCI: Allow D3cold for hot-plug ports on Surface Books
@@ -3822,7 +3822,7 @@ index a60eb5780cc0..65bb9c2c1a5b 100644
 -- 
 2.31.1
 
-From be482acfad439c138ac32a376b7fd59b141f7383 Mon Sep 17 00:00:00 2001
+From 30e8d3da6efe4b72b1fcc8f0e10ecf785d63bde1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 31 Oct 2020 20:46:33 +0100
 Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
@@ -3895,7 +3895,7 @@ index 1edf5a1836ea..ee1518650d55 100644
 -- 
 2.31.1
 
-From abcff27cb782586dc517f4eaa4085602fe7e1604 Mon Sep 17 00:00:00 2001
+From d717c4423989b65a07a147c59276f09665530cc4 Mon Sep 17 00:00:00 2001
 From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 Date: Tue, 16 Mar 2021 16:51:40 +0100
 Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags()
@@ -3963,7 +3963,7 @@ index 65bb9c2c1a5b..5f3f35d314c3 100644
 -- 
 2.31.1
 
-From 211b648cf0c4a21e2f7708e1a801e6d165aadaa2 Mon Sep 17 00:00:00 2001
+From 29db4b198ead54458e3a76ff001fa88f4903dfb5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 14 Dec 2020 20:50:59 +0100
 Subject: [PATCH] platform/x86: Add Surface Hotplug driver

patches/4.19/0012-surface-typecover.patch

@@ -1,4 +1,4 @@
-From fa44bcc6cf245545358b6ab1a01a56e5a08fc728 Mon Sep 17 00:00:00 2001
+From d372ec94cebabffeb4b3528c10b3a25f5dea01d2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when

patches/4.19/0013-ath10k-firmware-override.patch

@@ -1,4 +1,4 @@
-From 24fd22ba375f4654e469b428c79eb7a845436798 Mon Sep 17 00:00:00 2001
+From b30f7d4160ebf50cf2be9d7021cc71032ca244bf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Feb 2021 00:45:52 +0100
 Subject: [PATCH] ath10k: Add module parameters to override board files

pkg/arch/kernel-lts/PKGBUILD

@@ -45,19 +45,19 @@ sha256sums=('d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631'
             '4e68572e7cc4c5368f0236e0792660ae8498373988625dca46e509399a7eaea6'
             'a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2'
             'c523d8ba9f02992c34b325cd7b07e27bfead33ecab29877e659a12b2d56b1118'
-            '28d0590c7d80c78a3241b3bc02f8f1c9740e29836e5219390b9bd2e74294d275'
-            '714104ee77c2cbaa85ed898038b86187e4bcad55303c7fb53a289b118958e033'
-            '71478881042d360c743806dfdbba8ece05d2c1ad9629d9d73cef60b5fd4d0f1b'
-            'b5399a2c1bbb7355e7873445e1831d16c0de6d3f07fb6822f4998d68a1a35631'
-            'ee37069a260b0cb5e478eb62471714faba516edbaa387637188e7ee1b2ae308a'
-            'e7b55a844072a6929c71114cd2f411fb9d2b93bb5ac1190b97d82a7fcfadbe06'
-            '53b6608d17a58c347ab1de8aaf030bf2ef153586c9f34799c34ca9142b001f5f'
-            'bf64c846e8667aa09f17a0c3cdc54bb4f4c5bd5c37a6be88e514860771f9b956'
-            '7ad639a41c5dce7c06fdad16c9ccb4a822f715a75ebca652a914f9b58cbae22a'
-            '6f2d0ca2bef37961c6dedf6b2175dd0f738d9b5b79d4b8dc1921b3e157bf705f'
-            '3868ec90be5782a5b291d8967a407aab4bdc3d84a85e1fc351e33d406c9e5c2d'
-            'bfca8cd52316357a1ee3c0cc7892a3b27788e0d3a3e4145c71be8094b02f76a7'
-            'af63dd5479626119df2dcb85b850c1111b8666f4292d1c74f123ad62fe6f687b')
+            'bc82d40637533fe8f52d631a19b96ad4b7d852cecd88e5205b02dd2d10ec14cf'
+            '7c0c01f4bb0a18da95101725411167e397d04af83e0ffaf4e7d649d1bbf5fa68'
+            'd6a91761a414525c0fb45e07e54eb5a861fa8001f5087c18c18fe9b566e8aa62'
+            '1e38faf6ea8476ebc7dfe4b12bd8e2428083021a8a51f5360ddb02e26f679eec'
+            '611345776745f90ea1f4ee81e35d4b3787860d6987f0ce5c245555b291ee58d1'
+            '50e48cd1e9c39c17660858ef41fcbe97f5f7e7ebb26392c170874959bd45f206'
+            '3682a449ff5d4087f311b9e7ce9ffed870c71721acdbcbafaca4b6a5463b076e'
+            '603bfef4d9518cf04ed3da6936db4b71e430b56428306cd90f710654da5867f4'
+            'c944b1a39fa3a29eee51c1628c8d9bae0c5119b1d4ef4085b400607ca4319ce5'
+            '95cccbd8cb7be326beb8eca92b598ad1fb08486d43cf958675771f0d2b634f6c'
+            '0049dad9dd0f1c9da423f3d713b4e2970fbda65db4bf410b92bde40913d9dcb6'
+            '2f8de7da3ff52858bb7a7235d8638d4ffad1caad456b0de2b7a7487ae6dfba03'
+            'e03770d4013dbdab2284db32a995ffabd120f08715ddff95de3909a84b722537')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase