Update v4.19 patches

Changes:
 - Update patches to latest minor version, drop redundant/integrated
   patches

Links:
 - kernel: ec127183ca
This commit is contained in:
Maximilian Luz 2021-01-08 00:12:44 +01:00
parent 25ab2cf75e
commit 3e9fe9ff06
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
12 changed files with 113 additions and 190 deletions

View file

@ -1,4 +1,4 @@
From ea05b8e441f865c22b1ee1a0cc5e580865b7c27d Mon Sep 17 00:00:00 2001
From abda0c086f5deb52af8025915ab5a6d9292752c3 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
@ -653,5 +653,5 @@ index 000000000000..e0af01a60302
+MODULE_DESCRIPTION("mshw0011 driver");
+MODULE_LICENSE("GPL v2");
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From 404ac33f4a2841d0b0943d7a66fedde999dee06d Mon Sep 17 00:00:00 2001
From 3722508a3f71efb15c83555a654b1a566a40f096 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
@ -85,5 +85,5 @@ index 055d83b6cb68..acf64302a2b2 100644
channel_clear_bit(dw, MASK.XFER, dwc->mask);
channel_clear_bit(dw, MASK.BLOCK, dwc->mask);
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From b60a239715f41e4167f6c14d3fc48ee8e2d93b29 Mon Sep 17 00:00:00 2001
From 4672281bd5a7237a11bd9c94c041adb99fab28bf 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
@ -97,5 +97,5 @@ index 91bb99b69601..8418938b32ad 100644
};
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From 9b067ab4ee7931c66170dce2096427d4dc3ecb68 Mon Sep 17 00:00:00 2001
From 7549da167a139c947d5238e77d720637168cab41 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
@ -90,9 +90,9 @@ index 1b491690ce07..96627627060e 100644
if (!button)
return -ENOMEM;
--
2.29.2
2.30.0
From 59b37a50b080aecc01ead2cd54d7506fcfb82828 Mon Sep 17 00:00:00 2001
From bed1596b7ecff0b62012295f4692222fff597d69 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
@ -295,9 +295,9 @@ index 55cd6e0b409c..8f21c062c85d 100644
};
--
2.29.2
2.30.0
From 4a7c92c8cecf718e9dda6db9fcb4cfd192e2e79c Mon Sep 17 00:00:00 2001
From 905c550d36d4b802ca7b2bc53af9f676ffa17ed9 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
@ -384,9 +384,9 @@ index 8f21c062c85d..5983733d78dd 100644
}
--
2.29.2
2.30.0
From 061e9f71d3ffaa7f9acb94eb215149bb4383b7a3 Mon Sep 17 00:00:00 2001
From d56203a17572ba5b7a6c39c45d0f0ecb05cdac82 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
@ -436,5 +436,5 @@ index 5983733d78dd..c564ea99f47d 100644
return 0;
}
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From 0ceb0e4e3244e9686a7da57a23f5671af0444c4f Mon Sep 17 00:00:00 2001
From c6380b40cdbba49d5cca55a2984fae1ffadbe485 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
@ -330,5 +330,5 @@ index 2fda9893962d..ec6c48ecd7d5 100644
#ifdef CONFIG_PCIEAER
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From e1c554386c1542bbaac013deebc12186bfc83012 Mon Sep 17 00:00:00 2001
From c53c96d304162cef30bb7a2012e133ac24142328 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
@ -7310,5 +7310,5 @@ index 000000000000..f229a3436851
+
+#endif // IPTS_H
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From e2cb6002ad0d5b8dadc583b83b6dcbad8112f8f4 Mon Sep 17 00:00:00 2001
From af8cf419a3eddc4765ad73f62b8f44b9c3a77e67 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
@ -47,9 +47,9 @@ index 991b9cc18000..2aa0436d3548 100644
if (!card->adapter) {
dev_err(dev, "adapter structure is not valid\n");
--
2.29.2
2.30.0
From 4ef5848b3a6b6e3ad6d25015d714cb0ef043a048 Mon Sep 17 00:00:00 2001
From 05f4f9d3be82b8bee5961bdfe8082e451f3dcedc Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Thu, 24 Sep 2020 18:02:06 +0900
Subject: [PATCH] mwifiex: pcie: skip cancel_work_sync() on reset failure path
@ -204,9 +204,9 @@ index f7ce9b6db6b4..72d0c01ff359 100644
static inline int
--
2.29.2
2.30.0
From df82311ad613a566535e4a3eb550c0e1c2bb2448 Mon Sep 17 00:00:00 2001
From f3ad5b6e2abc0bc20fcc505fab5e9a4aa684d26c 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
@ -412,9 +412,9 @@ index 000000000000..5326ae7e5671
+
+void mwifiex_initialize_quirks(struct pcie_service_card *card);
--
2.29.2
2.30.0
From 256adaaacce86130cac8b61cd9a3170e4ad014ee Mon Sep 17 00:00:00 2001
From b57a393c55a6e9edec973f77965838026a2990d1 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+
@ -613,9 +613,9 @@ index 5326ae7e5671..8b9dcb5070d8 100644
void mwifiex_initialize_quirks(struct pcie_service_card *card);
+int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
--
2.29.2
2.30.0
From a08b34569754b6910481ed20f61a738580ca1a0d Mon Sep 17 00:00:00 2001
From 2f6dd1f88e1583b2057179fa8a4efdba3d9efe95 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
@ -792,9 +792,9 @@ index 8b9dcb5070d8..3ef7440418e3 100644
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
--
2.29.2
2.30.0
From 752bd285bd7e3a61ab50d253acb9e19803d11a5b Mon Sep 17 00:00:00 2001
From b73fe6f9949f16daa4ab55f440e7a561f5017ac7 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
@ -854,86 +854,9 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
.ident = "Surface Pro 3",
.matches = {
--
2.29.2
2.30.0
From 88f9e49337f72a02024275584363328503e73ea5 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Thu, 24 Sep 2020 01:56:29 +0900
Subject: [PATCH] mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure
When FLR is performed but without fw reset for some reasons (e.g. on
Surface devices, fw reset requires another quirk), it fails to reset
properly. You can trigger the issue on such devices via debugfs entry
for reset:
$ echo 1 | sudo tee /sys/kernel/debug/mwifiex/mlan0/reset
and the resulting dmesg log:
mwifiex_pcie 0000:03:00.0: Resetting per request
mwifiex_pcie 0000:03:00.0: info: successfully disconnected from [BSSID]: reason code 3
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: info: shutdown mwifiex...
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: PREP_CMD: card is removed
mwifiex_pcie 0000:03:00.0: WLAN FW already running! Skip FW dnld
mwifiex_pcie 0000:03:00.0: WLAN FW is active
mwifiex_pcie 0000:03:00.0: Unknown api_id: 4
mwifiex_pcie 0000:03:00.0: info: MWIFIEX VERSION: mwifiex 1.0 (15.68.19.p21)
mwifiex_pcie 0000:03:00.0: driver_version = mwifiex 1.0 (15.68.19.p21)
mwifiex_pcie 0000:03:00.0: info: trying to associate to '[SSID]' bssid [BSSID]
mwifiex_pcie 0000:03:00.0: info: associated to bssid [BSSID] successfully
mwifiex_pcie 0000:03:00.0: cmd_wait_q terminated: -110
mwifiex_pcie 0000:03:00.0: info: successfully disconnected from [BSSID]: reason code 15
mwifiex_pcie 0000:03:00.0: cmd_wait_q terminated: -110
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: cmd_wait_q terminated: -110
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
mwifiex_pcie 0000:03:00.0: cmd_wait_q terminated: -110
mwifiex_pcie 0000:03:00.0: deleting the crypto keys
[...]
When comparing mwifiex_shutdown_sw() with mwifiex_pcie_remove(), it
lacks mwifiex_init_shutdown_fw().
This commit fixes mwifiex_shutdown_sw() by adding the missing
mwifiex_init_shutdown_fw().
Fixes: 4c5dae59d2e9 ("mwifiex: add PCIe function level reset support")
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
Patchset: wifi
---
drivers/net/wireless/marvell/mwifiex/main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index e48b47f42554..ceac611ef086 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1474,6 +1474,8 @@ int mwifiex_shutdown_sw(struct mwifiex_adapter *adapter)
priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
mwifiex_deauthenticate(priv, NULL);
+ mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN);
+
mwifiex_uninit_sw(adapter);
if (adapter->if_ops.down_dev)
--
2.29.2
From 8b31843c81a62ed6acaca4daeca22c7735c881a1 Mon Sep 17 00:00:00 2001
From 24f204dc8927c416b04277aa57c460b02fc2db20 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Thu, 24 Sep 2020 01:56:34 +0900
Subject: [PATCH] mwifiex: pcie: use shutdown_sw()/reinit_sw() on
@ -1073,9 +996,9 @@ index 290427c98630..d80eb18fb0d1 100644
return 0;
}
--
2.29.2
2.30.0
From 67a2170b51c14ec13189b04fd936a4bd9f6c7fb9 Mon Sep 17 00:00:00 2001
From 04b5b8d8f01a78f21993963435833c8e0f0f9a2c Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Mon, 24 Aug 2020 17:11:35 +0900
Subject: [PATCH] mwifiex: pcie: add enable_device_dump module parameter
@ -1122,9 +1045,9 @@ index d80eb18fb0d1..ea766584d3b7 100644
if (!adapter->devdump_data) {
mwifiex_dbg(adapter, ERROR,
--
2.29.2
2.30.0
From 25cc6abbce1af600a53c17eb6a916a71d0772c12 Mon Sep 17 00:00:00 2001
From 2b21b662e746f381bbf1d5b29380db2e9dc092ff 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+
@ -1277,9 +1200,9 @@ index 3ef7440418e3..a95ebac06e13 100644
void mwifiex_initialize_quirks(struct pcie_service_card *card);
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
--
2.29.2
2.30.0
From 791ff4dd18e55ae666086f26577e2f98668206b9 Mon Sep 17 00:00:00 2001
From 6c7cd975c9cde9debad4de3b631286b6f075a577 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 4 Oct 2020 00:25:48 +0900
Subject: [PATCH] mwifiex: add allow_ps_mode module parameter
@ -1339,9 +1262,9 @@ index 650191db25cb..dd1f08a2325f 100644
}
--
2.29.2
2.30.0
From 776602c514b14694443978cc0cb184463395a30f Mon Sep 17 00:00:00 2001
From 847f8961a9e4a1edd0cc6a38f33f1497414e4d78 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 4 Oct 2020 00:38:48 +0900
Subject: [PATCH] mwifiex: print message when changing ps_mode
@ -1374,9 +1297,9 @@ index dd1f08a2325f..ee88da92b97c 100644
}
--
2.29.2
2.30.0
From c04ff884c0fbcbced8078f4b87465ea93cc77b6a Mon Sep 17 00:00:00 2001
From 4f10c703ca0539183c94ee39fb1df0ab89522758 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 4 Oct 2020 00:59:37 +0900
Subject: [PATCH] mwifiex: disable ps_mode explicitly by default instead
@ -1422,5 +1345,5 @@ index 4ed10cf82f9a..ed0fffb9eba6 100644
if (drcs) {
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From c5f9bfe5c2edc0c3ce504b9f042ed3b5c686cce7 Mon Sep 17 00:00:00 2001
From 5c7683789bc9a5f36ee8ebf787392fc263d96e09 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
@ -390,5 +390,5 @@ index 000000000000..247558cdd6c1
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop2:*");
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop3:*");
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From 4ef8b46eab2b1fe549a33134fedc06db8b5dc352 Mon Sep 17 00:00:00 2001
From 89992b2b1dadd8f12c7341222f00944df4bc2d86 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
@ -107,9 +107,9 @@ index 8ba4122fb340..f9a24b56fec0 100644
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
accessor_type, client->addr);
--
2.29.2
2.30.0
From 6ea0b78d00ec5615ee15a83d3a837e68c76e649b Mon Sep 17 00:00:00 2001
From bfc3628c3a2e4b32a07145eb3f7a567e65f48f53 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
@ -330,5 +330,5 @@ index 000000000000..8c66ed5110fd
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
+MODULE_LICENSE("GPL");
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From efe0f9897d636a4d374bdef3979e6b509a7831b1 Mon Sep 17 00:00:00 2001
From 3b3f901478047c16b6497306ccd04a924c9cf0eb 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
@ -79,9 +79,9 @@ index b272c329d45d..cf547883a993 100644
} else { /* IPMI */
--
2.29.2
2.30.0
From c3544cccde74cc95e8b1e5e2ed9513ab94730e23 Mon Sep 17 00:00:00 2001
From e30b724b51ffa5c7598bf79420cfe6c46b58230e 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
@ -267,9 +267,9 @@ index c66a04d24f1d..1b18d12d217f 100644
if (!ctrl->serdev)
return -ENODEV;
--
2.29.2
2.30.0
From c9518ee86a41e95fa811c6da6cff4ad10aeb1c35 Mon Sep 17 00:00:00 2001
From 7039a18212856296a7fca359a98b93f52f7635f5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 17 Aug 2020 01:23:20 +0200
Subject: [PATCH] misc: surface_sam: Add file2alias support for Surface SAM
@ -369,9 +369,9 @@ index 7f40b6aab689..76e3b1d7db45 100644
/* Create MODULE_ALIAS() statements.
--
2.29.2
2.30.0
From 3dcc500fa62f7f77ed3d149f42966cb2c21b0462 Mon Sep 17 00:00:00 2001
From 92e569f14197bf8d680562cf13be9dcee1d2b8b2 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 17 Aug 2020 01:44:30 +0200
Subject: [PATCH] misc: Add support for Surface System Aggregator Module
@ -19921,5 +19921,5 @@ index 76e3b1d7db45..f171616ab318 100644
ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function);
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From 45dd125b670e45422e189d26b5f2c509017ec996 Mon Sep 17 00:00:00 2001
From 25a3ebc002f6396d1ecebb603bf0aa9c0dbe5314 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
@ -195,9 +195,9 @@ index 5c58c22e0c08..18f83e554c73 100644
pci_lock_rescan_remove();
--
2.29.2
2.30.0
From 0e4bf16ef7ac4121c304a6142bea5ec28d75b26d Mon Sep 17 00:00:00 2001
From 1c427628c032b1b54e34c0c6856bc003d533c7a8 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
@ -334,9 +334,9 @@ index 18f83e554c73..c512b2ed85ed 100644
#include <linux/types.h>
#include <linux/pci.h>
--
2.29.2
2.30.0
From 3509e289ab82e6774a8c2b013a369444477d1c68 Mon Sep 17 00:00:00 2001
From f113a6dc9845e5de5328d6bf50a5fe2b0523f1f6 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
@ -547,9 +547,9 @@ index d4b7049cbc70..576362d0b1cd 100644
struct pci_dev *pdev = ctrl_dev(ctrl);
u16 stat_mask = 0, ctrl_mask = 0;
--
2.29.2
2.30.0
From 425bd90206d80e31b97a4d33958eb1e2ae42758c Mon Sep 17 00:00:00 2001
From c54eb76582164734f26f862b279911ed91d40197 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
@ -745,9 +745,9 @@ index 576362d0b1cd..7f4173d6771a 100644
pciehp_power_off_slot(ctrl->slot);
}
--
2.29.2
2.30.0
From c7f25467a13f2b23330316bf4580ae7fc2d0e9b3 Mon Sep 17 00:00:00 2001
From c5fe626cb6e288f6796ad961e0e4fe225eb7fcc4 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
@ -790,9 +790,9 @@ index cb474338f39d..18aa830e79e4 100644
if (pdev->link_state)
--
2.29.2
2.30.0
From cf688792973b558cfa5897570ebcf7019ddde530 Mon Sep 17 00:00:00 2001
From 33766fc54adfef28b9b2fea6eb72ec8e38febd9c 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
@ -876,9 +876,9 @@ index 2c3b5bd59b18..dee5a7507403 100644
result = reset_link(udev, service);
--
2.29.2
2.30.0
From 968e363e86d2b71bb285310740fa4e7394719a0b Mon Sep 17 00:00:00 2001
From 97e8993d5fdbb69c94be664e8595c4009b9086a7 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
@ -2068,9 +2068,9 @@ index 8da87931bd45..b9c1396db6fe 100644
ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:00\n",
__func__, pci_domain_nr(parent), parent->number);
--
2.29.2
2.30.0
From c272888f8ead49379bc4da5904c9e65c74ab9157 Mon Sep 17 00:00:00 2001
From 2e159fa148c9da8588bd3b68d3a7de6cdeea0f04 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
@ -2375,9 +2375,9 @@ index 4a17d71e15d3..e4d6ec960630 100644
}
--
2.29.2
2.30.0
From f76e7c9a5cbfcae2d4f1148381dc0fb59a3ce67e Mon Sep 17 00:00:00 2001
From 7e8501d382875a0a46ddc55fefbe9f438cacebcc 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
@ -2506,9 +2506,9 @@ index 2499489158cc..df82a0335515 100644
int request_result;
wait_queue_head_t requester;
--
2.29.2
2.30.0
From b85888ae8e89c7ca88bfc436cfa92129bf8b74a0 Mon Sep 17 00:00:00 2001
From 330f0cfac9eacaf4bc0d40129582a899631e717c 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
@ -2608,7 +2608,7 @@ index e4d6ec960630..0693870a9e24 100644
/* Clear all remaining event bits in Slot Status register. */
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 57a87a001b4f..99292b338401 100644
index cd628dd73719..25b0fe79420f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4525,21 +4525,42 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
@ -2703,9 +2703,9 @@ index ec6c48ecd7d5..74c8e9190fed 100644
atomic_t enable_cnt; /* pci_enable_device has been called */
--
2.29.2
2.30.0
From eabf0f10fe200c1f87f4647e5d14c5c7e9cdfc1a Mon Sep 17 00:00:00 2001
From 86cf327838afe9565ae663813e195a486903b28e 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()
@ -2733,7 +2733,7 @@ Patchset: surface-hotplug
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 99292b338401..2898b7c1ac4b 100644
index 25b0fe79420f..6a0dc12187ed 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2151,10 +2151,13 @@ static int __pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable
@ -2754,9 +2754,9 @@ index 99292b338401..2898b7c1ac4b 100644
/* Don't do the same thing twice in a row for one device. */
--
2.29.2
2.30.0
From 9ba55a0d95871c978091e6f50b5297ddf0e60ce5 Mon Sep 17 00:00:00 2001
From f83c07dc8e37a1d8039aff2fe844eb2c5559be97 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
@ -2868,9 +2868,9 @@ index 0693870a9e24..b5c7f5ef597a 100644
* pciehp has a 1:1 bus:slot relationship so we ultimately want a secondary
* bus reset of the bridge, but at the same time we want to ensure that it is
--
2.29.2
2.30.0
From 701b6864e1bffd886f06db697f6d7c2548c63b25 Mon Sep 17 00:00:00 2001
From cfd089aae434cbdd1d1a8e21f5f5c069a51349f5 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
@ -2910,9 +2910,9 @@ index b5c7f5ef597a..242b9f30210a 100644
/*
--
2.29.2
2.30.0
From 7c4c6497e4c78c4cbdce37789a3224981061171c Mon Sep 17 00:00:00 2001
From f4428a5793a1e391581b997f83e92cd6d18edc94 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
@ -2963,9 +2963,9 @@ index 23a5a0c2c3fe..5badf8a1ce0a 100644
if (pci_bridge_d3_possible(dev)) {
/*
--
2.29.2
2.30.0
From 243efee0560bf724682f172c71cf8c64587e8f6d Mon Sep 17 00:00:00 2001
From bc4517e427d79c0a67e18ce0fd72477dd31fc665 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
@ -3075,9 +3075,9 @@ index 5badf8a1ce0a..59d2567e2db2 100644
};
--
2.29.2
2.30.0
From d41df033899caab693a9d0060fc72af4cb9ad226 Mon Sep 17 00:00:00 2001
From 6269071f5fad4f1705f4dd1a962c92cbc9f35656 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
@ -3132,9 +3132,9 @@ index 8e6e4ce869fb..e5de25ebc4cf 100644
};
--
2.29.2
2.30.0
From 5364f9a4917739bbd7cc5071d3989c5a337c4c7d Mon Sep 17 00:00:00 2001
From 6c65b17199230f215ff3b77a49f6716e55d6aeb5 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
@ -3385,7 +3385,7 @@ index 18f5973b9697..dd7c6b247c01 100644
return con_id == NULL;
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index ba4dd54f2c82..cd35e3ce9a8b 100644
index d9773df60a36..f25d3b37c0ae 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -346,10 +346,16 @@ struct acpi_device_physical_node {
@ -3427,9 +3427,9 @@ index cd412817654f..4e2e30e340fe 100644
void **valptr);
int acpi_dev_prop_read_single(struct acpi_device *adev,
--
2.29.2
2.30.0
From f59ac7e22415ff6f75a699d6317c4be64940e267 Mon Sep 17 00:00:00 2001
From 51e327ca46090cb9ddd5e546dd17e5e4a1286531 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
@ -3485,7 +3485,7 @@ index 150003be8e1f..5ca89166ea4e 100644
static const guid_t ads_guid =
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index f7218c1673ce..4d9446ebcffe 100644
index 2c46f7dcd2f5..1516327a8459 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -519,6 +519,46 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
@ -3544,7 +3544,7 @@ index f7218c1673ce..4d9446ebcffe 100644
.set_state = acpi_pci_set_power_state,
.get_state = acpi_pci_get_power_state,
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 2898b7c1ac4b..b53a6772ee09 100644
index 6a0dc12187ed..c5fd51d7f153 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -793,6 +793,11 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev)
@ -3592,9 +3592,9 @@ index e9ede82ee2c2..0a5efc437bd1 100644
int (*set_state)(struct pci_dev *dev, pci_power_t state);
pci_power_t (*get_state)(struct pci_dev *dev);
--
2.29.2
2.30.0
From e52f2f29ec3b88d98e5194347506f75dc1cac9e6 Mon Sep 17 00:00:00 2001
From ebdac6689377e21b03895b059673dc9901ca936f 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
@ -3646,9 +3646,9 @@ index 242b9f30210a..7074d4923811 100644
/*
* Controllers with the Intel CF118 and similar errata advertise
--
2.29.2
2.30.0
From 2078e1d9fb0516755ed387aeb376d8af2709eac6 Mon Sep 17 00:00:00 2001
From 70aa1650a68ea75ab2fd326021782c93b89f4fa9 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
@ -3735,9 +3735,9 @@ index 7074d4923811..a37ff79a6e9e 100644
/*
--
2.29.2
2.30.0
From e230a7e530578b48296595ba176401fecb7ca034 Mon Sep 17 00:00:00 2001
From 4725c392d1d2d6ce966501a84aeaedf01a9ba16f 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
@ -3769,7 +3769,7 @@ Patchset: surface-hotplug
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b53a6772ee09..70af1713767f 100644
index c5fd51d7f153..737d3a34e623 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2523,6 +2523,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
@ -3820,9 +3820,9 @@ index b53a6772ee09..70af1713767f 100644
if (dmi_check_system(bridge_d3_blacklist))
return false;
--
2.29.2
2.30.0
From 12fd9d67ddd9933de693bb63aeda4cdc69faf8c2 Mon Sep 17 00:00:00 2001
From 73ef69896ac518e7351debc28b4f179b26fd591e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 9 Nov 2020 14:23:00 +0100
Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
@ -3867,7 +3867,7 @@ Patchset: surface-hotplug
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 70af1713767f..18caa27c774f 100644
index 737d3a34e623..f72651684719 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1520,9 +1520,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
@ -3882,9 +3882,9 @@ index 70af1713767f..18caa27c774f 100644
bridge = pci_upstream_bridge(dev);
if (bridge)
--
2.29.2
2.30.0
From ba175b2fdc8d71223361bf0a2241cc88c49a2c08 Mon Sep 17 00:00:00 2001
From 1a30bbfd59b9e3a42ec8f08d255f0feb7bef8c74 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
@ -3955,9 +3955,9 @@ index 1edf5a1836ea..ee1518650d55 100644
&dev_attr_vendor.attr,
&dev_attr_device.attr,
--
2.29.2
2.30.0
From 05dde0fcd628b68189cbbf73cd5e699f89d78551 Mon Sep 17 00:00:00 2001
From 3643c22cabb3685a59026e46d8e37ea135c59be9 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
@ -4285,5 +4285,5 @@ index 000000000000..572fba30cd77
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
+MODULE_LICENSE("GPL");
--
2.29.2
2.30.0

View file

@ -1,4 +1,4 @@
From 2f8ec51e743e22b33363ea47e51e71f43aeef73d Mon Sep 17 00:00:00 2001
From 76d8188143ec1a31728c5e0539dbe09eb117f03c 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
@ -229,5 +229,5 @@ index ccda72f748ee..96fb231fd266 100644
{ .driver_data = MT_CLS_GOOGLE,
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
--
2.29.2
2.30.0