|
@@ -1,4 +1,4 @@
|
|
|
-From c0287fbdf248c6aa637c71aa17c7a25554bc683a Mon Sep 17 00:00:00 2001
|
|
|
+From 1642fa0e39646fffe44a62ac4c85db07c201140f 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 6fca03fe46be728664002d081f306b20ac50537d Mon Sep 17 00:00:00 2001
|
|
|
+From ee9ad4dc36b919066f564f4785fd41bd3364e2ca 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 44d22b18a786031006bb06155acdd3da9450c907 Mon Sep 17 00:00:00 2001
|
|
|
+From 56358d3c4d2d76b39f5c39c0291adc91a757845e 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 a72bf1f7000b012b6f876adc1f26d0e6d8ae5602 Mon Sep 17 00:00:00 2001
|
|
|
+From 2db3f53f53596e61c6694e408a75d997ca8b7f9b 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 7e56e7d001a7808839ba6fe38f7731054a75b5a1 Mon Sep 17 00:00:00 2001
|
|
|
+From d70c5e1f17d56de44f426c935e5629320354c285 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 5283b2bc9b1cfdbefcf761a27288cd4362054689 Mon Sep 17 00:00:00 2001
|
|
|
+From 582d48793180cc0535d49ff74c1101e4d0b6be22 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 591a23298a05a7c7493ec2a0416f067803f37758 Mon Sep 17 00:00:00 2001
|
|
|
+From 38cb19634777dba2afebad3e7a91a8042118f8f4 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 abf218f97266461d64033060138826e7c5801251 Mon Sep 17 00:00:00 2001
|
|
|
+From 3f01a0a388f501669a75beba433fcbb849f76d75 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 35f7a64d5411b13edccdc510280315536ad984d1 Mon Sep 17 00:00:00 2001
|
|
|
+From ee87234a7192ca9f9482700890ef27929f43a833 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 ce21a78c2d2533f9572392e6238055663729e898 Mon Sep 17 00:00:00 2001
|
|
|
+From 59185f8003d6fd1fc7a4799804a5f58b43ba61d9 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 24d4ad1309949d2dd3ed503245e1940f64d8ce03 Mon Sep 17 00:00:00 2001
|
|
|
+From 95cb9168fe1905516f8814cf67a1809500f39f95 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 26f4cb74e76953195269393fa42f34ec211f077a Mon Sep 17 00:00:00 2001
|
|
|
+From f3ac643412e55fb9213c876815b37f366389a5ab 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 8521cb5e0771b4f7a1858b5473d9463e280a1290 Mon Sep 17 00:00:00 2001
|
|
|
+From 997d0193313b98d78848a2be7bcaaa81a6aec3ed 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 1a7e191a554c4ac45f51ab24f71fba44cc3db3d5 Mon Sep 17 00:00:00 2001
|
|
|
+From 6d1fce6779d1dc4d49460fe64ae96b44ea9d464e 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 2fab3a73aa17c0bd7c61c49e40276c9fcadb6a67 Mon Sep 17 00:00:00 2001
|
|
|
+From a99ae35fe8be366fbfe9429d9847da1471aff1df 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 2280d316dc6c07931a23953b50e207b48702c0bd Mon Sep 17 00:00:00 2001
|
|
|
+From eef861fbf94163feea477cd49e156e4496af7cfd 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 8b7a2b01ef0ff71797f30cdfc5cf516a45cc5b80 Mon Sep 17 00:00:00 2001
|
|
|
+From 7cc0751b85d3c88691cf9af6442f4419e1dddecd 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 2ff989f95f1fcc1d04b9cb88f24860859680e184 Mon Sep 17 00:00:00 2001
|
|
|
+From fe1bb6f78f5fd1fbca45179cbf13c1b19ed252c6 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 6ded56d0a9cc634784d92c8316646b6dfb3b0855 Mon Sep 17 00:00:00 2001
|
|
|
+From cc23d7ff4f57b1197447240dc72ece2856a53c38 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 dd9d941f47115a86182ef719d44cab491a7dc6ae Mon Sep 17 00:00:00 2001
|
|
|
+From 59ffa38fe09a49b0a4cb0a382a82c0918825989c 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 c889fe03a79ed9eb837e3c3a94421e7c90f44827 Mon Sep 17 00:00:00 2001
|
|
|
+From 9d072cfa21cd8ca5275f43824e628df333285758 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 e9602252dc92abb532e67f5f9619593345fec693 Mon Sep 17 00:00:00 2001
|
|
|
+From 009b4e3ba015aa419bb45cdf3f2bf4ca13ee449a 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 6f78ee460a37322033317ab3c64ad953dc36a2d8 Mon Sep 17 00:00:00 2001
|
|
|
+From 9d79f638e0ad9724c604bc62247ca2319ff3a6c4 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 4675fefaed2fe4c65ed5b2f69ca8ed7d9c0b544b Mon Sep 17 00:00:00 2001
|
|
|
+From 0765854a166b10c957ffcd8e23dc40d0096adcb7 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 c2807442e76fa5fd4fc7fa89f24f81603cd6b67e Mon Sep 17 00:00:00 2001
|
|
|
+From 0fe01d41c2c1e5bf8e13dd3b8ef94b74c439d67a 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 80f85033c27b0dcadbf76db3462e17a02435fcf0 Mon Sep 17 00:00:00 2001
|
|
|
+From f42652cc71110412a8bf56bbe5e4066e63dd0b95 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 31b1c16f7f5513a4f51e277a697cf9ba584dcc90 Mon Sep 17 00:00:00 2001
|
|
|
+From c0351366e0dc802829d59a509d8aeac451a155a1 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
|
|
@@ -4498,7 +4498,7 @@ index 000000000000..a1117d57036a
|
|
|
+ :export:
|
|
|
diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst
|
|
|
new file mode 100644
|
|
|
-index 000000000000..41c17bb63bef
|
|
|
+index 000000000000..f1275bf53837
|
|
|
--- /dev/null
|
|
|
+++ b/Documentation/driver-api/surface_aggregator/client.rst
|
|
|
@@ -0,0 +1,394 @@
|
|
@@ -4561,7 +4561,7 @@ index 000000000000..41c17bb63bef
|
|
|
+|ssam_client_link|). It is important to do this, as it, first, guarantees
|
|
|
+that the returned controller is valid for use in the client driver for as
|
|
|
+long as this driver is bound to its device, i.e. that the driver gets
|
|
|
-+un-bound before the controller ever becomes invalid, and, second, as it
|
|
|
++unbound before the controller ever becomes invalid, and, second, as it
|
|
|
+ensures correct suspend/resume ordering. This setup should be done in the
|
|
|
+driver's probe function, and may be used to defer probing in case the SSAM
|
|
|
+subsystem is not ready yet, for example:
|
|
@@ -4586,7 +4586,7 @@ index 000000000000..41c17bb63bef
|
|
|
+lifetime be guaranteed via |ssam_controller_get| and |ssam_controller_put|.
|
|
|
+Note that none of these functions, however, guarantee that the controller
|
|
|
+will not be shut down or suspended. These functions essentially only operate
|
|
|
-+on the reference, i.e. only guarantee a bare minimum of accessability
|
|
|
++on the reference, i.e. only guarantee a bare minimum of accessibility
|
|
|
+without any guarantees at all on practical operability.
|
|
|
+
|
|
|
+
|
|
@@ -4722,7 +4722,7 @@ index 000000000000..41c17bb63bef
|
|
|
+ * ssam_request_sync_onstack(ctrl, &rqst, &resp, sizeof(arg_le));
|
|
|
+ *
|
|
|
+ * to perform the request, allocating the message buffer directly
|
|
|
-+ * on the stack as opposed to via kzalloc(.
|
|
|
++ * on the stack as opposed to via kzalloc().
|
|
|
+ */
|
|
|
+
|
|
|
+ /*
|
|
@@ -4770,12 +4770,12 @@ index 000000000000..41c17bb63bef
|
|
|
+
|
|
|
+- :c:func:`SSAM_DEFINE_SYNC_REQUEST_N` for requests without return value and
|
|
|
+ without argument.
|
|
|
-+- :c:func:`SSAM_DEFINE_SYNC_REQUEST_R` for equests with return value but no
|
|
|
++- :c:func:`SSAM_DEFINE_SYNC_REQUEST_R` for requests with return value but no
|
|
|
+ argument.
|
|
|
+- :c:func:`SSAM_DEFINE_SYNC_REQUEST_W` for requests without return value but
|
|
|
+ with argument.
|
|
|
+
|
|
|
-+Refer to their respecitve documentation for more details. For each one of
|
|
|
++Refer to their respective documentation for more details. For each one of
|
|
|
+these macros, a special variant is provided, which targets request types
|
|
|
+applicable to multiple instances of the same device type:
|
|
|
+
|
|
@@ -4898,7 +4898,7 @@ index 000000000000..41c17bb63bef
|
|
|
+with the same flag and it is considered a bug to do otherwise.
|
|
|
diff --git a/Documentation/driver-api/surface_aggregator/clients/cdev.rst b/Documentation/driver-api/surface_aggregator/clients/cdev.rst
|
|
|
new file mode 100644
|
|
|
-index 000000000000..63b5afcb89b5
|
|
|
+index 000000000000..720c9c03aa0e
|
|
|
--- /dev/null
|
|
|
+++ b/Documentation/driver-api/surface_aggregator/clients/cdev.rst
|
|
|
@@ -0,0 +1,85 @@
|
|
@@ -4914,7 +4914,7 @@ index 000000000000..63b5afcb89b5
|
|
|
+==============================
|
|
|
+
|
|
|
+The ``surface_aggregator_cdev`` module provides a misc-device for the SSAM
|
|
|
-+controller to allow for a (more or less) direct connection from userspace to
|
|
|
++controller to allow for a (more or less) direct connection from user-space to
|
|
|
+the SAM EC. It is intended to be used for development and debugging, and
|
|
|
+therefore should not be used or relied upon in any other way. Note that this
|
|
|
+module is not loaded automatically, but instead must be loaded manually.
|
|
@@ -5941,7 +5941,7 @@ index 000000000000..6c020b87ad62
|
|
|
+API and interface options for other kernel drivers.
|
|
|
diff --git a/Documentation/driver-api/surface_aggregator/overview.rst b/Documentation/driver-api/surface_aggregator/overview.rst
|
|
|
new file mode 100644
|
|
|
-index 000000000000..06d49ce001e7
|
|
|
+index 000000000000..b4ef7e25748c
|
|
|
--- /dev/null
|
|
|
+++ b/Documentation/driver-api/surface_aggregator/overview.rst
|
|
|
@@ -0,0 +1,76 @@
|
|
@@ -6012,7 +6012,7 @@ index 000000000000..06d49ce001e7
|
|
|
+
|
|
|
+As already elaborated above, the Surface Serial Hub (SSH) is the
|
|
|
+communication interface for SAM on 5th- and all later-generation Surface
|
|
|
-+devices. On the highest level, communication can be sparated into two main
|
|
|
++devices. On the highest level, communication can be separated into two main
|
|
|
+types: Requests, messages sent from host to EC that may trigger a direct
|
|
|
+response from the EC (explicitly associated with the request), and events
|
|
|
+(sometimes also referred to as notifications), sent from EC to host without
|