Improve phy-mapphone pm

The phy driver may need to check phy_pm_runtime_enabled() in suspend as PM runtime for phy may be already disabled when phy power_off() is called.

Cc Pavel Machek <[email protected]>

Cc Sebastian Reichel <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/phy/phy-core.c  | 9 +++++++++
 include/linux/phy/phy.h | 6 ++++++
 2 files changed, 15 insertions(+)

drivers/phy/phy-core.c +0 -0

include/linux/phy/phy.h +1 -0

@@ -158,6 +158,7 @@ int phy_pm_runtime_get(struct phy *phy);
 int phy_pm_runtime_get_sync(struct phy *phy);
 int phy_pm_runtime_put(struct phy *phy);
 int phy_pm_runtime_put_sync(struct phy *phy);
+bool phy_pm_runtime_enabled(struct phy *phy);
 void phy_pm_runtime_allow(struct phy *phy);
 void phy_pm_runtime_forbid(struct phy *phy);
 int phy_init(struct phy *phy);

Quoted 30 lines · Tony Lindgren

The phy driver may need to check phy_pm_runtime_enabled() in suspend as PM runtime for phy may be already disabled when phy power_off() is called.

Cc Pavel Machek <[email protected]>

Cc Sebastian Reichel <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/phy/phy-core.c  | 9 +++++++++
 include/linux/phy/phy.h | 6 ++++++
 2 files changed, 15 insertions(+)

drivers/phy/phy-core.c +0 -0

include/linux/phy/phy.h +1 -0

@@ -158,6 +158,7 @@ int phy_pm_runtime_get(struct phy *phy);
 int phy_pm_runtime_get_sync(struct phy *phy);
 int phy_pm_runtime_put(struct phy *phy);
 int phy_pm_runtime_put_sync(struct phy *phy);
+bool phy_pm_runtime_enabled(struct phy *phy);
 void phy_pm_runtime_allow(struct phy *phy);
 void phy_pm_runtime_forbid(struct phy *phy);
 int phy_init(struct phy *phy);

@@ -240,6 +241,11 @@ static inline int phy_pm_runtime_put_sync(struct phy *phy)
 	return -ENOSYS;
 }
 

include/linux/phy/phy.h static inline int phy_pm_runtime_put_sync(struct phy *phy) · line 246

Quoted 3 lines

include/linux/phy/phy.h +3 -0

+static inline bool phy_pm_runtime_enabled(struct phy *phy)
+{
+	return false

Missing semicolon.

Quoted 30 lines

Quoted 30 lines

The phy driver may need to check phy_pm_runtime_enabled() in suspend as PM runtime for phy may be already disabled when phy power_off() is called.

Cc Pavel Machek <[email protected]>

Cc Sebastian Reichel <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/phy/phy-core.c  | 9 +++++++++
 include/linux/phy/phy.h | 6 ++++++
 2 files changed, 15 insertions(+)

drivers/phy/phy-core.c +0 -0

include/linux/phy/phy.h +1 -0

@@ -158,6 +158,7 @@ int phy_pm_runtime_get(struct phy *phy);
 int phy_pm_runtime_get_sync(struct phy *phy);
 int phy_pm_runtime_put(struct phy *phy);
 int phy_pm_runtime_put_sync(struct phy *phy);
+bool phy_pm_runtime_enabled(struct phy *phy);
 void phy_pm_runtime_allow(struct phy *phy);
 void phy_pm_runtime_forbid(struct phy *phy);
 int phy_init(struct phy *phy);

@@ -240,6 +241,11 @@ static inline int phy_pm_runtime_put_sync(struct phy *phy)
 	return -ENOSYS;
 }
 

Quoted 5 lines

include/linux/phy/phy.h static inline int phy_pm_runtime_put_sync(struct phy *phy) · line 246

Quoted 3 lines

include/linux/phy/phy.h +3 -0

+static inline bool phy_pm_runtime_enabled(struct phy *phy)
+{
+	return false

Missing semicolon.

Oops thanks for catching that. I guess I did not try building without CONFIG_GENERIC_PHY. Will fix and repost.

Quoted 10 lines

Quoted 9 lines

include/linux/phy/phy.h static inline int phy_pm_runtime_put_sync(struct phy *phy) · line 246

Quoted 7 lines

include/linux/phy/phy.h +3 -0

@@ -240,6 +241,11 @@ static inline int phy_pm_runtime_put_sync(struct phy *phy)
 	return -ENOSYS;
 }
 
+static inline bool phy_pm_runtime_enabled(struct phy *phy)
+{
+	return false

Missing semicolon.

Quoted 2 lines

Oops thanks for catching that. I guess I did not try building without CONFIG_GENERIC_PHY. Will fix and repost.

Did this series get lost/forgotten somewhere? Is it still needed? Any way I can help?

I noticed that phy_pm_runtime_get_sync() and phy_pm_runtime_put() are not currently doing anything for phy-mapphone-mdm6600, only the sysfs interface for works for "auto" and "on".

This is because of the shared GPIO pins between mdm6600 USB port and n_gsm port. We have not enabled runtime PM for the phy driver until after we've booted up mdm6600 properly to the USB mode. Otherwise phy_create() would have called pm_runtime_enable() and pm_runtime_no_callbacks() automatically on init.

Let's fix this by registering the phy a bit later after we've powered up the mdm6600 USB port.

And as the PM runtime support is only needed for the n_gsm mode and not for USB, we can allow the device to idle between phy_mdm6600_power_on() and phy_mdm6600_power_off(). Note that for suspend, runtime_pm is already disabled for the phy so we need to check for phy_pm_runtime_enabled().

Cc Pavel Machek <[email protected]>

Cc Sebastian Reichel <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/phy/motorola/phy-mapphone-mdm6600.c | 71 +++++++++++++++------
 1 file changed, 51 insertions(+), 20 deletions(-)

drivers/phy/motorola/phy-mapphone-mdm6600.c +2 -0

@@ -16,6 +16,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/of_platform.h>
 #include <linux/phy/phy.h>
+#include <linux/pinctrl/consumer.h>
 
 #define PHY_MDM6600_PHY_DELAY_MS	4000	/* PHY enable 2.2s to 3.5s */
 #define PHY_MDM6600_ENABLED_DELAY_MS	8000	/* 8s more total for MDM6600 */

@@ -124,12 +125,22 @@ static int phy_mdm6600_power_on(struct phy *x)
 {
 	struct phy_mdm6600 *ddata = phy_get_drvdata(x);
 	struct gpio_desc *enable_gpio = ddata->ctrl_gpios[PHY_MDM6600_ENABLE];
+	int error;
 
 	if (!ddata->enabled)
 		return -ENODEV;
 

drivers/phy/motorola/phy-mapphone-mdm6600.c static int phy_mdm6600_power_on(struct phy *x) · line 142

Quoted 3 lines · Tony Lindgren

drivers/phy/motorola/phy-mapphone-mdm6600.c +3 -0

+	/* Allow aggressive PM for USB, it's only needed for n_gsm port */
+	if (phy_pm_runtime_enabled(ddata->generic_phy))
+		phy_pm_runtime_put(ddata->generic_phy);

phy_*() API's are generally added to be used by the consumer driver. I guess in this case we can directly use pm_runtime_enabled(x).