|
@@ -1,4 +1,4 @@
|
|
-From 45dd125b670e45422e189d26b5f2c509017ec996 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 25a3ebc002f6396d1ecebb603bf0aa9c0dbe5314 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Tue, 31 Jul 2018 07:50:37 +0200
|
|
Date: Tue, 31 Jul 2018 07:50:37 +0200
|
|
Subject: [PATCH] PCI: pciehp: Differentiate between surprise and safe removal
|
|
Subject: [PATCH] PCI: pciehp: Differentiate between surprise and safe removal
|
|
@@ -195,9 +195,9 @@ index 5c58c22e0c08..18f83e554c73 100644
|
|
pci_lock_rescan_remove();
|
|
pci_lock_rescan_remove();
|
|
|
|
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 0e4bf16ef7ac4121c304a6142bea5ec28d75b26d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 1c427628c032b1b54e34c0c6856bc003d533c7a8 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Sun, 19 Aug 2018 16:29:00 +0200
|
|
Date: Sun, 19 Aug 2018 16:29:00 +0200
|
|
Subject: [PATCH] PCI: pciehp: Drop unnecessary includes
|
|
Subject: [PATCH] PCI: pciehp: Drop unnecessary includes
|
|
@@ -334,9 +334,9 @@ index 18f83e554c73..c512b2ed85ed 100644
|
|
#include <linux/types.h>
|
|
#include <linux/types.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/pci.h>
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 3509e289ab82e6774a8c2b013a369444477d1c68 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From f113a6dc9845e5de5328d6bf50a5fe2b0523f1f6 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Sun, 19 Aug 2018 16:29:00 +0200
|
|
Date: Sun, 19 Aug 2018 16:29:00 +0200
|
|
Subject: [PATCH] PCI: pciehp: Drop hotplug_slot_ops wrappers
|
|
Subject: [PATCH] PCI: pciehp: Drop hotplug_slot_ops wrappers
|
|
@@ -547,9 +547,9 @@ index d4b7049cbc70..576362d0b1cd 100644
|
|
struct pci_dev *pdev = ctrl_dev(ctrl);
|
|
struct pci_dev *pdev = ctrl_dev(ctrl);
|
|
u16 stat_mask = 0, ctrl_mask = 0;
|
|
u16 stat_mask = 0, ctrl_mask = 0;
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 425bd90206d80e31b97a4d33958eb1e2ae42758c Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From c54eb76582164734f26f862b279911ed91d40197 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Sat, 8 Sep 2018 09:59:01 +0200
|
|
Date: Sat, 8 Sep 2018 09:59:01 +0200
|
|
Subject: [PATCH] PCI: pciehp: Tolerate Presence Detect hardwired to zero
|
|
Subject: [PATCH] PCI: pciehp: Tolerate Presence Detect hardwired to zero
|
|
@@ -745,9 +745,9 @@ index 576362d0b1cd..7f4173d6771a 100644
|
|
pciehp_power_off_slot(ctrl->slot);
|
|
pciehp_power_off_slot(ctrl->slot);
|
|
}
|
|
}
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From c7f25467a13f2b23330316bf4580ae7fc2d0e9b3 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From c5fe626cb6e288f6796ad961e0e4fe225eb7fcc4 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Talbert <ptalbert@redhat.com>
|
|
From: Patrick Talbert <ptalbert@redhat.com>
|
|
Date: Wed, 5 Sep 2018 09:12:53 +0200
|
|
Date: Wed, 5 Sep 2018 09:12:53 +0200
|
|
Subject: [PATCH] PCI/ASPM: Do not initialize link state when aspm_disabled is
|
|
Subject: [PATCH] PCI/ASPM: Do not initialize link state when aspm_disabled is
|
|
@@ -790,9 +790,9 @@ index cb474338f39d..18aa830e79e4 100644
|
|
|
|
|
|
if (pdev->link_state)
|
|
if (pdev->link_state)
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From cf688792973b558cfa5897570ebcf7019ddde530 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 33766fc54adfef28b9b2fea6eb72ec8e38febd9c Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Sun, 19 Aug 2018 16:29:00 +0200
|
|
Date: Sun, 19 Aug 2018 16:29:00 +0200
|
|
Subject: [PATCH] PCI: Simplify disconnected marking
|
|
Subject: [PATCH] PCI: Simplify disconnected marking
|
|
@@ -876,9 +876,9 @@ index 2c3b5bd59b18..dee5a7507403 100644
|
|
|
|
|
|
result = reset_link(udev, service);
|
|
result = reset_link(udev, service);
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 968e363e86d2b71bb285310740fa4e7394719a0b Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 97e8993d5fdbb69c94be664e8595c4009b9086a7 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Tue, 18 Sep 2018 21:46:17 +0200
|
|
Date: Tue, 18 Sep 2018 21:46:17 +0200
|
|
Subject: [PATCH] PCI: pciehp: Unify controller and slot structs
|
|
Subject: [PATCH] PCI: pciehp: Unify controller and slot structs
|
|
@@ -2068,9 +2068,9 @@ index 8da87931bd45..b9c1396db6fe 100644
|
|
ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:00\n",
|
|
ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:00\n",
|
|
__func__, pci_domain_nr(parent), parent->number);
|
|
__func__, pci_domain_nr(parent), parent->number);
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From c272888f8ead49379bc4da5904c9e65c74ab9157 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 2e159fa148c9da8588bd3b68d3a7de6cdeea0f04 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Sat, 8 Sep 2018 09:59:01 +0200
|
|
Date: Sat, 8 Sep 2018 09:59:01 +0200
|
|
Subject: [PATCH] PCI: pciehp: Rename controller struct members for clarity
|
|
Subject: [PATCH] PCI: pciehp: Rename controller struct members for clarity
|
|
@@ -2375,9 +2375,9 @@ index 4a17d71e15d3..e4d6ec960630 100644
|
|
}
|
|
}
|
|
|
|
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From f76e7c9a5cbfcae2d4f1148381dc0fb59a3ce67e Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 7e8501d382875a0a46ddc55fefbe9f438cacebcc Mon Sep 17 00:00:00 2001
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
Date: Sat, 8 Sep 2018 09:59:01 +0200
|
|
Date: Sat, 8 Sep 2018 09:59:01 +0200
|
|
Subject: [PATCH] PCI: pciehp: Reshuffle controller struct for clarity
|
|
Subject: [PATCH] PCI: pciehp: Reshuffle controller struct for clarity
|
|
@@ -2506,9 +2506,9 @@ index 2499489158cc..df82a0335515 100644
|
|
int request_result;
|
|
int request_result;
|
|
wait_queue_head_t requester;
|
|
wait_queue_head_t requester;
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From b85888ae8e89c7ca88bfc436cfa92129bf8b74a0 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 330f0cfac9eacaf4bc0d40129582a899631e717c Mon Sep 17 00:00:00 2001
|
|
From: Keith Busch <keith.busch@intel.com>
|
|
From: Keith Busch <keith.busch@intel.com>
|
|
Date: Thu, 20 Sep 2018 10:27:17 -0600
|
|
Date: Thu, 20 Sep 2018 10:27:17 -0600
|
|
Subject: [PATCH] PCI: Make link active reporting detection generic
|
|
Subject: [PATCH] PCI: Make link active reporting detection generic
|
|
@@ -2608,7 +2608,7 @@ index e4d6ec960630..0693870a9e24 100644
|
|
/* Clear all remaining event bits in Slot Status register. */
|
|
/* Clear all remaining event bits in Slot Status register. */
|
|
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
|
|
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
-index 57a87a001b4f..99292b338401 100644
|
|
|
|
|
|
+index cd628dd73719..25b0fe79420f 100644
|
|
--- a/drivers/pci/pci.c
|
|
--- a/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
@@ -4525,21 +4525,42 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
|
|
@@ -4525,21 +4525,42 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
|
|
@@ -2703,9 +2703,9 @@ index ec6c48ecd7d5..74c8e9190fed 100644
|
|
atomic_t enable_cnt; /* pci_enable_device has been called */
|
|
atomic_t enable_cnt; /* pci_enable_device has been called */
|
|
|
|
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From eabf0f10fe200c1f87f4647e5d14c5c7e9cdfc1a Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 86cf327838afe9565ae663813e195a486903b28e Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:53:53 -0500
|
|
Date: Thu, 27 Sep 2018 16:53:53 -0500
|
|
Subject: [PATCH] PCI: Do not skip power-managed bridges in pci_enable_wake()
|
|
Subject: [PATCH] PCI: Do not skip power-managed bridges in pci_enable_wake()
|
|
@@ -2733,7 +2733,7 @@ Patchset: surface-hotplug
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
-index 99292b338401..2898b7c1ac4b 100644
|
|
|
|
|
|
+index 25b0fe79420f..6a0dc12187ed 100644
|
|
--- a/drivers/pci/pci.c
|
|
--- a/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
@@ -2151,10 +2151,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
|
|
@@ -2754,9 +2754,9 @@ index 99292b338401..2898b7c1ac4b 100644
|
|
|
|
|
|
/* Don't do the same thing twice in a row for one device. */
|
|
/* Don't do the same thing twice in a row for one device. */
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 9ba55a0d95871c978091e6f50b5297ddf0e60ce5 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From f83c07dc8e37a1d8039aff2fe844eb2c5559be97 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:38:19 -0500
|
|
Date: Thu, 27 Sep 2018 16:38:19 -0500
|
|
Subject: [PATCH] PCI: pciehp: Disable hotplug interrupt during suspend
|
|
Subject: [PATCH] PCI: pciehp: Disable hotplug interrupt during suspend
|
|
@@ -2868,9 +2868,9 @@ index 0693870a9e24..b5c7f5ef597a 100644
|
|
* pciehp has a 1:1 bus:slot relationship so we ultimately want a secondary
|
|
* pciehp has a 1:1 bus:slot relationship so we ultimately want a secondary
|
|
* bus reset of the bridge, but at the same time we want to ensure that it is
|
|
* bus reset of the bridge, but at the same time we want to ensure that it is
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 701b6864e1bffd886f06db697f6d7c2548c63b25 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From cfd089aae434cbdd1d1a8e21f5f5c069a51349f5 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:41:46 -0500
|
|
Date: Thu, 27 Sep 2018 16:41:46 -0500
|
|
Subject: [PATCH] PCI: pciehp: Do not handle events if interrupts are masked
|
|
Subject: [PATCH] PCI: pciehp: Do not handle events if interrupts are masked
|
|
@@ -2910,9 +2910,9 @@ index b5c7f5ef597a..242b9f30210a 100644
|
|
|
|
|
|
/*
|
|
/*
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 7c4c6497e4c78c4cbdce37789a3224981061171c Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From f4428a5793a1e391581b997f83e92cd6d18edc94 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:41:47 -0500
|
|
Date: Thu, 27 Sep 2018 16:41:47 -0500
|
|
Subject: [PATCH] PCI/portdrv: Resume upon exit from system suspend if left
|
|
Subject: [PATCH] PCI/portdrv: Resume upon exit from system suspend if left
|
|
@@ -2963,9 +2963,9 @@ index 23a5a0c2c3fe..5badf8a1ce0a 100644
|
|
if (pci_bridge_d3_possible(dev)) {
|
|
if (pci_bridge_d3_possible(dev)) {
|
|
/*
|
|
/*
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 243efee0560bf724682f172c71cf8c64587e8f6d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From bc4517e427d79c0a67e18ce0fd72477dd31fc665 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:41:48 -0500
|
|
Date: Thu, 27 Sep 2018 16:41:48 -0500
|
|
Subject: [PATCH] PCI/portdrv: Add runtime PM hooks for port service drivers
|
|
Subject: [PATCH] PCI/portdrv: Add runtime PM hooks for port service drivers
|
|
@@ -3075,9 +3075,9 @@ index 5badf8a1ce0a..59d2567e2db2 100644
|
|
};
|
|
};
|
|
|
|
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From d41df033899caab693a9d0060fc72af4cb9ad226 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 6269071f5fad4f1705f4dd1a962c92cbc9f35656 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:41:49 -0500
|
|
Date: Thu, 27 Sep 2018 16:41:49 -0500
|
|
Subject: [PATCH] PCI: pciehp: Implement runtime PM callbacks
|
|
Subject: [PATCH] PCI: pciehp: Implement runtime PM callbacks
|
|
@@ -3132,9 +3132,9 @@ index 8e6e4ce869fb..e5de25ebc4cf 100644
|
|
};
|
|
};
|
|
|
|
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 5364f9a4917739bbd7cc5071d3989c5a337c4c7d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 6c65b17199230f215ff3b77a49f6716e55d6aeb5 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:57:05 -0500
|
|
Date: Thu, 27 Sep 2018 16:57:05 -0500
|
|
Subject: [PATCH] ACPI / property: Allow multiple property compatible _DSD
|
|
Subject: [PATCH] ACPI / property: Allow multiple property compatible _DSD
|
|
@@ -3385,7 +3385,7 @@ index 18f5973b9697..dd7c6b247c01 100644
|
|
|
|
|
|
return con_id == NULL;
|
|
return con_id == NULL;
|
|
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
|
|
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
|
|
-index ba4dd54f2c82..cd35e3ce9a8b 100644
|
|
|
|
|
|
+index d9773df60a36..f25d3b37c0ae 100644
|
|
--- a/include/acpi/acpi_bus.h
|
|
--- a/include/acpi/acpi_bus.h
|
|
+++ b/include/acpi/acpi_bus.h
|
|
+++ b/include/acpi/acpi_bus.h
|
|
@@ -346,10 +346,16 @@ struct acpi_device_physical_node {
|
|
@@ -346,10 +346,16 @@ struct acpi_device_physical_node {
|
|
@@ -3427,9 +3427,9 @@ index cd412817654f..4e2e30e340fe 100644
|
|
void **valptr);
|
|
void **valptr);
|
|
int acpi_dev_prop_read_single(struct acpi_device *adev,
|
|
int acpi_dev_prop_read_single(struct acpi_device *adev,
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From f59ac7e22415ff6f75a699d6317c4be64940e267 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 51e327ca46090cb9ddd5e546dd17e5e4a1286531 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 27 Sep 2018 16:57:14 -0500
|
|
Date: Thu, 27 Sep 2018 16:57:14 -0500
|
|
Subject: [PATCH] PCI / ACPI: Whitelist D3 for more PCIe hotplug ports
|
|
Subject: [PATCH] PCI / ACPI: Whitelist D3 for more PCIe hotplug ports
|
|
@@ -3485,7 +3485,7 @@ index 150003be8e1f..5ca89166ea4e 100644
|
|
|
|
|
|
static const guid_t ads_guid =
|
|
static const guid_t ads_guid =
|
|
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
|
|
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
|
|
-index f7218c1673ce..4d9446ebcffe 100644
|
|
|
|
|
|
+index 2c46f7dcd2f5..1516327a8459 100644
|
|
--- a/drivers/pci/pci-acpi.c
|
|
--- a/drivers/pci/pci-acpi.c
|
|
+++ b/drivers/pci/pci-acpi.c
|
|
+++ b/drivers/pci/pci-acpi.c
|
|
@@ -519,6 +519,46 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
|
|
@@ -519,6 +519,46 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
|
|
@@ -3544,7 +3544,7 @@ index f7218c1673ce..4d9446ebcffe 100644
|
|
.set_state = acpi_pci_set_power_state,
|
|
.set_state = acpi_pci_set_power_state,
|
|
.get_state = acpi_pci_get_power_state,
|
|
.get_state = acpi_pci_get_power_state,
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
-index 2898b7c1ac4b..b53a6772ee09 100644
|
|
|
|
|
|
+index 6a0dc12187ed..c5fd51d7f153 100644
|
|
--- a/drivers/pci/pci.c
|
|
--- a/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
@@ -793,6 +793,11 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev)
|
|
@@ -793,6 +793,11 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev)
|
|
@@ -3592,9 +3592,9 @@ index e9ede82ee2c2..0a5efc437bd1 100644
|
|
int (*set_state)(struct pci_dev *dev, pci_power_t state);
|
|
int (*set_state)(struct pci_dev *dev, pci_power_t state);
|
|
pci_power_t (*get_state)(struct pci_dev *dev);
|
|
pci_power_t (*get_state)(struct pci_dev *dev);
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From e52f2f29ec3b88d98e5194347506f75dc1cac9e6 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From ebdac6689377e21b03895b059673dc9901ca936f Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Mon, 7 Jan 2019 16:09:40 +0300
|
|
Date: Mon, 7 Jan 2019 16:09:40 +0300
|
|
Subject: [PATCH] PCI: pciehp: Assign ctrl->slot_ctrl before writing it to
|
|
Subject: [PATCH] PCI: pciehp: Assign ctrl->slot_ctrl before writing it to
|
|
@@ -3646,9 +3646,9 @@ index 242b9f30210a..7074d4923811 100644
|
|
/*
|
|
/*
|
|
* Controllers with the Intel CF118 and similar errata advertise
|
|
* Controllers with the Intel CF118 and similar errata advertise
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 2078e1d9fb0516755ed387aeb376d8af2709eac6 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 70aa1650a68ea75ab2fd326021782c93b89f4fa9 Mon Sep 17 00:00:00 2001
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
Date: Thu, 31 Jan 2019 20:07:46 +0300
|
|
Date: Thu, 31 Jan 2019 20:07:46 +0300
|
|
Subject: [PATCH] PCI: pciehp: Disable Data Link Layer State Changed event on
|
|
Subject: [PATCH] PCI: pciehp: Disable Data Link Layer State Changed event on
|
|
@@ -3735,9 +3735,9 @@ index 7074d4923811..a37ff79a6e9e 100644
|
|
|
|
|
|
/*
|
|
/*
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From e230a7e530578b48296595ba176401fecb7ca034 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 4725c392d1d2d6ce966501a84aeaedf01a9ba16f Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Thu, 29 Oct 2020 22:04:38 +0100
|
|
Date: Thu, 29 Oct 2020 22:04:38 +0100
|
|
Subject: [PATCH] PCI: Allow D3cold for hot-plug ports on Surface Books
|
|
Subject: [PATCH] PCI: Allow D3cold for hot-plug ports on Surface Books
|
|
@@ -3769,7 +3769,7 @@ Patchset: surface-hotplug
|
|
1 file changed, 29 insertions(+), 2 deletions(-)
|
|
1 file changed, 29 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
-index b53a6772ee09..70af1713767f 100644
|
|
|
|
|
|
+index c5fd51d7f153..737d3a34e623 100644
|
|
--- a/drivers/pci/pci.c
|
|
--- a/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
@@ -2523,6 +2523,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
|
|
@@ -2523,6 +2523,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
|
|
@@ -3820,9 +3820,9 @@ index b53a6772ee09..70af1713767f 100644
|
|
if (dmi_check_system(bridge_d3_blacklist))
|
|
if (dmi_check_system(bridge_d3_blacklist))
|
|
return false;
|
|
return false;
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 12fd9d67ddd9933de693bb63aeda4cdc69faf8c2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 73ef69896ac518e7351debc28b4f179b26fd591e Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 9 Nov 2020 14:23:00 +0100
|
|
Date: Mon, 9 Nov 2020 14:23:00 +0100
|
|
Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
|
|
Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
|
|
@@ -3867,7 +3867,7 @@ Patchset: surface-hotplug
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
-index 70af1713767f..18caa27c774f 100644
|
|
|
|
|
|
+index 737d3a34e623..f72651684719 100644
|
|
--- a/drivers/pci/pci.c
|
|
--- a/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
+++ b/drivers/pci/pci.c
|
|
@@ -1520,9 +1520,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
|
|
@@ -1520,9 +1520,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
|
|
@@ -3882,9 +3882,9 @@ index 70af1713767f..18caa27c774f 100644
|
|
bridge = pci_upstream_bridge(dev);
|
|
bridge = pci_upstream_bridge(dev);
|
|
if (bridge)
|
|
if (bridge)
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From ba175b2fdc8d71223361bf0a2241cc88c49a2c08 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 1a30bbfd59b9e3a42ec8f08d255f0feb7bef8c74 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Sat, 31 Oct 2020 20:46:33 +0100
|
|
Date: Sat, 31 Oct 2020 20:46:33 +0100
|
|
Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
|
|
Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
|
|
@@ -3955,9 +3955,9 @@ index 1edf5a1836ea..ee1518650d55 100644
|
|
&dev_attr_vendor.attr,
|
|
&dev_attr_vendor.attr,
|
|
&dev_attr_device.attr,
|
|
&dev_attr_device.attr,
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|
|
-From 05dde0fcd628b68189cbbf73cd5e699f89d78551 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 3643c22cabb3685a59026e46d8e37ea135c59be9 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 14 Dec 2020 20:50:59 +0100
|
|
Date: Mon, 14 Dec 2020 20:50:59 +0100
|
|
Subject: [PATCH] platform/x86: Add Surface Hotplug driver
|
|
Subject: [PATCH] platform/x86: Add Surface Hotplug driver
|
|
@@ -4285,5 +4285,5 @@ index 000000000000..572fba30cd77
|
|
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
|
|
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
|
|
+MODULE_LICENSE("GPL");
|
|
+MODULE_LICENSE("GPL");
|
|
--
|
|
--
|
|
-2.29.2
|
|
|
|
|
|
+2.30.0
|
|
|
|
|