| Message ID | 1397648901-4450-1-git-send-email-grygorii.strashko@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 16, 2014 at 02:48:21PM +0300, Grygorii Strashko wrote: > This fixes a regression on Keystone 2 platforms caused by patch > 57303488cd37da58263e842de134dc65f7c626d5 > "usb: dwc3: adapt dwc3 core to use Generic PHY Framework" which adds > optional support of generic phy in DWC3 core. > > On Keystone 2 platforms the USB is not working now because > CONFIG_GENERIC_PHY isn't set and, as result, Generic PHY APIs stubs > return -ENOSYS always. The log shows: > dwc3 2690000.dwc3: failed to initialize core > dwc3: probe of 2690000.dwc3 failed with error -38 > > Hence, fix it by making NULL a valid phy reference in Generic PHY > APIs stubs in the same way as it was done by the patch > 04c2facad8fee66c981a51852806d8923336f362 "drivers: phy: Make NULL > a valid phy reference". > > CC: Kishon Vijay Abraham I <kishon@ti.com> > CC: Felipe Balbi <balbi@ti.com> > CC: Santosh Shilimkar <santosh.shilimkar@ti.com> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> I thought I'd already acked this one... oh well, need more coffee: Acked-by: Felipe Balbi <balbi@ti.com>
On Wednesday 16 April 2014 08:49 PM, Felipe Balbi wrote: > On Wed, Apr 16, 2014 at 02:48:21PM +0300, Grygorii Strashko wrote: >> This fixes a regression on Keystone 2 platforms caused by patch >> 57303488cd37da58263e842de134dc65f7c626d5 >> "usb: dwc3: adapt dwc3 core to use Generic PHY Framework" which adds >> optional support of generic phy in DWC3 core. >> >> On Keystone 2 platforms the USB is not working now because >> CONFIG_GENERIC_PHY isn't set and, as result, Generic PHY APIs stubs >> return -ENOSYS always. The log shows: >> dwc3 2690000.dwc3: failed to initialize core >> dwc3: probe of 2690000.dwc3 failed with error -38 >> >> Hence, fix it by making NULL a valid phy reference in Generic PHY >> APIs stubs in the same way as it was done by the patch >> 04c2facad8fee66c981a51852806d8923336f362 "drivers: phy: Make NULL >> a valid phy reference". >> >> CC: Kishon Vijay Abraham I <kishon@ti.com> >> CC: Felipe Balbi <balbi@ti.com> >> CC: Santosh Shilimkar <santosh.shilimkar@ti.com> >> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> > > I thought I'd already acked this one... oh well, need more coffee: Indeed.. you acked the v1 of this patch series and already queued the v2 with your acked by ;-) Cheers Kishon > > Acked-by: Felipe Balbi <balbi@ti.com> >
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index e2f5ca9..2760744 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -174,21 +174,29 @@ void devm_of_phy_provider_unregister(struct device *dev, #else static inline int phy_pm_runtime_get(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } static inline int phy_pm_runtime_get_sync(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } static inline int phy_pm_runtime_put(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } static inline int phy_pm_runtime_put_sync(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } @@ -204,21 +212,29 @@ static inline void phy_pm_runtime_forbid(struct phy *phy) static inline int phy_init(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } static inline int phy_exit(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } static inline int phy_power_on(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; } static inline int phy_power_off(struct phy *phy) { + if (!phy) + return 0; return -ENOSYS; }
This fixes a regression on Keystone 2 platforms caused by patch 57303488cd37da58263e842de134dc65f7c626d5 "usb: dwc3: adapt dwc3 core to use Generic PHY Framework" which adds optional support of generic phy in DWC3 core. On Keystone 2 platforms the USB is not working now because CONFIG_GENERIC_PHY isn't set and, as result, Generic PHY APIs stubs return -ENOSYS always. The log shows: dwc3 2690000.dwc3: failed to initialize core dwc3: probe of 2690000.dwc3 failed with error -38 Hence, fix it by making NULL a valid phy reference in Generic PHY APIs stubs in the same way as it was done by the patch 04c2facad8fee66c981a51852806d8923336f362 "drivers: phy: Make NULL a valid phy reference". CC: Kishon Vijay Abraham I <kishon@ti.com> CC: Felipe Balbi <balbi@ti.com> CC: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> --- This fixes for regression in 3.15-rc1 - USB doesn't work on Keystone 2 Changes in v2: - the same check added at stubs phy_pm_runtime_get(struct phy *phy) phy_pm_runtime_get_sync(struct phy *phy) phy_pm_runtime_put(struct phy *phy) phy_pm_runtime_put_sync(struct phy *phy) include/linux/phy/phy.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)