summaryrefslogtreecommitdiff
path: root/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-01-17 22:14:24 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-01-17 22:14:24 -0800
commit4330d572ebf4a01e058fe993c1705f068cf4be20 (patch)
treea35983d87703f51ea6d20700ee3ab47a2757aa40 /0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
parentUpdated to 5.4.10.a (diff)
downloadlinux-libre-hardened-4330d572ebf4a01e058fe993c1705f068cf4be20.tar.xz
Updated to 5.4.12.a
Diffstat (limited to '0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch')
-rw-r--r--0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
index d882f59..3e01de8 100644
--- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,7 +1,7 @@
-From 8d032e7fc1d1d37974785ccdb994524d60201ca3 Mon Sep 17 00:00:00 2001
+From 02dc4cbf4b169ff89a2380b178e07e20eb661d62 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:22 +0300
-Subject: PCI: pciehp: Prevent deadlock on disconnect
+Subject: [PATCH 05/15] PCI: pciehp: Prevent deadlock on disconnect
This addresses deadlocks in these common cases in hierarchies containing
two switches:
@@ -90,9 +90,9 @@ Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/hotplug/pciehp.h | 6 ++--
- drivers/pci/hotplug/pciehp_core.c | 11 ++++++--
+ drivers/pci/hotplug/pciehp_core.c | 11 ++++--
drivers/pci/hotplug/pciehp_ctrl.c | 4 +--
- drivers/pci/hotplug/pciehp_hpc.c | 59 +++++++++++++++++++++++++++++++--------
+ drivers/pci/hotplug/pciehp_hpc.c | 59 +++++++++++++++++++++++++------
4 files changed, 61 insertions(+), 19 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
@@ -268,5 +268,5 @@ index 86d97f3112f0..a2a263764ef8 100644
int pciehp_query_power_fault(struct controller *ctrl)
--
-cgit v1.2.1-1-g437b
+2.25.0