|
@@ -1,4 +1,4 @@
|
|
|
-From aa3d1f7dce71dc03a207e16d4e8da83ae94c5481 Mon Sep 17 00:00:00 2001
|
|
|
+From f5104f9f1ddbff4a97c7480a0023065b38fbf207 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.32.0
|
|
|
|
|
|
-From 7de1a08f20812ef91ce291a7b7aff37c02aa38fc Mon Sep 17 00:00:00 2001
|
|
|
+From af8c3adc7c6bbb081943faf970b3686318f73a81 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.32.0
|
|
|
|
|
|
-From 420001be629de952c7c2d00f1467010c5c48e09f Mon Sep 17 00:00:00 2001
|
|
|
+From c9cdaacc924580b8bc7038a46655fb7fa69aaf63 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.32.0
|
|
|
|
|
|
-From 4da98b3c62f6f8ad4c0f1811b42e70fe8e357ebd Mon Sep 17 00:00:00 2001
|
|
|
+From ae986f4168da2064c75ac037e8c4d66973272140 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.32.0
|
|
|
|
|
|
-From ed61c6f1b4c9beb650bc2e64083f538318749477 Mon Sep 17 00:00:00 2001
|
|
|
+From 8d49b82b1a09ca372412cfcbc8b657635809c734 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.32.0
|
|
|
|
|
|
-From 07a714187331abee59cdba5766268f8267c6ef97 Mon Sep 17 00:00:00 2001
|
|
|
+From 2c35ddd1ef3e0baf79e9d0893118b704ebd77d4b 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.32.0
|
|
|
|
|
|
-From bc63f579d67dd4c983ebc38088e19641cac7bb64 Mon Sep 17 00:00:00 2001
|
|
|
+From 6523c1019194172c042c1f275e088842a9083156 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.32.0
|
|
|
|
|
|
-From e3533faea5509781b733098b7943f7fc464ae66f Mon Sep 17 00:00:00 2001
|
|
|
+From 7473705eaf26e2fc4fd8de3f3e20e3fbde16feba 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.32.0
|
|
|
|
|
|
-From cae87aee8e839b66f61db064bf18d0e03d2da97b Mon Sep 17 00:00:00 2001
|
|
|
+From bb6b9a0c7f82ba519d90902c3f7c5630333a43e5 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.32.0
|
|
|
|
|
|
-From 53d9834a2ae93729ca9479e5257f65fc02e28fc2 Mon Sep 17 00:00:00 2001
|
|
|
+From 5c089a4d3e168688502db2d46f5e15354b6f35db Mon Sep 17 00:00:00 2001
|
|
|
From: Keith Busch <keith.busch@intel.com>
|
|
|
Date: Thu, 20 Sep 2018 10:27:17 -0600
|
|
|
Subject: [PATCH] PCI: Make link active reporting detection generic
|
|
@@ -2608,10 +2608,10 @@ index e4d6ec960630..0693870a9e24 100644
|
|
|
/* Clear all remaining event bits in Slot Status register. */
|
|
|
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
|
-index 3d59bbe4a5d5..07d4a00131bc 100644
|
|
|
+index 9ebf32de8575..2d437c40f83b 100644
|
|
|
--- a/drivers/pci/pci.c
|
|
|
+++ b/drivers/pci/pci.c
|
|
|
-@@ -4526,21 +4526,42 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
|
|
|
+@@ -4536,21 +4536,42 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
|
|
|
bool ret;
|
|
|
u16 lnk_status;
|
|
|
|
|
@@ -2705,7 +2705,7 @@ index ec6c48ecd7d5..74c8e9190fed 100644
|
|
|
--
|
|
|
2.32.0
|
|
|
|
|
|
-From 3de998ddd80b6b5a640c5451175aa25ca28e1413 Mon Sep 17 00:00:00 2001
|
|
|
+From 54dd0fbca803abe0b6f4268278cb66f398fb16cf Mon Sep 17 00:00:00 2001
|
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
|
Date: Thu, 27 Sep 2018 16:53:53 -0500
|
|
|
Subject: [PATCH] PCI: Do not skip power-managed bridges in pci_enable_wake()
|
|
@@ -2733,10 +2733,10 @@ Patchset: surface-hotplug
|
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
|
-index 07d4a00131bc..77ba4f65e18b 100644
|
|
|
+index 2d437c40f83b..4a874e8fa1d5 100644
|
|
|
--- a/drivers/pci/pci.c
|
|
|
+++ b/drivers/pci/pci.c
|
|
|
-@@ -2141,10 +2141,13 @@ static int __pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable
|
|
|
+@@ -2151,10 +2151,13 @@ static int __pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable
|
|
|
int ret = 0;
|
|
|
|
|
|
/*
|
|
@@ -2756,7 +2756,7 @@ index 07d4a00131bc..77ba4f65e18b 100644
|
|
|
--
|
|
|
2.32.0
|
|
|
|
|
|
-From 60d899b762310de2fa1c15242f9147200253eeb1 Mon Sep 17 00:00:00 2001
|
|
|
+From 18dfc1fdbd76ab0e5e5b6fe295b9053b117a3af2 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.32.0
|
|
|
|
|
|
-From c92ee2297e5762d06fc3275322f50c80cf5f0921 Mon Sep 17 00:00:00 2001
|
|
|
+From 36ce46bc544e2f3d59d1fbb615d02b107ecdcd98 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.32.0
|
|
|
|
|
|
-From 575bf83471f010c25ecaf981bce5faed33aff154 Mon Sep 17 00:00:00 2001
|
|
|
+From 2370cef68deee89ad7e79084576734b4ca155c22 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.32.0
|
|
|
|
|
|
-From ee958cb562c9cf0a53055ac5f0a869d1b7cb648a Mon Sep 17 00:00:00 2001
|
|
|
+From cd8f0cd12756254fab32d4b533cdc6c65bc3ed2f 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.32.0
|
|
|
|
|
|
-From f4810542836327feb3223fd352cb8b8a35c77163 Mon Sep 17 00:00:00 2001
|
|
|
+From ae0f0bb51d82855d98103c5f4988ffa2e49e3c83 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.32.0
|
|
|
|
|
|
-From 2694e995d6b214eb6578cf5e0d914e6e030df882 Mon Sep 17 00:00:00 2001
|
|
|
+From 1c889626971faa8b545dba6bd108ca6995e67513 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.32.0
|
|
|
|
|
|
-From fa2c48df7ab5497b062ec567cdca37781e511891 Mon Sep 17 00:00:00 2001
|
|
|
+From 2941ee5d3241740fa02cfa742dd718eeb07e3991 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
|
|
@@ -3544,7 +3544,7 @@ index 2c46f7dcd2f5..1516327a8459 100644
|
|
|
.set_state = acpi_pci_set_power_state,
|
|
|
.get_state = acpi_pci_get_power_state,
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
|
-index 77ba4f65e18b..ab930e5994dd 100644
|
|
|
+index 4a874e8fa1d5..a60eb5780cc0 100644
|
|
|
--- a/drivers/pci/pci.c
|
|
|
+++ b/drivers/pci/pci.c
|
|
|
@@ -793,6 +793,11 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev)
|
|
@@ -3559,7 +3559,7 @@ index 77ba4f65e18b..ab930e5994dd 100644
|
|
|
/**
|
|
|
* pci_raw_set_power_state - Use PCI PM registers to set the power state of
|
|
|
* given PCI device
|
|
|
-@@ -2541,6 +2546,10 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
|
|
|
+@@ -2551,6 +2556,10 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
|
|
|
if (bridge->is_thunderbolt)
|
|
|
return true;
|
|
|
|
|
@@ -3594,7 +3594,7 @@ index 39725b71300f..ee3e94c6ea6c 100644
|
|
|
--
|
|
|
2.32.0
|
|
|
|
|
|
-From 2d14ace0cbba524bdeb7518a2ff7bdcbeea53587 Mon Sep 17 00:00:00 2001
|
|
|
+From a464a3736a6485a25154c282d9beb8a942e494f0 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.32.0
|
|
|
|
|
|
-From 5732caf08dee5d2a069bfb2f3ff3b24bf4f6a40e Mon Sep 17 00:00:00 2001
|
|
|
+From 7c6051cd4951938ad7f06eaa4b3304c7767d3ed8 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.32.0
|
|
|
|
|
|
-From 511c8a8856cf81c5d6a0c93472865f23a203fcca Mon Sep 17 00:00:00 2001
|
|
|
+From 13eb22da8656be6d7f501a7620fd39da32c51903 Mon Sep 17 00:00:00 2001
|
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
Date: Thu, 29 Oct 2020 22:04:38 +0100
|
|
|
Subject: [PATCH] PCI: Allow D3cold for hot-plug ports on Surface Books
|
|
@@ -3769,10 +3769,10 @@ Patchset: surface-hotplug
|
|
|
1 file changed, 29 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
|
-index ab930e5994dd..5f3f35d314c3 100644
|
|
|
+index a60eb5780cc0..65bb9c2c1a5b 100644
|
|
|
--- a/drivers/pci/pci.c
|
|
|
+++ b/drivers/pci/pci.c
|
|
|
-@@ -2513,6 +2513,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
|
|
|
+@@ -2523,6 +2523,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
|
|
|
{ }
|
|
|
};
|
|
|
|
|
@@ -3805,7 +3805,7 @@ index ab930e5994dd..5f3f35d314c3 100644
|
|
|
/**
|
|
|
* pci_bridge_d3_possible - Is it possible to put the bridge into D3
|
|
|
* @bridge: Bridge to check
|
|
|
-@@ -2553,10 +2579,11 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
|
|
|
+@@ -2563,10 +2589,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
|
|
@@ -3822,7 +3822,7 @@ index ab930e5994dd..5f3f35d314c3 100644
|
|
|
--
|
|
|
2.32.0
|
|
|
|
|
|
-From 94173a34f394087fbedb270bce45d2237ea2e65f Mon Sep 17 00:00:00 2001
|
|
|
+From c3702739acae07fe13788bdbfb4d921ae8a8b0bc 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.32.0
|
|
|
|
|
|
-From 85fff3d2fa347d9ebffd8889e8d91e98d6dc412e Mon Sep 17 00:00:00 2001
|
|
|
+From 1fd417da991cf0adef49579462dea9a06afa1ecf 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
|
|
@@ -4247,3 +4247,47 @@ index 000000000000..cfcc15cfbacb
|
|
|
--
|
|
|
2.32.0
|
|
|
|
|
|
+From 260b542039fec50ec3ca36b7a40bab63b0e30c70 Mon Sep 17 00:00:00 2001
|
|
|
+From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
+Date: Fri, 2 Jul 2021 14:41:34 +0200
|
|
|
+Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in
|
|
|
+ pci_enable_device_flags()""
|
|
|
+
|
|
|
+This reverts commit 2bf73bce3df9517c4144f05ea0a80dbfeaa36933.
|
|
|
+
|
|
|
+Patchset: surface-hotplug
|
|
|
+---
|
|
|
+ drivers/pci/pci.c | 16 +++-------------
|
|
|
+ 1 file changed, 3 insertions(+), 13 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
|
+index 65bb9c2c1a5b..5f3f35d314c3 100644
|
|
|
+--- a/drivers/pci/pci.c
|
|
|
++++ b/drivers/pci/pci.c
|
|
|
+@@ -1590,20 +1590,10 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
|
|
|
+ int err;
|
|
|
+ int i, bars = 0;
|
|
|
+
|
|
|
+- /*
|
|
|
+- * Power state could be unknown at this point, either due to a fresh
|
|
|
+- * boot or a device removal call. So get the current power state
|
|
|
+- * so that things like MSI message writing will behave as expected
|
|
|
+- * (e.g. if the device really is in D0 at enable time).
|
|
|
+- */
|
|
|
+- if (dev->pm_cap) {
|
|
|
+- u16 pmcsr;
|
|
|
+- pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
|
|
|
+- dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
|
|
|
+- }
|
|
|
+-
|
|
|
+- if (atomic_inc_return(&dev->enable_cnt) > 1)
|
|
|
++ if (atomic_inc_return(&dev->enable_cnt) > 1) {
|
|
|
++ pci_update_current_state(dev, dev->current_state);
|
|
|
+ return 0; /* already enabled */
|
|
|
++ }
|
|
|
+
|
|
|
+ bridge = pci_upstream_bridge(dev);
|
|
|
+ if (bridge)
|
|
|
+--
|
|
|
+2.32.0
|
|
|
+
|