Update v5.4 patches
Changes:
- Update patches to latest minor version, drop redundant/integrated
patches
Links:
- kernel: 0e1eb9aa0a
This commit is contained in:
Maximilian Luz
parent
3e9fe9ff06
commit
386375860a
|
|
@ -1,4 +1,4 @@
|
|||
From 37a2d46df282b139c6e163ec85c08c61c4ee3a76 Mon Sep 17 00:00:00 2001
|
||||
From b27e8d1d9502be175500232ce964ae1ff0f9bf0a Mon Sep 17 00:00:00 2001
|
||||
From: qzed <qzed@users.noreply.github.com>
|
||||
Date: Tue, 17 Sep 2019 17:17:56 +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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From d52a615bf371a165024b654d87c6986bab28d316 Mon Sep 17 00:00:00 2001
|
||||
From 815b8127c8e501d003cda36c8eeeeb08f538b71e 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 d0fb43c2b9f6..0e938713cb13 100644
|
|||
};
|
||||
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 0104f0ee8e42454ae7ac748c09b34bb06a4a32e6 Mon Sep 17 00:00:00 2001
|
||||
From 9a27d85804c16d7b1c7c5fddea0217e903b36107 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
|
||||
|
|
@ -154,9 +154,9 @@ index f7ce9b6db6b4..72d0c01ff359 100644
|
|||
|
||||
static inline int
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 06c58324749255431c5207e825ee173248787c3e Mon Sep 17 00:00:00 2001
|
||||
From 50ca95d2bb52cb375affb6fdb5c062f8081a26a2 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
|
||||
|
|
@ -362,9 +362,9 @@ index 000000000000..5326ae7e5671
|
|||
+
|
||||
+void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 800160ebe79d068138768c40769178d57a294a01 Mon Sep 17 00:00:00 2001
|
||||
From 55a435c4ef5e9b6d3b4cd96549f1e6f3898ba85e 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+
|
||||
|
|
@ -563,9 +563,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 45b1b1b9c82c33ee6d287f181e5352ec67786b2e Mon Sep 17 00:00:00 2001
|
||||
From ab11d8d526ebdfa83a0ff520b23fc73b74ed4eb9 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
|
||||
|
|
@ -742,9 +742,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 1a7b82f3699c713a1a8a70d9fbb7c9264727c77a Mon Sep 17 00:00:00 2001
|
||||
From 8144ea1e54c65885dbd6657f2c77a55be78fc843 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
|
||||
|
|
@ -804,86 +804,9 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
|
|||
.ident = "Surface Pro 3",
|
||||
.matches = {
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From c790816fbe58de427ba3a4db371ed36102552bee 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 d14e55e3c9da..5894566ec480 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
@@ -1469,6 +1469,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);
|
||||
adapter->is_up = false;
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 0be77c3a526b1eafa3998f799a0e11184e8de268 Mon Sep 17 00:00:00 2001
|
||||
From 0626936cd8fee7b9fa99faf7bd8441c7f52102c9 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
|
||||
|
|
@ -1023,9 +946,9 @@ index 263d918767bd..bd6791dc3a0f 100644
|
|||
return 0;
|
||||
}
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From d68fb8937302cbae8c9d8c52127be9a57230d781 Mon Sep 17 00:00:00 2001
|
||||
From 9f09f9db97dc2cd61bbc92a4caf98baff15cd75e 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
|
||||
|
|
@ -1072,9 +995,9 @@ index bd6791dc3a0f..d7ff898c1767 100644
|
|||
if (!adapter->devdump_data) {
|
||||
mwifiex_dbg(adapter, ERROR,
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From f19b002a27041bfb46a649cfe0bc571091d4710c Mon Sep 17 00:00:00 2001
|
||||
From ff175667e5174718fea3f511fccb204d65ded44c 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+
|
||||
|
|
@ -1227,9 +1150,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 268669200ee7a8d9db75653f6d9b5f1c9c804e93 Mon Sep 17 00:00:00 2001
|
||||
From 7832c9279f56bb563b6f2b02edfc588cff40f649 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
|
||||
|
|
@ -1289,9 +1212,9 @@ index 9e6dc289ec3e..20f5ee3fe7e3 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 4dd7d0ad9f43695be6ceb587b2fcb25743b5d75c Mon Sep 17 00:00:00 2001
|
||||
From 0750851ae4cc2150df29f97578a43433d9741bf1 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
|
||||
|
|
@ -1324,9 +1247,9 @@ index 20f5ee3fe7e3..8020a2929069 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 333458cafe75ed2c6f9e504dba9cdf8af0341190 Mon Sep 17 00:00:00 2001
|
||||
From 749aee8e98de56bd772726b67b8fdedd283292ed 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
|
||||
|
|
@ -1372,5 +1295,5 @@ index 4ed10cf82f9a..ed0fffb9eba6 100644
|
|||
|
||||
if (drcs) {
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 28403eeb5f6dcf76bb85df1f32ac77303bc0626b Mon Sep 17 00:00:00 2001
|
||||
From c14a177bf1dec4b2f40e1ea20d18c3c051b8b68c Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Mon, 27 Jan 2020 21:16:20 +0100
|
||||
Subject: [PATCH] mei: Add IPTS device IDs
|
||||
|
|
@ -51,9 +51,9 @@ index 75ab2ffbf235..78790904d77c 100644
|
|||
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)},
|
||||
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From d9449c335aa3198c0bf473552069081d4c8c4e1a Mon Sep 17 00:00:00 2001
|
||||
From 14d79a9594b3ffd09d81aad3bfc6d36941757833 Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Fri, 20 Dec 2019 23:15:58 +0100
|
||||
Subject: [PATCH] uapi: Add MEI bus ID
|
||||
|
|
@ -77,9 +77,9 @@ index 9a61c28ed3ae..47fc20975245 100644
|
|||
/*
|
||||
* MT_TOOL types
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 7720a34b19ca53e1205486a52c7fb5bd92bfab0b Mon Sep 17 00:00:00 2001
|
||||
From 437b4aed5487b3c8bb65bd164623d33ba491b063 Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Mon, 27 Jan 2020 21:22:42 +0100
|
||||
Subject: [PATCH] input: Add support for Intel Precise Touch & Stylus
|
||||
|
|
@ -2085,5 +2085,5 @@ index 000000000000..5b93add1eac2
|
|||
+
|
||||
+#endif /* _IPTS_STYLUS_H_ */
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 417629164350cc1d5ab4312f77c854c1681a3df7 Mon Sep 17 00:00:00 2001
|
||||
From 4d7f377510325f730fa9f7026769f29fc3b9bb47 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
|
||||
|
|
@ -397,5 +397,5 @@ index 000000000000..573dc52f568f
|
|||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurface*:*");
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From fe03c4aef61cd3457cb7a7f2b6da65d64abae2d9 Mon Sep 17 00:00:00 2001
|
||||
From cf89299baf698780dd37626dc589434c45e530ce 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 c70983780ae7..1c90651161a6 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 eb422453ee6ad3e0905ca7421ae0e284eed213c0 Mon Sep 17 00:00:00 2001
|
||||
From 6d05d698c53b1a1c2aa0d9c10f73d691b41196fc 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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 72937ef5baaa372328c1efb2f37416c12efbe1ba Mon Sep 17 00:00:00 2001
|
||||
From 2cb836f29c6bda3841b8804d05b710c86ff33c8a Mon Sep 17 00:00:00 2001
|
||||
From: qzed <qzed@users.noreply.github.com>
|
||||
Date: Mon, 26 Aug 2019 01:11:08 +0200
|
||||
Subject: [PATCH] ACPI: Fix buffer/integer type mismatch
|
||||
|
|
@ -58,9 +58,9 @@ index d3d2dbfba680..0b7f617a6e9b 100644
|
|||
buffer_desc = acpi_ut_create_buffer_object(buffer_length);
|
||||
if (!buffer_desc) {
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From dd33f93a7f6bdbf04db0a205fa792f6928745e86 Mon Sep 17 00:00:00 2001
|
||||
From 3bd3ae3bed1bfe09bbafe01e539d33259769cae2 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
|
||||
|
|
@ -246,9 +246,9 @@ index a9719858c950..ce5309d00280 100644
|
|||
if (!ctrl->serdev)
|
||||
return -ENODEV;
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 4af189ef5213e37797aa53f11c67399d4a169d9b Mon Sep 17 00:00:00 2001
|
||||
From 3a9f42f7a945e17309d3f7a0aca95f44c51e87b9 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
|
||||
|
|
@ -348,9 +348,9 @@ index c91eba751804..bc06f7631200 100644
|
|||
|
||||
/* Create MODULE_ALIAS() statements.
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 6e983650de4c0698ffa1f6c5d25ee526d09f0146 Mon Sep 17 00:00:00 2001
|
||||
From 785a1ab45c2e2b72f381ea44a796c2a0dc1ade86 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
|
||||
|
|
@ -19925,5 +19925,5 @@ index bc06f7631200..c86de633d7ea 100644
|
|||
ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function);
|
||||
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,89 +1,4 @@
|
|||
From 6130cabdba819370017614f85834793e4cb6fa02 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
|
||||
|
||||
The Microsoft Surface Book series of devices have a tablet part (so
|
||||
called clipboard) that can be detached from the base of the device.
|
||||
While the clipboard contains the CPU, the base can contain a discrete
|
||||
GPU (dGPU). This dGPU is connected via a PCIe hot-plug port.
|
||||
|
||||
Currently D3cold is disallowed for all hot-plug ports. On the Surface
|
||||
Book 2 and 3, this leads to increased power consumption during suspend
|
||||
and when the dGPU is not used (i.e. runtime suspended). This can be
|
||||
observed not only in battery drain, but also by the dGPU getting notably
|
||||
warm while suspended and not in D3cold.
|
||||
|
||||
Testing shows that the Surface Books behave well with D3cold enabled for
|
||||
hot-plug ports, alleviating the aforementioned issues. Thus white-list
|
||||
D3cold for hot-plug ports on those devices.
|
||||
|
||||
Note: PCIe hot-plug signalling while the device is in D3cold is handled
|
||||
via ACPI, out-of-band interrupts, and the surface_hotplug driver
|
||||
(combined). The device will work without the surface_hotplug driver,
|
||||
however, device removal/addition will only be detected on device resume.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/pci/pci.c | 31 +++++++++++++++++++++++++++++--
|
||||
1 file changed, 29 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index b1b2c8ddbc92..15566ec8f75d 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -2611,6 +2611,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
|
||||
{ }
|
||||
};
|
||||
|
||||
+static const struct dmi_system_id bridge_d3_hotplug_whitelist[] = {
|
||||
+#ifdef CONFIG_X86
|
||||
+ {
|
||||
+ /*
|
||||
+ * Microsoft Surface Books have a hot-plug root port for the
|
||||
+ * discrete GPU (the device containing it can be detached form
|
||||
+ * the top-part, containing the cpu).
|
||||
+ *
|
||||
+ * If this discrete GPU is not transitioned into D3cold for
|
||||
+ * suspend, the device will become notably warm and also
|
||||
+ * consume a lot more power than desirable.
|
||||
+ *
|
||||
+ * We assume that since those devices have been confirmed
|
||||
+ * working with D3, future Surface devices will too. So let's
|
||||
+ * keep this match generic.
|
||||
+ */
|
||||
+ .ident = "Microsoft Surface",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface"),
|
||||
+ },
|
||||
+ },
|
||||
+#endif
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
/**
|
||||
* pci_bridge_d3_possible - Is it possible to put the bridge into D3
|
||||
* @bridge: Bridge to check
|
||||
@@ -2651,10 +2677,11 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
|
||||
/*
|
||||
* Hotplug ports handled natively by the OS were not validated
|
||||
* by vendors for runtime D3 at least until 2018 because there
|
||||
- * was no OS support.
|
||||
+ * was no OS support. Explicitly whitelist systems that have
|
||||
+ * been confirmed working.
|
||||
*/
|
||||
if (bridge->is_hotplug_bridge)
|
||||
- return false;
|
||||
+ return dmi_check_system(bridge_d3_hotplug_whitelist);
|
||||
|
||||
if (dmi_check_system(bridge_d3_blacklist))
|
||||
return false;
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 3021522ec0f72883fc896864b8dfe2d69fce0f1f Mon Sep 17 00:00:00 2001
|
||||
From b9265e9834509d98033f0d1b20ed874cf329d24e 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
|
||||
|
|
@ -128,7 +43,7 @@ Patchset: surface-hotplug
|
|||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index 15566ec8f75d..9b0a591fc60b 100644
|
||||
index 89dece8a4132..fd34c8743cbc 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -1596,9 +1596,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
|
||||
|
|
@ -143,9 +58,9 @@ index 15566ec8f75d..9b0a591fc60b 100644
|
|||
bridge = pci_upstream_bridge(dev);
|
||||
if (bridge)
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 5fbd354c11102d7fd78614dbb9308cc1cb87ca56 Mon Sep 17 00:00:00 2001
|
||||
From 117c4d5658d88ef5741e69391ab0f73d5d723c3b 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
|
||||
|
|
@ -216,9 +131,9 @@ index e401f040f157..418927872ae6 100644
|
|||
&dev_attr_vendor.attr,
|
||||
&dev_attr_device.attr,
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
From 4dc3c0a89843e1c4058ea3c4fca7fe563d66cee1 Mon Sep 17 00:00:00 2001
|
||||
From 82ad2c91b1777a983fa28488dbe5139fa531c7a7 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
|
||||
|
|
@ -546,5 +461,5 @@ index 000000000000..572fba30cd77
|
|||
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 7635869a571c48936def3b1284f4f14e78bfca7d Mon Sep 17 00:00:00 2001
|
||||
From 5ae61ca33913d53af51962c60923cf172bf87904 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 128d8f4319b9..2c30f65056d9 100644
|
|||
{ .driver_data = MT_CLS_GOOGLE,
|
||||
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue