Update v4.19 patches

Changes:
 - SAM:
   - Small code fixes

Links:
 - kernel: a41c513951
 - SAM: ea257c1360
This commit is contained in:
Maximilian Luz 2021-05-21 17:15:34 +02:00
parent 5ae19e794c
commit 63a92365bd
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
5 changed files with 40 additions and 46 deletions

View file

@ -370,7 +370,7 @@ index 7f40b6aab689..76e3b1d7db45 100644
--
2.31.1
From 567ad897dee0e130c68409c0f72fd5eeb40fd72a Mon Sep 17 00:00:00 2001
From f3d72909e827cf0e75db8757c9cebf8915ae74b1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 17 Aug 2020 01:44:30 +0200
Subject: [PATCH] platform/x86: Add support for Surface System Aggregator
@ -428,7 +428,7 @@ Patchset: surface-sam
.../platform/x86/surface_aggregator/trace.h | 632 ++++
.../platform/x86/surface_aggregator_cdev.c | 322 +++
.../x86/surface_aggregator_registry.c | 618 ++++
drivers/platform/x86/surface_dtx.c | 1287 +++++++++
drivers/platform/x86/surface_dtx.c | 1281 ++++++++
drivers/platform/x86/surface_perfmode.c | 122 +
drivers/power/supply/Kconfig | 32 +
drivers/power/supply/Makefile | 2 +
@ -443,7 +443,7 @@ Patchset: surface-sam
include/uapi/linux/surface_aggregator/dtx.h | 146 +
scripts/mod/devicetable-offsets.c | 3 +-
scripts/mod/file2alias.c | 10 +-
55 files changed, 19118 insertions(+), 7 deletions(-)
55 files changed, 19112 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
@ -15147,10 +15147,10 @@ index 000000000000..1b87bdd6dd1e
+MODULE_LICENSE("GPL");
diff --git a/drivers/platform/x86/surface_dtx.c b/drivers/platform/x86/surface_dtx.c
new file mode 100644
index 000000000000..f6abd2d850a3
index 000000000000..bbbdffc5bf8f
--- /dev/null
+++ b/drivers/platform/x86/surface_dtx.c
@@ -0,0 +1,1287 @@
@@ -0,0 +1,1281 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Surface Book (gen. 2 and later) detachment system (DTX) driver.
@ -15678,20 +15678,14 @@ index 000000000000..f6abd2d850a3
+ struct sdtx_client *client = file->private_data;
+ __poll_t events = 0;
+
+ if (down_read_killable(&client->ddev->lock))
+ return -ERESTARTSYS;
+
+ if (test_bit(SDTX_DEVICE_SHUTDOWN_BIT, &client->ddev->flags)) {
+ up_read(&client->ddev->lock);
+ if (test_bit(SDTX_DEVICE_SHUTDOWN_BIT, &client->ddev->flags))
+ return EPOLLHUP | EPOLLERR;
+ }
+
+ poll_wait(file, &client->ddev->waitq, pt);
+
+ if (!kfifo_is_empty(&client->buffer))
+ events |= EPOLLIN | EPOLLRDNORM;
+
+ up_read(&client->ddev->lock);
+ return events;
+}
+
@ -18627,7 +18621,7 @@ index 000000000000..f4b1ba887384
+#endif /* _LINUX_SURFACE_AGGREGATOR_CONTROLLER_H */
diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h
new file mode 100644
index 000000000000..02f3e06c0a60
index 000000000000..9345ad67fb6a
--- /dev/null
+++ b/include/linux/surface_aggregator/device.h
@@ -0,0 +1,423 @@
@ -18731,9 +18725,9 @@ index 000000000000..02f3e06c0a60
+ | (((fun) != SSAM_ANY_FUN) ? SSAM_MATCH_FUNCTION : 0), \
+ .domain = d, \
+ .category = cat, \
+ .target = ((tid) != SSAM_ANY_TID) ? (tid) : 0, \
+ .instance = ((iid) != SSAM_ANY_IID) ? (iid) : 0, \
+ .function = ((fun) != SSAM_ANY_FUN) ? (fun) : 0 \
+ .target = __builtin_choose_expr((tid) != SSAM_ANY_TID, (tid), 0), \
+ .instance = __builtin_choose_expr((iid) != SSAM_ANY_IID, (iid), 0), \
+ .function = __builtin_choose_expr((fun) != SSAM_ANY_FUN, (fun), 0)
+
+/**
+ * SSAM_VDEV() - Initialize a &struct ssam_device_id as virtual device with

View file

@ -1,4 +1,4 @@
From 52ddfd4bdb91813fb1308b37be49b807c83bac21 Mon Sep 17 00:00:00 2001
From 7f1392f57f486b6da6d30aa1855182d8b0ee4554 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Tue, 31 Jul 2018 07:50:37 +0200
Subject: [PATCH] PCI: pciehp: Differentiate between surprise and safe removal
@ -197,7 +197,7 @@ index 5c58c22e0c08..18f83e554c73 100644
--
2.31.1
From 9004ca7b0502f962dc8f2b6d17ac40d71ff3b2f8 Mon Sep 17 00:00:00 2001
From 9978388437255d9c087b4b90030357579716f08c Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sun, 19 Aug 2018 16:29:00 +0200
Subject: [PATCH] PCI: pciehp: Drop unnecessary includes
@ -336,7 +336,7 @@ index 18f83e554c73..c512b2ed85ed 100644
--
2.31.1
From 73a500e9433c7c9d1825cee4a2fce50b9a2ffa6e Mon Sep 17 00:00:00 2001
From 9cf8ee7f0877de63a0ea43c29cbea58b17edb496 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sun, 19 Aug 2018 16:29:00 +0200
Subject: [PATCH] PCI: pciehp: Drop hotplug_slot_ops wrappers
@ -549,7 +549,7 @@ index d4b7049cbc70..576362d0b1cd 100644
--
2.31.1
From cc9bb5dad65d40c81e07d8d99d01a9720986616a Mon Sep 17 00:00:00 2001
From 3005f60c6f632592bf8b52ea8fd18d64a416e5b9 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sat, 8 Sep 2018 09:59:01 +0200
Subject: [PATCH] PCI: pciehp: Tolerate Presence Detect hardwired to zero
@ -747,7 +747,7 @@ index 576362d0b1cd..7f4173d6771a 100644
--
2.31.1
From e2a47f46cab606fa70e58752324a629245173ce7 Mon Sep 17 00:00:00 2001
From 01716e9157f6cdab67529d0a68944ac5f6972ba2 Mon Sep 17 00:00:00 2001
From: Patrick Talbert <ptalbert@redhat.com>
Date: Wed, 5 Sep 2018 09:12:53 +0200
Subject: [PATCH] PCI/ASPM: Do not initialize link state when aspm_disabled is
@ -792,7 +792,7 @@ index cb474338f39d..18aa830e79e4 100644
--
2.31.1
From 645a022c8db3744437372b6ebf851264837f9c50 Mon Sep 17 00:00:00 2001
From 959ad298fe4c469ed82b77bb30f6e6895cb614fe Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sun, 19 Aug 2018 16:29:00 +0200
Subject: [PATCH] PCI: Simplify disconnected marking
@ -878,7 +878,7 @@ index 2c3b5bd59b18..dee5a7507403 100644
--
2.31.1
From f4530024aae185f0d976c18dbd4258e972eaa734 Mon Sep 17 00:00:00 2001
From f23ed7e62814c9c22bc07f0a0dfde6bcc7d85316 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Tue, 18 Sep 2018 21:46:17 +0200
Subject: [PATCH] PCI: pciehp: Unify controller and slot structs
@ -2070,7 +2070,7 @@ index 8da87931bd45..b9c1396db6fe 100644
--
2.31.1
From 28560612cd07a691d9ec2209fe14f263db27c072 Mon Sep 17 00:00:00 2001
From 79f0d98adaffdb7866d7d4ec6cb763e45cdd0f30 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sat, 8 Sep 2018 09:59:01 +0200
Subject: [PATCH] PCI: pciehp: Rename controller struct members for clarity
@ -2377,7 +2377,7 @@ index 4a17d71e15d3..e4d6ec960630 100644
--
2.31.1
From e4f0c462b82cf8773d847f41689d0bc260565e8e Mon Sep 17 00:00:00 2001
From a42ee42f7eaa6b84b0a3f8171e2c110e864a256e Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sat, 8 Sep 2018 09:59:01 +0200
Subject: [PATCH] PCI: pciehp: Reshuffle controller struct for clarity
@ -2508,7 +2508,7 @@ index 2499489158cc..df82a0335515 100644
--
2.31.1
From 098a5df1cfb16405699f0b513155ce8bbf5b9392 Mon Sep 17 00:00:00 2001
From 3ad6e826bbbb1f3aa3ab965715924e8463b2ae88 Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Thu, 20 Sep 2018 10:27:17 -0600
Subject: [PATCH] PCI: Make link active reporting detection generic
@ -2705,7 +2705,7 @@ index ec6c48ecd7d5..74c8e9190fed 100644
--
2.31.1
From a7526b06b1c11832a528eeaf0f8b55a0ea0d9e66 Mon Sep 17 00:00:00 2001
From 9c9950a2f451a6db00874761891dd8703720e122 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:53:53 -0500
Subject: [PATCH] PCI: Do not skip power-managed bridges in pci_enable_wake()
@ -2756,7 +2756,7 @@ index 2d437c40f83b..4a874e8fa1d5 100644
--
2.31.1
From b74e2d79ccae3505cc519fcd7df0e90ce27e0114 Mon Sep 17 00:00:00 2001
From 026f13025b0cb5e02b34db45365202f4c50cc699 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:38:19 -0500
Subject: [PATCH] PCI: pciehp: Disable hotplug interrupt during suspend
@ -2870,7 +2870,7 @@ index 0693870a9e24..b5c7f5ef597a 100644
--
2.31.1
From 38d379ae68a72977bab0c76209a4c6510c6cca99 Mon Sep 17 00:00:00 2001
From ce5b8ae8fed74dc5f723b985dbb374939202d82d Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:41:46 -0500
Subject: [PATCH] PCI: pciehp: Do not handle events if interrupts are masked
@ -2912,7 +2912,7 @@ index b5c7f5ef597a..242b9f30210a 100644
--
2.31.1
From 0e09ff78a0aaef24444fd9a8535ca3d4965e79fc Mon Sep 17 00:00:00 2001
From d7375f26df64148a5c07318ac6213321929efd94 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:41:47 -0500
Subject: [PATCH] PCI/portdrv: Resume upon exit from system suspend if left
@ -2965,7 +2965,7 @@ index 23a5a0c2c3fe..5badf8a1ce0a 100644
--
2.31.1
From 59a8a04c144c0cc7ea7a0562be97ec4249ff5b70 Mon Sep 17 00:00:00 2001
From ae0dc7530b59afbaeb6ee0852626d675aaa6dbf7 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:41:48 -0500
Subject: [PATCH] PCI/portdrv: Add runtime PM hooks for port service drivers
@ -3077,7 +3077,7 @@ index 5badf8a1ce0a..59d2567e2db2 100644
--
2.31.1
From 19875c7431d2601176c49d1b38fb4175ba1039a0 Mon Sep 17 00:00:00 2001
From 0cc021f21a8631f41cba5fc60d23c45e469c9e01 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:41:49 -0500
Subject: [PATCH] PCI: pciehp: Implement runtime PM callbacks
@ -3134,7 +3134,7 @@ index 8e6e4ce869fb..e5de25ebc4cf 100644
--
2.31.1
From 54d9aa5579bc644dd9a8fa070db09ea85e8da686 Mon Sep 17 00:00:00 2001
From 7acaae54f4a46413e14b0e9a661bf3dca7d05e53 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:57:05 -0500
Subject: [PATCH] ACPI / property: Allow multiple property compatible _DSD
@ -3429,7 +3429,7 @@ index 1a37748766b7..50a09003bb43 100644
--
2.31.1
From f200213db1261f277528331b61a1ee365f601edf Mon Sep 17 00:00:00 2001
From 90f1a7399ec2115bf59363b56da838e2db0d4edb Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 27 Sep 2018 16:57:14 -0500
Subject: [PATCH] PCI / ACPI: Whitelist D3 for more PCIe hotplug ports
@ -3594,7 +3594,7 @@ index e9ede82ee2c2..0a5efc437bd1 100644
--
2.31.1
From 95a1c81cbeaf3ab339b379ad5220d5eccd4b3414 Mon Sep 17 00:00:00 2001
From 6b1698067f8110c64b68ccf27a3fc5c0192bb841 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Mon, 7 Jan 2019 16:09:40 +0300
Subject: [PATCH] PCI: pciehp: Assign ctrl->slot_ctrl before writing it to
@ -3648,7 +3648,7 @@ index 242b9f30210a..7074d4923811 100644
--
2.31.1
From 76e6832b341d8baf6c2eb40d2e601d6bea5d05d7 Mon Sep 17 00:00:00 2001
From bacc523e363477ca65e567538ded9f24971c9b96 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 31 Jan 2019 20:07:46 +0300
Subject: [PATCH] PCI: pciehp: Disable Data Link Layer State Changed event on
@ -3737,7 +3737,7 @@ index 7074d4923811..a37ff79a6e9e 100644
--
2.31.1
From d2f6ee3ca617d47a378d21466bc03e8d94efb206 Mon Sep 17 00:00:00 2001
From bbac4d693578338a93819e8e998e12ec92d8f278 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 29 Oct 2020 22:04:38 +0100
Subject: [PATCH] PCI: Allow D3cold for hot-plug ports on Surface Books
@ -3822,7 +3822,7 @@ index a60eb5780cc0..65bb9c2c1a5b 100644
--
2.31.1
From 862210695ea7f3b7fe806f88d89d1ef819628cd0 Mon Sep 17 00:00:00 2001
From c132d118a2dedb310f3eb288c3c7fe3d0ee9619b Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 31 Oct 2020 20:46:33 +0100
Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
@ -3895,7 +3895,7 @@ index 1edf5a1836ea..ee1518650d55 100644
--
2.31.1
From 68389515618cfb092272fa7a1b9f1068c5f9d733 Mon Sep 17 00:00:00 2001
From c75b103a99540d1393562a94eda01ea9b1c4726e Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Tue, 16 Mar 2021 16:51:40 +0100
Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags()
@ -3963,7 +3963,7 @@ index 65bb9c2c1a5b..5f3f35d314c3 100644
--
2.31.1
From ab7a619b9062ed1074697adb001b3964214f5c54 Mon Sep 17 00:00:00 2001
From f8a4456caf6417db8cdd7d54a64cea077db06669 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

View file

@ -1,4 +1,4 @@
From 5017b08a7950862d5d4abab3ef6daff9abeb85df Mon Sep 17 00:00:00 2001
From a3c76193b7b5180dbc2fc24c3f9d85e14ab6330e 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

View file

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

View file

@ -54,10 +54,10 @@ sha256sums=('6f9c2aee8553129d2bdbab646bbf7e88c2a5c38c0b1450f2e728831681bfc85d'
'c2af8b31502d87fc235fc7826b55284fefca1f688583e8e78193ddfd24a48ac0'
'c071fa60d40797666a0c385c7aeb6744115f4e4a2b53a63a5641712807ce7307'
'b39a5240664165b6b036ce054bba1d6dfff4cca1b70187c99ad1e3bfe020716b'
'610dca6e503c87ad7e2bcdf7e4ac80e25b4081837bdc0617b7c23bcccc1251c5'
'639a0d6a35a57adc691fe98909cdff1bc4468a99fb679774a82fb7226d7db400'
'8fc02c75fe062638dae1ef116d59ff1fc9453eeb2ac1d8a8a903cf81b3e49ffb'
'637693a667476dbaf76e3ee530e469477b7236e59cb586829f3cc287b666b7ca')
'6e64b92721d77b16c9a9acee2e6f25e7b47d351262bd7fe3f28852803b44d0a6'
'1d7ea7893692d95809ed91c6b15107b80ae161bdd65134c0bb852df19c05a5b8'
'a9a48a2b022a4914665bbd8ac1d528b2b787240f55c55d2a9b2c9bbf19e47aec'
'04b0a57a6d3b067d9bcb75aeab87140fb79884a9cd1221cf8a17497417a85720')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase