PCI: Revert "PCI: Add runtime PM support for PCIe ports"

Commit Message

Kilian Singer Dec. 29, 2016, 10:52 p.m. UTC

Just to be sure I am currently using this 
repository:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

using
commit 2d706e790f0508dff4fb72eca9b4892b79757feb
Merge: 8f18e4d03ed8 8759fec4af22
Author: Linus Torvalds <[e-mail]>
Date:   Tue Dec 27 17:51:36 2016 -0800

The provided patch fails I can locate the positions by hand though.

Shall I use another repository or commit?

Best regards

PS:
In order to compile on debian I use the makefile patch to disable PIE:
http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.8-rc2/0002-UBUNTU-SAUCE-no-up-disable-pie-when-gcc-has-it-enabl.patch

But I guess that this does not matter.


----- Original Message -----
From: "Lukas Wunner" <[e-mail]>
To: "Kilian Singer" <[e-mail]>
Cc: "Bjorn Helgaas" <[e-mail]>, "linux-pci" <[e-mail]>, "Mika Westerberg" <[e-mail]>, "Rafael J. Wysocki" <[e-mail]>
Sent: Thursday, December 29, 2016 6:50:28 PM
Subject: Re: PCI: Revert "PCI: Add runtime PM support for PCIe ports"

On Thu, Dec 29, 2016 at 05:20:22PM +0100, Kilian Singer wrote:
> One thing that was always weird in my debian system is, 
> that even with working lock screen on the 4.7.0-1 version.
> The lock screen is not a black screen but instead seems to
> be a static screenshot of the desktop.

This sounds like an issue with the i915 driver.  When the static
screenshot is shown, i915 may have turned on panel self-refresh
(PSR).  There were numerous PSR issues.


> I know it is a repetition of what I have written above but this behaviour
> (comment 19) should be contrasted to the behaviour on the 4.8 and 4.9
> kernel which make my system unresponsive:
> Here the desktop is non static. I can see xclock ticking. The mouse
> moves. But any keyboard interaction or mouse click is not possible anymore.

It's very odd that this should be related to a root port suspending.
If mouse movements are still visible, the I/O ports of the keyboard
and mouse must still be accessible.

Perhaps you could apply the attached small debug patch, this will
log a message whenever a device runtime suspends/resumes, so it
should log when the root port that's causing trouble goes to D3.
Then we would at least know which one it is.

My money is on the root port above the Nvidia card, you can also
try to keep that one awake with
echo on > /sys/bus/pci/devices/0000:00:01.0/power/control

Thanks,

Lukas

Comments

Kilian Singer Dec. 29, 2016, 11:02 p.m. UTC | #1

The patch failes on 2 insert points, but I applied it by hand.
Should I use another repo or commit?

I also patched the Makefile due to the some gcc issues:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841420
I guess that does not matter.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Kilian Singer Dec. 29, 2016, 11:05 p.m. UTC | #2

Sorry for repeating the last part, my webmailer seems to strip
away some text in the overview pane and I thought it got cut away. 
So I sent the "missing" text again...

----- Original Message -----
From: "Kilian Singer" <[e-mail]>
To: "Lukas Wunner" <[e-mail]>
Cc: "Bjorn Helgaas" <[e-mail]>, "linux-pci" <[e-mail]>, "Mika Westerberg" <[e-mail]>, "Rafael J. Wysocki" <[e-mail]>
Sent: Friday, December 30, 2016 12:02:36 AM
Subject: Re: PCI: Revert "PCI: Add runtime PM support for PCIe ports"

The patch failes on 2 insert points, but I applied it by hand.
Should I use another repo or commit?

I also patched the Makefile due to the some gcc issues:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841420
I guess that does not matter.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 4c7055009bd6..9eba9686e302 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -345,9 +345,10 @@  static int rpm_idle(struct device *dev, int rpmflags)
 
 	callback = RPM_GET_CALLBACK(dev, runtime_idle);
 
-	if (callback)
+	if (callback) {
+		dev_info(dev, "rpm_idle\n");
 		retval = __rpm_callback(callback, dev);
-
+	}
 	dev->power.idle_notification = false;
 	wake_up_all(&dev->power.wait_queue);
 
@@ -516,6 +517,7 @@  static int rpm_suspend(struct device *dev, int rpmflags)
 	callback = RPM_GET_CALLBACK(dev, runtime_suspend);
 
 	dev_pm_enable_wake_irq(dev);
+	dev_info(dev, "rpm_suspend\n");
 	retval = rpm_callback(callback, dev);
 	if (retval)
 		goto fail;
@@ -738,6 +740,7 @@  static int rpm_resume(struct device *dev, int rpmflags)
 	callback = RPM_GET_CALLBACK(dev, runtime_resume);
 
 	dev_pm_disable_wake_irq(dev);
+	dev_info(dev, "rpm_resume\n");
 	retval = rpm_callback(callback, dev);
 	if (retval) {
 		__update_runtime_status(dev, RPM_SUSPENDED);