fix u32 vs. pm_message_t in usb
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi!
Quoted 5 lines
Actually, please do NOT apply this. It conflicts with other patches, which have been in the past few MM releases, have also been circulated on linux-usb-devel, and actually address some of the bugs which crept in as things have changed around the USB stack.
It seems to me that USB stack still needs some u32-vs-pm_message_t changes (in rc2-mm1):
Could you apply them?
Pavel
drivers/usb/core/hub.c +2 -2
@@ -1456,7 +1456,7 @@/* FIXME let caller ask to power down the port: * - some devices won't enumerate without a VBUS power cycle * - SRP saves power that way -* - usb_suspend_device(dev,PM_SUSPEND_DISK) +* - usb_suspend_device(dev, PMSG_SUSPEND) * That's easy if this hub can switch power per-port, and * khubd reactivates the port later (timer, SRP, etc). * Powerdown must be optional, because of reset/DFU.
@@ -1531,7 +1531,7 @@/* * Devices on USB hub ports have only one "suspend" state, corresponding -* to ACPI D2 (PM_SUSPEND_MEM), "may cause the device to lose some context". +* to ACPI D2, "may cause the device to lose some context". * State transitions include: * * - suspend, resume ... when the VBUS power link stays live
drivers/usb/gadget/omap_udc.c +5 -7
@@ -2809,17 +2809,15 @@return 0 ; } -/* suspend/resume/wakeup from sysfs (echo > power/state) */ - -static int omap_udc_suspend (struct device *dev,u32 state,u32 level) +static int omap_udc_suspend (struct device *dev,pm_message_t state,u32 level) {if (level !=0 )return 0 ;DBG ("suspend, state %d\n" , state);omap_pullup (&udc->gadget,0 ); - udc->gadget.dev.power.power_state =3 ; - udc->gadget.dev.parent->power.power_state =3 ; + udc->gadget.dev.power.power_state =PMSG_SUSPEND ; + udc->gadget.dev.parent->power.power_state =PMSG_SUSPEND ;return 0 ; }
@@ -2829,8 +2827,8 @@return 0 ;DBG ("resume + wakeup/SRP\n" ); - udc->gadget.dev.parent->power.power_state =0 ; - udc->gadget.dev.power.power_state =0 ; + udc->gadget.dev.parent->power.power_state =PMSG_ON ; + udc->gadget.dev.power.power_state =PMSG_ON ;omap_pullup (&udc->gadget,1 );/* maybe the host would enumerate us if we nudged it */
drivers/usb/host/ohci-omap.c +3 -1
@@ -458,9 +458,11 @@/* states match PCI usage, always suspending the root hub except that * 4 ~= D3cold (ACPI D3) with clock off (resume sees reset). +* +* FIXME: above comment is not right, and code is wrong, too :-(. */ -static int ohci_omap_suspend (struct device *dev,u32 state,u32 level) +static int ohci_omap_suspend (struct device *dev,pm_message_t state,u32 level) {struct ohci_hcd *ohci =hcd_to_ohci (dev_get_drvdata (dev));int status = -EINVAL ;
drivers/usb/host/ohci-pxa27x.c +2 -2
@@ -337,7 +337,7 @@return 0 ; } -static int ohci_hcd_pxa27x_drv_suspend (struct device *dev,u32 state,u32 level) +static int ohci_hcd_pxa27x_drv_suspend (struct device *dev,pm_message_t state,u32 level) {// struct platform_device *pdev = to_platform_device(dev); // struct usb_hcd *hcd = dev_get_drvdata(dev);
@@ -346,7 +346,7 @@return 0 ; } -static int ohci_hcd_pxa27x_drv_resume (struct device *dev,u32 state) +static int ohci_hcd_pxa27x_drv_resume (struct device *dev,u32 level) {// struct platform_device *pdev = to_platform_device(dev); // struct usb_hcd *hcd = dev_get_drvdata(dev);
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Quoted 4 lines · Pavel Machek
It seems to me that USB stack still needs some u32-vs-pm_message_t changes (in rc2-mm1):
Could you apply them?
I see someone changed the requirements for platform_device too ... :)
This patch is mostly NOPs, but many of them tromp on other patches I have in the works. So I'd rather hold off for now, using the rest of the 2.6.12-rc series for only real honest-to-gosh bugfixes. (Isn't that supposed to be the current goal, in any case?)
Something that's not exactly a NOP:
drivers/usb/host/ohci-omap.c line 462
Quoted 8 lines
drivers/usb/host/ohci-omap.c +2
-0@@ -458,9 +458,11 @@/* states match PCI usage, always suspending the root hub except that * 4 ~= D3cold (ACPI D3) with clock off (resume sees reset). +* +* FIXME: above comment is not right, and code is wrong, too :-(.
The comment is exactly right, and matches the code. Has done so for most of a year now, in fact.
What's wrong is the way that the pm_message_t changes have discarded functionality ... including, as a specific example, the ability for drivers to do the right thing based on what kind of suspend state they're entering. (Because pm_message_t is effectively a boolean, rather than a something that's multi-valued.)
I'll repeat myself again, at the risk of being redundant: we need to actually fix this pm_message_t thing to _work_ rather than paper over its botches by discarding functionality.
- Dave