Skip to contentSkip to conversation

Revert "xhci: plat: Register shutdown for xhci_plat"

PATCH In review Greg Hackmann 3 participants 5 messages Apr 13, 2018 – Apr 14, 2018

Subsystems (3)
Stable branch USB USB xHCI driver
lore
Share & tools
lore

Greg Hackmann

author
#0 lore raw

PATCH 1/1 Revert "xhci: plat: Register shutdown for xhci_plat"

Pixel 2 field testers reported that when they tried to reboot their phones with some USB devices plugged in, the reboot would get wedged and eventually trigger watchdog reset. Once the Pixel kernel team found a reliable repro case, they narrowed it down to this commit's 4.4.y backport. Reverting the change made the issue go away.

This reverts commit b07c12517f2aed0add8ce18146bb426b14099392.

Cc [email protected]
Signed-off-by Greg Hackmann <[email protected]>
---
 drivers/usb/host/xhci-plat.c | 1 -
 1 file changed, 1 deletion(-)
drivers/usb/host/xhci-plat.c +0 -1
index df327dcc2bac..ea089fdda611 100644
@@ -420,7 +420,6 @@ MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match);
 static struct platform_driver usb_xhci_driver = {
 	.probe	= xhci_plat_probe,
 	.remove	= xhci_plat_remove,
-	.shutdown	= usb_hcd_platform_shutdown,
 	.driver	= {
 		.name = "xhci-hcd",
 		.pm = &xhci_plat_pm_ops,
#1 lore raw
Quoted 6 lines · Greg Hackmann

Pixel 2 field testers reported that when they tried to reboot their phones with some USB devices plugged in, the reboot would get wedged and
eventually trigger watchdog reset. Once the Pixel kernel team found a reliable repro case, they narrowed it down to this commit's 4.4.y backport. Reverting the change made the issue go away.

Are you allowed to make the repro steps public? I'm writing this from a walleye and would be grateful if I could test for this in the modifed tree I'm running atm.

maintainer
#2 lore raw
Quoted 11 lines · Harsh Shandilya
Quoted 6 lines · Greg Hackmann

Pixel 2 field testers reported that when they tried to reboot their phones with some USB devices plugged in, the reboot would get wedged and
eventually trigger watchdog reset. Once the Pixel kernel team found a reliable repro case, they narrowed it down to this commit's 4.4.y backport. Reverting the change made the issue go away.

Are you allowed to make the repro steps public? I'm writing this from a walleye and would be grateful if I could test for this in the modifed tree I'm running atm. --

I was told the steps are pretty simple:
- reboot the phone a lot
eventually it will hang. There's a fix in the code aurora kernel tree for this that they never sent upstream for some odd reason (they sent the first patch, why not the second?)

I'll go revert this for now, thanks for the patch!

greg k-h
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 21 lines · Greg Kroah-Hartman
Quoted 1 line · Harsh Shandilya

On 13 April 2018 5:59:51 AM IST, Greg Hackmann <[email protected]>

Quoted 4 lines · wrote:
Quoted 4 lines

Pixel 2 field testers reported that when they tried to reboot their phones with some USB devices plugged in, the reboot would get wedged and
eventually trigger watchdog reset. Once the Pixel kernel team found

a

Quoted 6 lines
Quoted 2 lines

reliable repro case, they narrowed it down to this commit's 4.4.y backport. Reverting the change made the issue go away.

Are you allowed to make the repro steps public? I'm writing this from a walleye and would be grateful if I could test for this in the modifed tree I'm running atm. --

I was told the steps are pretty simple:
- reboot the phone a lot
eventually it will hang. There's a fix in the code aurora kernel tree for this that they never sent upstream for some odd reason (they sent the first patch, why not the second?)

Quoted 3 lines

I'll go revert this for now, thanks for the patch!

greg k-h

That'd make sense, I only tried rebooting like five times before I had to run for a class.

As far as CAF is concerned, I feel the not submitting upstream, working extra to write patches which have usually better variants already upstream, seems to be common. All USB changes were dropped when they merged kernel-common into msm-3.18 with no real explanation which has been an annoyance more than once during merging -stable in my fork of msm-3.18. While I understand their situation of maintaining upwards of 5 million lines of code not upstream, it still feels sloppy to not merge stable updates and do extra work instead. /* End rant */

maintainer
#4 lore raw
Quoted 28 lines · Harsh Shandilya
Quoted 21 lines · Greg Kroah-Hartman
Quoted 1 line · Harsh Shandilya

On 13 April 2018 5:59:51 AM IST, Greg Hackmann <[email protected]>

Quoted 4 lines · wrote:
Quoted 4 lines

Pixel 2 field testers reported that when they tried to reboot their phones with some USB devices plugged in, the reboot would get wedged and
eventually trigger watchdog reset. Once the Pixel kernel team found

a

Quoted 6 lines
Quoted 2 lines

reliable repro case, they narrowed it down to this commit's 4.4.y backport. Reverting the change made the issue go away.

Are you allowed to make the repro steps public? I'm writing this from a walleye and would be grateful if I could test for this in the modifed tree I'm running atm. --

I was told the steps are pretty simple:
- reboot the phone a lot
eventually it will hang. There's a fix in the code aurora kernel tree for this that they never sent upstream for some odd reason (they sent the first patch, why not the second?)

Quoted 3 lines

I'll go revert this for now, thanks for the patch!

greg k-h

That'd make sense, I only tried rebooting like five times before I had to run for a class.

Quoted 8 lines

As far as CAF is concerned, I feel the not submitting upstream, working extra to write patches which have usually better variants already upstream, seems to be common. All USB changes were dropped when they merged kernel-common into msm-3.18 with no real explanation which has been an annoyance more than once during merging -stable in my fork of msm-3.18. While I understand their situation of maintaining upwards of 5 million lines of code not upstream, it still feels sloppy to not merge stable updates and do extra work instead. /* End rant */

CAF fixed this back on Feb 1 in their tree, yet did not send that upstream, or to anyone else:

	https://source.codeaurora.org/quic/la/kernel/msm-4.4/commit/?h=LV.HB.1.1.5-03810-8x96.0&id=a7a5307ee04ad349d365ad50f304605a9cd9bd0a

Feel free to rant some more, I'm going to go revert the original upstream patch as that is half-completed, and obviously broken :(

thanks,

greg k-h
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html