Update v4.19 patches
Changes:
- SAM:
- Battery: Take UEFI battery limiter into accound when scheduling
delayed update
- Clean up code, minor fixes
- Misc:
- Drop efivarfs fix (included in upstream v4.19.161)
Links:
- SAM: 61b9bb859c
- kernel: 43f1cd62e4
This commit is contained in:
Maximilian Luz
parent
790faf9ebb
commit
abc6a3cac6
|
|
@ -1,4 +1,4 @@
|
|||
From fc65616571a8911bb4ccc71101b33c6038ff2efa Mon Sep 17 00:00:00 2001
|
||||
From da27ccb92702d41e55132cc641cb3d0a7f60b1d0 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From fd4d01ce298960c8d173f3828b921f742e28e56f Mon Sep 17 00:00:00 2001
|
||||
From 886620c9c0f4324c08faf7f6b3205a2a9e0db216 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 334fd9a32256bddb8f888cfbd94f83ffe9013766 Mon Sep 17 00:00:00 2001
|
||||
From 8655b852098165f91e2befe5af72ecb9b8f05a85 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f959243b0d3f5fa0e1751569d034ce2331ce158c Mon Sep 17 00:00:00 2001
|
||||
From b7d189dca1b4a4513424162fcb013c238d267c54 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.29.2
|
||||
|
||||
From f4f7ee91867315e346f35bab74ea21a68784bd71 Mon Sep 17 00:00:00 2001
|
||||
From 0e877984fa354330a2fc7814dc55f4690c37cdd2 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.29.2
|
||||
|
||||
From 272c4184ca0c2fc03eed50ad103369ec7c981d48 Mon Sep 17 00:00:00 2001
|
||||
From 2630817850f74107d03a48ce837b8357ef52cfe4 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.29.2
|
||||
|
||||
From 7d2eb03cdbe9fc4e4ce1b731cbd424b50b3f4e4d Mon Sep 17 00:00:00 2001
|
||||
From dac3f71ce105711f2d471bf57f83d02727441a58 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f7f26c2b100b72758ff599025055173f3011b973 Mon Sep 17 00:00:00 2001
|
||||
From d2771a10d107cb8b6b784cdc6fed789a5f882281 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
|
||||
|
|
@ -122,7 +122,7 @@ index 9c2e7a151e40..8cf74e854610 100644
|
|||
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
|
||||
int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
|
||||
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
||||
index 3c68a5b35ec1..0cc7bea4eb70 100644
|
||||
index a52b2f15f372..4b22f45e6e31 100644
|
||||
--- a/drivers/nvme/host/pci.c
|
||||
+++ b/drivers/nvme/host/pci.c
|
||||
@@ -26,6 +26,7 @@
|
||||
|
|
@ -141,7 +141,7 @@ index 3c68a5b35ec1..0cc7bea4eb70 100644
|
|||
|
||||
mempool_t *iod_mempool;
|
||||
|
||||
@@ -2269,6 +2271,7 @@ static void nvme_reset_work(struct work_struct *work)
|
||||
@@ -2284,6 +2286,7 @@ static void nvme_reset_work(struct work_struct *work)
|
||||
*/
|
||||
if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)
|
||||
nvme_dev_disable(dev, false);
|
||||
|
|
@ -149,7 +149,7 @@ index 3c68a5b35ec1..0cc7bea4eb70 100644
|
|||
|
||||
mutex_lock(&dev->shutdown_lock);
|
||||
result = nvme_pci_enable(dev);
|
||||
@@ -2608,16 +2611,101 @@ static void nvme_remove(struct pci_dev *pdev)
|
||||
@@ -2623,16 +2626,101 @@ static void nvme_remove(struct pci_dev *pdev)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -252,7 +252,7 @@ index 3c68a5b35ec1..0cc7bea4eb70 100644
|
|||
{
|
||||
struct pci_dev *pdev = to_pci_dev(dev);
|
||||
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||
@@ -2625,9 +2713,16 @@ static int nvme_resume(struct device *dev)
|
||||
@@ -2640,9 +2728,16 @@ static int nvme_resume(struct device *dev)
|
||||
nvme_reset_ctrl(&ndev->ctrl);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -271,7 +271,7 @@ index 3c68a5b35ec1..0cc7bea4eb70 100644
|
|||
|
||||
static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
|
||||
pci_channel_state_t state)
|
||||
@@ -2730,9 +2825,11 @@ static struct pci_driver nvme_driver = {
|
||||
@@ -2745,9 +2840,11 @@ static struct pci_driver nvme_driver = {
|
||||
.probe = nvme_probe,
|
||||
.remove = nvme_remove,
|
||||
.shutdown = nvme_shutdown,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 08cce4daaed63a3b5a7f6546fc4533416f91ea65 Mon Sep 17 00:00:00 2001
|
||||
From 3c844b7ead62fe80c445cdaff61d3427f9a89a16 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 0d4668c515d69b1425d954bb188ed7b9bbe20046 Mon Sep 17 00:00:00 2001
|
||||
From 778f7ef1e5919a5bd5be31706d7c3bc783b966a7 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 991b9cc18000..2aa0436d3548 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 06e606f7f7bb1c4b78bec41d3e04f20a08cd2b12 Mon Sep 17 00:00:00 2001
|
||||
From 0be2a06fbb9842ffe40db39d0b735a1a0f17a576 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
|
||||
|
|
@ -206,7 +206,7 @@ index f7ce9b6db6b4..72d0c01ff359 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 619c5a9856d21b413630a8d6d44367b1c50d3d5f Mon Sep 17 00:00:00 2001
|
||||
From a0202ad825762891eec3924e24d7c7b54b091fcc 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
|
||||
|
|
@ -414,7 +414,7 @@ index 000000000000..5326ae7e5671
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 0b7071dff547d65756bb4e0d87cc537ce40fbe6c Mon Sep 17 00:00:00 2001
|
||||
From 3f908c73b3fdc5b63879e43ed5e5f39d41f005f9 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+
|
||||
|
|
@ -615,7 +615,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 652460c21b1e3d2f08ee41881b7757fa86b2e42d Mon Sep 17 00:00:00 2001
|
||||
From 6491c93f7051dcdbf5ff2f5840bf42be95c7db25 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
|
||||
|
|
@ -794,7 +794,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 53b08b7fc89a3c8e021c3626744cb8ec98b3ac04 Mon Sep 17 00:00:00 2001
|
||||
From 2a7426417ae092990a815e1759540ae37e6d3660 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
|
||||
|
|
@ -856,7 +856,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 25ec88c9cffb6780d69bb6a6c9cd412c4f543572 Mon Sep 17 00:00:00 2001
|
||||
From 8537b18af71db5e336f9717b307b80f830afc897 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
|
||||
|
|
@ -933,7 +933,7 @@ index e48b47f42554..ceac611ef086 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 9e5b0bda24d5f57dc04c3fe1693d3914014bec20 Mon Sep 17 00:00:00 2001
|
||||
From bd55df62de4968fa3bc28dc5d5446221236c13f7 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
|
||||
|
|
@ -1075,7 +1075,7 @@ index 290427c98630..d80eb18fb0d1 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From fe963c91f4a3f1ddbca1ce248ed8c5627b31dbdd Mon Sep 17 00:00:00 2001
|
||||
From b6b8c291bc89924835f9eafe70b67ff1accc5215 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
|
||||
|
|
@ -1124,7 +1124,7 @@ index d80eb18fb0d1..ea766584d3b7 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From fef44e65fdf6b8a853044461818b3623f6a07245 Mon Sep 17 00:00:00 2001
|
||||
From 0c9e2de03e4274f5f8193a5a6e67f0fcf3ffd27f 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+
|
||||
|
|
@ -1279,7 +1279,7 @@ index 3ef7440418e3..a95ebac06e13 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From cc0c05dad2910e400a0d9c8a543ceb7455403118 Mon Sep 17 00:00:00 2001
|
||||
From dcad80fdc3038f27da1b7f77f48852a83a446a19 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
|
||||
|
|
@ -1341,7 +1341,7 @@ index 650191db25cb..dd1f08a2325f 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From d431aa4c5c63347c34b80279a807c4b8e1cb3530 Mon Sep 17 00:00:00 2001
|
||||
From d6f3edf9a1cbb67fd089f0bbad04226303e2a8a8 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
|
||||
|
|
@ -1376,7 +1376,7 @@ index dd1f08a2325f..ee88da92b97c 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From bac89bdb52443cb6f459ec34b22086d31ade4006 Mon Sep 17 00:00:00 2001
|
||||
From e27506db786fb702febef134e92f0f298161ac10 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From dff056745af83439ff1fe38c14a72134103aba76 Mon Sep 17 00:00:00 2001
|
||||
From 84bcb0736741ecc02fdc3b48c40e8ed4d40423fb 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 6ce72ae5499eb0209b24c975dc50562db586af5f Mon Sep 17 00:00:00 2001
|
||||
From cda201d27a7c96d5237bffb4fa4d716143c66f4d 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.29.2
|
||||
|
||||
From dc55c219aaf66f139e225aeac473557689a23523 Mon Sep 17 00:00:00 2001
|
||||
From e275178d785f468de70b480d29485da8d81f3d07 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e5396b65d0a5db6ffad8ffd9290217c34aa5fb6a Mon Sep 17 00:00:00 2001
|
||||
From 5b765606600d1f4a4581f4d8d5f3cee0acfa0222 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.29.2
|
||||
|
||||
From 98e7c4795fe586f76f3800c200d91f94b94988f8 Mon Sep 17 00:00:00 2001
|
||||
From 80f09b969e7decca3d838608b39798d7df2015e2 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.29.2
|
||||
|
||||
From 59903a6f376692bc4400f26a70223ce8efb52571 Mon Sep 17 00:00:00 2001
|
||||
From b1f7f5ecda45cf0cdf7366e255ff62b3b5dd3bab 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
|
||||
|
|
@ -468,7 +468,7 @@ index 5c58c22e0c08..18f83e554c73 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 705add1ff08aa86accb5ca7616f401f481ced186 Mon Sep 17 00:00:00 2001
|
||||
From ec007174866d6553dd4dbc05000c3aec18c2cce0 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
|
||||
|
|
@ -607,7 +607,7 @@ index 18f83e554c73..c512b2ed85ed 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From e6974b233a290d13909f6919fc8e4c95da3b7e7c Mon Sep 17 00:00:00 2001
|
||||
From 6bed3010f06ec3de55589f9c4f87da381556e68a 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
|
||||
|
|
@ -820,7 +820,7 @@ index d4b7049cbc70..576362d0b1cd 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 7d0738319b444c496478de604bf671962dbca9da Mon Sep 17 00:00:00 2001
|
||||
From 0e77f201b68315d587d733f62f8794e783f639c8 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
|
||||
|
|
@ -1018,7 +1018,7 @@ index 576362d0b1cd..7f4173d6771a 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 7e9a7201ec48619094e26251a84428e273a9fb28 Mon Sep 17 00:00:00 2001
|
||||
From db19cd7660e7b86b1e7a98facce9075ef2611bd9 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
|
||||
|
|
@ -1063,7 +1063,7 @@ index cb474338f39d..18aa830e79e4 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 5669402f43f49197d35a1a6656fd6ab9d5de1a8d Mon Sep 17 00:00:00 2001
|
||||
From 05f15ec4b4f1511f2d78187f473e271f01de3448 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
|
||||
|
|
@ -1149,7 +1149,7 @@ index 2c3b5bd59b18..dee5a7507403 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 8ecc289079e5f3b6f3880d31406f015e2f1d7576 Mon Sep 17 00:00:00 2001
|
||||
From 42267ed19f917bbb893f7ece8ef8b665c325614a 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
|
||||
|
|
@ -2341,7 +2341,7 @@ index 8da87931bd45..b9c1396db6fe 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From bdb3c9c2e2c6cc604e4b08538f6d3145c73d8b13 Mon Sep 17 00:00:00 2001
|
||||
From 7376862298dd04db15cd47fd118c5b9684586514 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
|
||||
|
|
@ -2648,7 +2648,7 @@ index 4a17d71e15d3..e4d6ec960630 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 918f28611928ad1d248d6d2a076858414b0f02fb Mon Sep 17 00:00:00 2001
|
||||
From 22bcc013e7b2b088ce8e25ee3afc7e4c0061c136 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
|
||||
|
|
@ -2779,7 +2779,7 @@ index 2499489158cc..df82a0335515 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 8d8f50f10db4c1fd6bd8f07c7e3a5e5c0b934c3e Mon Sep 17 00:00:00 2001
|
||||
From 35e37226b70209617ef7bd069dad161ce8c3c5d4 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
|
||||
|
|
@ -2976,7 +2976,7 @@ index ec6c48ecd7d5..74c8e9190fed 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 5e95ad37389c12aff9587734ebb68750026234d7 Mon Sep 17 00:00:00 2001
|
||||
From cce3e2ba3b4c515d56ae5f86bec00720414efc54 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()
|
||||
|
|
@ -3027,7 +3027,7 @@ index 99292b338401..2898b7c1ac4b 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 8f3ebf19d5a222171f13bdf5609917aff243e461 Mon Sep 17 00:00:00 2001
|
||||
From 1c9ea78b5ebc7ae099c17ef5c9fd27d27933499e 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
|
||||
|
|
@ -3141,7 +3141,7 @@ index 0693870a9e24..b5c7f5ef597a 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From ee4527979ffd3e8233e646fa9fc0489b515e4fea Mon Sep 17 00:00:00 2001
|
||||
From 13ac0b84b553164de367e2c4c5e24d4a4b26a290 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
|
||||
|
|
@ -3183,7 +3183,7 @@ index b5c7f5ef597a..242b9f30210a 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 904c645dfbc3561571e83466c37405d0596f0744 Mon Sep 17 00:00:00 2001
|
||||
From f88e87e0086832691a59ac344650f9d62228205a 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
|
||||
|
|
@ -3236,7 +3236,7 @@ index 23a5a0c2c3fe..5badf8a1ce0a 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 457fdf1cbc4dedb77510da9782a67ada2ef47ca1 Mon Sep 17 00:00:00 2001
|
||||
From 7e6f65431bf894e32b9add76543009191206ab9c 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
|
||||
|
|
@ -3348,7 +3348,7 @@ index 5badf8a1ce0a..59d2567e2db2 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From d6d430577d1761fd648f6f8830b5f484f636495b Mon Sep 17 00:00:00 2001
|
||||
From a928f3d4878d165894ebadf90e2801684d9a9189 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
|
||||
|
|
@ -3405,7 +3405,7 @@ index 8e6e4ce869fb..e5de25ebc4cf 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From d8bca9ae8cb084e39851819309ba001ad86a6d93 Mon Sep 17 00:00:00 2001
|
||||
From 836f1081726d3e88c23ac278ea25042bc380684d 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
|
||||
|
|
@ -3700,7 +3700,7 @@ index cd412817654f..4e2e30e340fe 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 733f9fb9c82bef870602742234425e8086489b9f Mon Sep 17 00:00:00 2001
|
||||
From e45b7d8bd12193b28cefa6e021604e7ac4da0982 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
|
||||
|
|
@ -3865,7 +3865,7 @@ index e9ede82ee2c2..0a5efc437bd1 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From fdcc28601697d39255b44928cfd4f209c9a89997 Mon Sep 17 00:00:00 2001
|
||||
From a011a4594f53cdf3768f20e75fa6eee4b45b2d1c 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
|
||||
|
|
@ -3919,7 +3919,7 @@ index 242b9f30210a..7074d4923811 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 3d155f1fbae37bff815ae3f9ec5c3370ddcc4ec0 Mon Sep 17 00:00:00 2001
|
||||
From 76fbb3688703c915072cf3d0d651f80b93ff1cc5 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
|
||||
|
|
@ -4008,7 +4008,7 @@ index 7074d4923811..a37ff79a6e9e 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 30fd6451a7e698ca9737934ae5b342a37ec82485 Mon Sep 17 00:00:00 2001
|
||||
From c6f38cf4e34845ff08a3868ea24cde5308a85a0b 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
|
||||
|
|
@ -4093,7 +4093,7 @@ index b53a6772ee09..70af1713767f 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 8988054398da2c235fca6474a35f0823365e17f6 Mon Sep 17 00:00:00 2001
|
||||
From ea00c70ff6887960f6971a592c9ac5240607d256 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
|
||||
|
|
@ -4155,7 +4155,7 @@ index 70af1713767f..18caa27c774f 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From 4d21b52ee8ecea64a6fcbf9c352ee16fecdc24d3 Mon Sep 17 00:00:00 2001
|
||||
From 36d4ae2bffc6fbbedd6c583dd06d6d5fb3608dfe 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
|
||||
|
|
@ -4229,7 +4229,7 @@ index 1edf5a1836ea..ee1518650d55 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From b55b8c88e1961416ce386643cfa6698753c6f224 Mon Sep 17 00:00:00 2001
|
||||
From 2fdf98a4df1bd4ff0dc0d3cde6b79b41e75bc88e 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
|
||||
|
|
@ -4331,7 +4331,7 @@ index 7f40b6aab689..76e3b1d7db45 100644
|
|||
--
|
||||
2.29.2
|
||||
|
||||
From f29a2d6c5a4b458e6e3e6b9d36564944e6bf7a4f Mon Sep 17 00:00:00 2001
|
||||
From 962851e79728652618f82d7997966be7b436ee38 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
|
||||
|
|
@ -4371,7 +4371,7 @@ Patchset: surface-sam
|
|||
.../clients/surface_acpi_notify.c | 886 ++++++
|
||||
.../clients/surface_aggregator_cdev.c | 299 ++
|
||||
.../clients/surface_aggregator_registry.c | 606 ++++
|
||||
.../clients/surface_battery.c | 1184 ++++++++
|
||||
.../clients/surface_battery.c | 1174 ++++++++
|
||||
.../surface_aggregator/clients/surface_dtx.c | 1275 +++++++++
|
||||
.../surface_aggregator/clients/surface_hid.c | 918 ++++++
|
||||
.../clients/surface_hotplug.c | 267 ++
|
||||
|
|
@ -4380,12 +4380,12 @@ Patchset: surface-sam
|
|||
drivers/misc/surface_aggregator/controller.h | 285 ++
|
||||
drivers/misc/surface_aggregator/core.c | 845 ++++++
|
||||
drivers/misc/surface_aggregator/ssh_msgb.h | 205 ++
|
||||
.../surface_aggregator/ssh_packet_layer.c | 2055 +++++++++++++
|
||||
.../surface_aggregator/ssh_packet_layer.h | 188 ++
|
||||
.../surface_aggregator/ssh_packet_layer.c | 2046 +++++++++++++
|
||||
.../surface_aggregator/ssh_packet_layer.h | 190 ++
|
||||
drivers/misc/surface_aggregator/ssh_parser.c | 228 ++
|
||||
drivers/misc/surface_aggregator/ssh_parser.h | 155 +
|
||||
.../surface_aggregator/ssh_request_layer.c | 1265 ++++++++
|
||||
.../surface_aggregator/ssh_request_layer.h | 141 +
|
||||
.../surface_aggregator/ssh_request_layer.c | 1256 ++++++++
|
||||
.../surface_aggregator/ssh_request_layer.h | 143 +
|
||||
drivers/misc/surface_aggregator/trace.h | 632 ++++
|
||||
include/linux/mod_devicetable.h | 5 +-
|
||||
include/linux/surface_acpi_notify.h | 39 +
|
||||
|
|
@ -4396,7 +4396,7 @@ Patchset: surface-sam
|
|||
include/uapi/linux/surface_aggregator/dtx.h | 146 +
|
||||
scripts/mod/devicetable-offsets.c | 3 +-
|
||||
scripts/mod/file2alias.c | 10 +-
|
||||
48 files changed, 18811 insertions(+), 7 deletions(-)
|
||||
48 files changed, 18787 insertions(+), 7 deletions(-)
|
||||
create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst
|
||||
create mode 100644 Documentation/driver-api/surface_aggregator/client.rst
|
||||
create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst
|
||||
|
|
@ -8926,10 +8926,10 @@ index 000000000000..a18f85dd6881
|
|||
+MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/misc/surface_aggregator/clients/surface_battery.c b/drivers/misc/surface_aggregator/clients/surface_battery.c
|
||||
new file mode 100644
|
||||
index 000000000000..c26993cf1b1c
|
||||
index 000000000000..6c38eda26aea
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/surface_aggregator/clients/surface_battery.c
|
||||
@@ -0,0 +1,1184 @@
|
||||
@@ -0,0 +1,1174 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Surface battery and AC device driver.
|
||||
|
|
@ -9379,26 +9379,16 @@ index 000000000000..c26993cf1b1c
|
|||
+
|
||||
+static int spwr_battery_recheck_adapter(struct spwr_battery_device *bat)
|
||||
+{
|
||||
+ u32 full_cap = sprw_battery_get_full_cap_safe(bat);
|
||||
+ u32 remaining_cap = get_unaligned_le32(&bat->bst.remaining_cap);
|
||||
+
|
||||
+ if (full_cap == 0 || full_cap == SPWR_BATTERY_VALUE_UNKNOWN)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (remaining_cap == SPWR_BATTERY_VALUE_UNKNOWN)
|
||||
+ return 0;
|
||||
+
|
||||
+ /*
|
||||
+ * Handle battery update quirk:
|
||||
+ * When the battery is fully charged and the adapter is plugged in or
|
||||
+ * removed, the EC does not send a separate event for the state
|
||||
+ * (charging/discharging) change. Furthermore it may take some time until
|
||||
+ * the state is updated on the battery. Schedule an update to solve this.
|
||||
+ * Handle battery update quirk: When the battery is fully charged (or
|
||||
+ * charged up to the limit imposed by the UEFI battery limit) and the
|
||||
+ * adapter is plugged in or removed, the EC does not send a separate
|
||||
+ * event for the state (charging/discharging) change. Furthermore it
|
||||
+ * may take some time until the state is updated on the battery.
|
||||
+ * Schedule an update to solve this.
|
||||
+ */
|
||||
+
|
||||
+ if (remaining_cap >= full_cap)
|
||||
+ schedule_delayed_work(&bat->update_work, SPWR_AC_BAT_UPDATE_DELAY);
|
||||
+
|
||||
+ schedule_delayed_work(&bat->update_work, SPWR_AC_BAT_UPDATE_DELAY);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
|
|
@ -12722,7 +12712,7 @@ index 000000000000..cac7227f27ea
|
|||
+MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/misc/surface_aggregator/controller.c b/drivers/misc/surface_aggregator/controller.c
|
||||
new file mode 100644
|
||||
index 000000000000..334b82834961
|
||||
index 000000000000..610f2825e64a
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/surface_aggregator/controller.c
|
||||
@@ -0,0 +1,2541 @@
|
||||
|
|
@ -12836,7 +12826,7 @@ index 000000000000..334b82834961
|
|||
+
|
||||
+/**
|
||||
+ * ssam_event_matches_notifier() - Test if an event matches a notifier.
|
||||
+ * @notif: The event notifier to test against.
|
||||
+ * @n: The event notifier to test against.
|
||||
+ * @event: The event to test.
|
||||
+ *
|
||||
+ * Return: Returns %true iff the given event matches the given notifier
|
||||
|
|
@ -16622,10 +16612,10 @@ index 000000000000..1221f642dda1
|
|||
+#endif /* _SURFACE_AGGREGATOR_SSH_MSGB_H */
|
||||
diff --git a/drivers/misc/surface_aggregator/ssh_packet_layer.c b/drivers/misc/surface_aggregator/ssh_packet_layer.c
|
||||
new file mode 100644
|
||||
index 000000000000..ae12db5e80f1
|
||||
index 000000000000..44b5394176cb
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/surface_aggregator/ssh_packet_layer.c
|
||||
@@ -0,0 +1,2055 @@
|
||||
@@ -0,0 +1,2046 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * SSH packet transport layer.
|
||||
|
|
@ -17292,21 +17282,16 @@ index 000000000000..ae12db5e80f1
|
|||
+{
|
||||
+ unsigned long delta = msecs_to_jiffies(ktime_ms_delta(expires, now));
|
||||
+ ktime_t aexp = ktime_add(expires, SSH_PTL_PACKET_TIMEOUT_RESOLUTION);
|
||||
+ ktime_t old_exp, old_act;
|
||||
+
|
||||
+ /* Re-adjust / schedule reaper if it is above resolution delta. */
|
||||
+ old_act = READ_ONCE(ptl->rtx_timeout.expires);
|
||||
+ if (ktime_after(aexp, old_act))
|
||||
+ return;
|
||||
+ spin_lock(&ptl->rtx_timeout.lock);
|
||||
+
|
||||
+ do {
|
||||
+ old_exp = old_act;
|
||||
+ old_act = cmpxchg64(&ptl->rtx_timeout.expires, old_exp, expires);
|
||||
+ } while (old_exp != old_act && ktime_before(aexp, old_act));
|
||||
+
|
||||
+ /* If we updated the reaper expiration, modify work timeout. */
|
||||
+ if (old_exp == old_act && old_act != expires)
|
||||
+ /* Re-adjust / schedule reaper only if it is above resolution delta. */
|
||||
+ if (ktime_before(aexp, ptl->rtx_timeout.expires)) {
|
||||
+ ptl->rtx_timeout.expires = expires;
|
||||
+ mod_delayed_work(system_wq, &ptl->rtx_timeout.reaper, delta);
|
||||
+ }
|
||||
+
|
||||
+ spin_unlock(&ptl->rtx_timeout.lock);
|
||||
+}
|
||||
+
|
||||
+/* Must be called with queue lock held. */
|
||||
|
|
@ -18136,14 +18121,9 @@ index 000000000000..ae12db5e80f1
|
|||
+ * Mark reaper as "not pending". This is done before checking any
|
||||
+ * packets to avoid lost-update type problems.
|
||||
+ */
|
||||
+ WRITE_ONCE(ptl->rtx_timeout.expires, KTIME_MAX);
|
||||
+ /*
|
||||
+ * Ensure that the reaper is marked as deactivated before we continue
|
||||
+ * checking packets to prevent lost-update problems when a packet is
|
||||
+ * added to the pending set and ssh_ptl_timeout_reaper_mod is called
|
||||
+ * during execution of the part below.
|
||||
+ */
|
||||
+ smp_mb__after_atomic();
|
||||
+ spin_lock(&ptl->rtx_timeout.lock);
|
||||
+ ptl->rtx_timeout.expires = KTIME_MAX;
|
||||
+ spin_unlock(&ptl->rtx_timeout.lock);
|
||||
+
|
||||
+ spin_lock(&ptl->pending.lock);
|
||||
+
|
||||
|
|
@ -18645,6 +18625,7 @@ index 000000000000..ae12db5e80f1
|
|||
+ ptl->rx.thread = NULL;
|
||||
+ init_waitqueue_head(&ptl->rx.wq);
|
||||
+
|
||||
+ spin_lock_init(&ptl->rtx_timeout.lock);
|
||||
+ ptl->rtx_timeout.timeout = SSH_PTL_PACKET_TIMEOUT;
|
||||
+ ptl->rtx_timeout.expires = KTIME_MAX;
|
||||
+ INIT_DELAYED_WORK(&ptl->rtx_timeout.reaper, ssh_ptl_timeout_reap);
|
||||
|
|
@ -18683,10 +18664,10 @@ index 000000000000..ae12db5e80f1
|
|||
+}
|
||||
diff --git a/drivers/misc/surface_aggregator/ssh_packet_layer.h b/drivers/misc/surface_aggregator/ssh_packet_layer.h
|
||||
new file mode 100644
|
||||
index 000000000000..c844cac0f4d7
|
||||
index 000000000000..e8757d03f279
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/surface_aggregator/ssh_packet_layer.h
|
||||
@@ -0,0 +1,188 @@
|
||||
@@ -0,0 +1,190 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
+/*
|
||||
+ * SSH packet transport layer.
|
||||
|
|
@ -18757,6 +18738,7 @@ index 000000000000..c844cac0f4d7
|
|||
+ * @rx.blocked.seqs: Array of blocked sequence IDs.
|
||||
+ * @rx.blocked.offset: Offset indicating where a new ID should be inserted.
|
||||
+ * @rtx_timeout: Retransmission timeout subsystem.
|
||||
+ * @rtx_timeout.lock: Lock for modifying the retransmission timeout reaper.
|
||||
+ * @rtx_timeout.timeout: Timeout interval for retransmission.
|
||||
+ * @rtx_timeout.expires: Time specifying when the reaper work is next scheduled.
|
||||
+ * @rtx_timeout.reaper: Work performing timeout checks and subsequent actions.
|
||||
|
|
@ -18798,6 +18780,7 @@ index 000000000000..c844cac0f4d7
|
|||
+ } rx;
|
||||
+
|
||||
+ struct {
|
||||
+ spinlock_t lock;
|
||||
+ ktime_t timeout;
|
||||
+ ktime_t expires;
|
||||
+ struct delayed_work reaper;
|
||||
|
|
@ -19272,10 +19255,10 @@ index 000000000000..395c61ef890b
|
|||
+#endif /* _SURFACE_AGGREGATOR_SSH_PARSER_h */
|
||||
diff --git a/drivers/misc/surface_aggregator/ssh_request_layer.c b/drivers/misc/surface_aggregator/ssh_request_layer.c
|
||||
new file mode 100644
|
||||
index 000000000000..966150542ae8
|
||||
index 000000000000..bf1782c85063
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/surface_aggregator/ssh_request_layer.c
|
||||
@@ -0,0 +1,1265 @@
|
||||
@@ -0,0 +1,1256 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * SSH request transport layer.
|
||||
|
|
@ -19706,21 +19689,16 @@ index 000000000000..966150542ae8
|
|||
+{
|
||||
+ unsigned long delta = msecs_to_jiffies(ktime_ms_delta(expires, now));
|
||||
+ ktime_t aexp = ktime_add(expires, SSH_RTL_REQUEST_TIMEOUT_RESOLUTION);
|
||||
+ ktime_t old_exp, old_act;
|
||||
+
|
||||
+ /* Re-adjust/schedule reaper if it is above resolution delta. */
|
||||
+ old_act = READ_ONCE(rtl->rtx_timeout.expires);
|
||||
+ if (ktime_after(aexp, old_act))
|
||||
+ return;
|
||||
+ spin_lock(&rtl->rtx_timeout.lock);
|
||||
+
|
||||
+ do {
|
||||
+ old_exp = old_act;
|
||||
+ old_act = cmpxchg64(&rtl->rtx_timeout.expires, old_exp, expires);
|
||||
+ } while (old_exp != old_act && ktime_before(aexp, old_act));
|
||||
+
|
||||
+ /* If we updated the reaper expiration, modify work timeout. */
|
||||
+ if (old_exp == old_act && old_act != expires)
|
||||
+ /* Re-adjust / schedule reaper only if it is above resolution delta. */
|
||||
+ if (ktime_before(aexp, rtl->rtx_timeout.expires)) {
|
||||
+ rtl->rtx_timeout.expires = expires;
|
||||
+ mod_delayed_work(system_wq, &rtl->rtx_timeout.reaper, delta);
|
||||
+ }
|
||||
+
|
||||
+ spin_unlock(&rtl->rtx_timeout.lock);
|
||||
+}
|
||||
+
|
||||
+static void ssh_rtl_timeout_start(struct ssh_request *rqst)
|
||||
|
|
@ -20115,14 +20093,9 @@ index 000000000000..966150542ae8
|
|||
+ * Mark reaper as "not pending". This is done before checking any
|
||||
+ * requests to avoid lost-update type problems.
|
||||
+ */
|
||||
+ WRITE_ONCE(rtl->rtx_timeout.expires, KTIME_MAX);
|
||||
+ /*
|
||||
+ * Ensure that the reaper is marked as deactivated before we continue
|
||||
+ * checking requests to prevent lost-update problems when a request is
|
||||
+ * added to the pending set and ssh_rtl_timeout_reaper_mod is called
|
||||
+ * during execution of the part below.
|
||||
+ */
|
||||
+ smp_mb__after_atomic();
|
||||
+ spin_lock(&rtl->rtx_timeout.lock);
|
||||
+ rtl->rtx_timeout.expires = KTIME_MAX;
|
||||
+ spin_unlock(&rtl->rtx_timeout.lock);
|
||||
+
|
||||
+ spin_lock(&rtl->pending.lock);
|
||||
+ list_for_each_entry_safe(r, n, &rtl->pending.head, node) {
|
||||
|
|
@ -20311,6 +20284,7 @@ index 000000000000..966150542ae8
|
|||
+
|
||||
+ INIT_WORK(&rtl->tx.work, ssh_rtl_tx_work_fn);
|
||||
+
|
||||
+ spin_lock_init(&rtl->rtx_timeout.lock);
|
||||
+ rtl->rtx_timeout.timeout = SSH_RTL_REQUEST_TIMEOUT;
|
||||
+ rtl->rtx_timeout.expires = KTIME_MAX;
|
||||
+ INIT_DELAYED_WORK(&rtl->rtx_timeout.reaper, ssh_rtl_timeout_reap);
|
||||
|
|
@ -20543,10 +20517,10 @@ index 000000000000..966150542ae8
|
|||
+}
|
||||
diff --git a/drivers/misc/surface_aggregator/ssh_request_layer.h b/drivers/misc/surface_aggregator/ssh_request_layer.h
|
||||
new file mode 100644
|
||||
index 000000000000..ab357b2b3735
|
||||
index 000000000000..9c2efdd8ae70
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/surface_aggregator/ssh_request_layer.h
|
||||
@@ -0,0 +1,141 @@
|
||||
@@ -0,0 +1,143 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
+/*
|
||||
+ * SSH request transport layer.
|
||||
|
|
@ -20605,6 +20579,7 @@ index 000000000000..ab357b2b3735
|
|||
+ * @tx: Transmitter subsystem.
|
||||
+ * @tx.work: Transmitter work item.
|
||||
+ * @rtx_timeout: Retransmission timeout subsystem.
|
||||
+ * @rtx_timeout.lock: Lock for modifying the retransmission timeout reaper.
|
||||
+ * @rtx_timeout.timeout: Timeout interval for retransmission.
|
||||
+ * @rtx_timeout.expires: Time specifying when the reaper work is next scheduled.
|
||||
+ * @rtx_timeout.reaper: Work performing timeout checks and subsequent actions.
|
||||
|
|
@ -20630,6 +20605,7 @@ index 000000000000..ab357b2b3735
|
|||
+ } tx;
|
||||
+
|
||||
+ struct {
|
||||
+ spinlock_t lock;
|
||||
+ ktime_t timeout;
|
||||
+ ktime_t expires;
|
||||
+ struct delayed_work reaper;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 08e97db1bc6e565b75ec47ff41d6a52c4a5c31c8 Mon Sep 17 00:00:00 2001
|
||||
From ab5871a6d71af96880344481508a24fbfe3cc535 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
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
From 5818e8950d59deadd95d41d1d3747461a2e4df94 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ardb@kernel.org>
|
||||
Date: Wed, 25 Nov 2020 08:53:03 +0100
|
||||
Subject: [PATCH] efivarfs: revert "fix memory leak in efivarfs_create()"
|
||||
|
||||
The memory leak addressed by commit fe5186cf12e3 is a false positive:
|
||||
all allocations are recorded in a linked list, and freed when the
|
||||
filesystem is unmounted. This leads to double frees, and as reported
|
||||
by David, leads to crashes if SLUB is configured to self destruct when
|
||||
double frees occur.
|
||||
|
||||
So drop the redundant kfree() again, and instead, mark the offending
|
||||
pointer variable so the allocation is ignored by kmemleak.
|
||||
|
||||
Cc: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
|
||||
Fixes: fe5186cf12e3 ("efivarfs: fix memory leak in efivarfs_create()")
|
||||
Reported-by: David Laight <David.Laight@aculab.com>
|
||||
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
|
||||
---
|
||||
fs/efivarfs/super.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
|
||||
index 7808a26bd33f..834615f13f3e 100644
|
||||
--- a/fs/efivarfs/super.c
|
||||
+++ b/fs/efivarfs/super.c
|
||||
@@ -23,7 +23,6 @@ LIST_HEAD(efivarfs_list);
|
||||
static void efivarfs_evict_inode(struct inode *inode)
|
||||
{
|
||||
clear_inode(inode);
|
||||
- kfree(inode->i_private);
|
||||
}
|
||||
|
||||
static const struct super_operations efivarfs_ops = {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../../patches/4.19/0012-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch
|
||||
|
|
@ -31,7 +31,6 @@ source=(
|
|||
0009-surface-sam-over-hid.patch
|
||||
0010-surface-sam.patch
|
||||
0011-surface-typecover.patch
|
||||
0012-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch
|
||||
)
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
|
|
@ -43,18 +42,17 @@ sha256sums=('18345206f9c61e8adafa5204d0ca0b8619f1d9aafd70cbd5cb0fbf1faf521585'
|
|||
'4e68572e7cc4c5368f0236e0792660ae8498373988625dca46e509399a7eaea6'
|
||||
'a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2'
|
||||
'dacf6a14239e151bae71587e6e604faeadd1e63975edeba4bb8033806b68c67a'
|
||||
'0c3a8f6579e9f127858352eed815325a06056fc22fef18fa2aee208b3d27f990'
|
||||
'fe942c357e4d45bbf00f53107888e2523eb2edd85ecac00877bb60ae153b0f3d'
|
||||
'f9c577a0ad181d621af2e1022b5ddd7979f3e0b2b94e63ce0d7056aaa887697e'
|
||||
'f7efc66bd4db55226138bee4f85c9f16fa39351476e6843d1450fc8aa10a183b'
|
||||
'b92983fe29871fe4f722390c8d54c10724980a74070d38338eeb693dd91d26cd'
|
||||
'50675406cc820aa8a96beb9645d1f14a3f1e31a534bdefd8620cee34fb6ffbbf'
|
||||
'0272246c9e2730ddf46fb23f5f2ad971d42899fbeec532a6b2c15b07ed78045d'
|
||||
'7afbd27556c12c6cb54534fd7bf696c8f7857d8ccef09a6b1c7a9f8ef5d0842e'
|
||||
'ae22f9b1de06f2ee356abb0e8cb442506c6f2566be3ed878289c061159f8b76a'
|
||||
'182475b9d221b4a8797d0c160e00a184d64a1af7676270411a527bcbcb7040fa'
|
||||
'1e25ddc6d2c3fc1923e1ab55009ac946062f48f0104fc456fa438f8b96327751'
|
||||
'29d5e0d57e1ac1e306afed46fc9f1d29b6a0f419a0adb4c830755ee37583adbe')
|
||||
'9caecb2eb2e8f8dc8877f1e3be5745d6dbdda4596ab522518c70bb8118072567'
|
||||
'8b492add61149a8ba01add23188bae22eff6b2f9b5107ffdb9fc2ee01334ddfc'
|
||||
'3d7af55a331f0a25e62ab0588633e1d6b2d35de7370938ec6749a5a3a31368dc'
|
||||
'678d5c11a08574b86b6f567c88fd1348f855c818cd6b74194aa4b97b5d773865'
|
||||
'2cc6a26cef3a81b9ae0f43ccb863cddbb600bc168a1476bacd9406a6d1cf8965'
|
||||
'5a7cebb276580859ed809e3b97308a888407e24a18ec21560d991be92d27547e'
|
||||
'c9d653039ab643fb3956b9b7d212e00d5ac92179c4f90dbf0ee50a048c2966a6'
|
||||
'3ab1b4e9ce2b438d25254b3140a6cbc57fa0f53c612e2e0f895f1aa460944b61'
|
||||
'765d34f167d41dbb4a8308c5e1b1ded652bb968a5f277357799909f51832401c'
|
||||
'44315f12656df3e1adfaa53b70f5a9837a75b14a247c414e84740e4930a08823'
|
||||
'403bd3851fe2b51eb3eb4de867c5697f1e58145b445bcb04e982d6cdba5876d8')
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
|
|
|
|||
Loading…
Reference in a new issue