net: ipa: don't use ipa_clock_get() in "ipa_modem.c"

When we open or close the modem network device we need to ensure the
hardware is powered.  Replace the callers of ipa_clock_get() found
in ipa_open() and ipa_stop() with calls to pm_runtime_get_sync().
If an error is returned, simply return that error to the caller
(without any error or warning message).  This could conceivably
occur if the function was called while the system was suspended,
but that really shouldn't happen.  Replace corresponding calls to
ipa_clock_put() with pm_runtime_put() also.

If the modem crashes we also need to ensure the hardware is powered
to recover.  If getting power returns an error there's not much we
can do, but at least report the error.  (Ideally the remoteproc SSR
code would ensure the AP was not suspended when it sends the
notification, but that is not (yet) the case.)

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_modem.c b/drivers/net/ipa/ipa_modem.c
index 16d87910305e1e4eae1d60feb71185e796b2216d..11f0204a9695753c1439cdbb9749dd31df65dc1c 100644 (file)
--- a/drivers/net/ipa/ipa_modem.c
+++ b/drivers/net/ipa/ipa_modem.c
@@ -49,15 +49,17 @@ static int ipa_open(struct net_device *netdev)
 {
        struct ipa_priv *priv = netdev_priv(netdev);
        struct ipa *ipa = priv->ipa;
+       struct device *dev;
        int ret;
 
-       ret = ipa_clock_get(ipa);
-       if (WARN_ON(ret < 0))
-               goto err_clock_put;
+       dev = &ipa->pdev->dev;
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0)
+               goto err_power_put;
 
        ret = ipa_endpoint_enable_one(ipa->name_map[IPA_ENDPOINT_AP_MODEM_TX]);
        if (ret)
-               goto err_clock_put;
+               goto err_power_put;
 
        ret = ipa_endpoint_enable_one(ipa->name_map[IPA_ENDPOINT_AP_MODEM_RX]);
        if (ret)
@@ -65,14 +67,14 @@ static int ipa_open(struct net_device *netdev)
 
        netif_start_queue(netdev);
 
-       (void)ipa_clock_put(ipa);
+       (void)pm_runtime_put(dev);
 
        return 0;
 
 err_disable_tx:
        ipa_endpoint_disable_one(ipa->name_map[IPA_ENDPOINT_AP_MODEM_TX]);
-err_clock_put:
-       (void)ipa_clock_put(ipa);
+err_power_put:
+       (void)pm_runtime_put(dev);
 
        return ret;
 }
@@ -82,18 +84,20 @@ static int ipa_stop(struct net_device *netdev)
 {
        struct ipa_priv *priv = netdev_priv(netdev);
        struct ipa *ipa = priv->ipa;
+       struct device *dev;
        int ret;
 
-       ret = ipa_clock_get(ipa);
-       if (WARN_ON(ret < 0))
-               goto out_clock_put;
+       dev = &ipa->pdev->dev;
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0)
+               goto out_power_put;
 
        netif_stop_queue(netdev);
 
        ipa_endpoint_disable_one(ipa->name_map[IPA_ENDPOINT_AP_MODEM_RX]);
        ipa_endpoint_disable_one(ipa->name_map[IPA_ENDPOINT_AP_MODEM_TX]);
-out_clock_put:
-       (void)ipa_clock_put(ipa);
+out_power_put:
+       (void)pm_runtime_put(dev);
 
        return 0;
 }
@@ -362,9 +366,11 @@ static void ipa_modem_crashed(struct ipa *ipa)
        struct device *dev = &ipa->pdev->dev;
        int ret;
 
-       ret = ipa_clock_get(ipa);
-       if (WARN_ON(ret < 0))
-               goto out_clock_put;
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0) {
+               dev_err(dev, "error %d getting power to handle crash\n", ret);
+               goto out_power_put;
+       }
 
        ipa_endpoint_modem_pause_all(ipa, true);
 
@@ -391,8 +397,8 @@ static void ipa_modem_crashed(struct ipa *ipa)
        if (ret)
                dev_err(dev, "error %d zeroing modem memory regions\n", ret);
 
-out_clock_put:
-       (void)ipa_clock_put(ipa);
+out_power_put:
+       (void)pm_runtime_put(dev);
 }
 
 static int ipa_modem_notify(struct notifier_block *nb, unsigned long action,