net: ipa: use icc_enable() and icc_disable()

The interconnect framework now provides the ability to enable and
disable interconnects without having to change their recorded
"enabled" bandwidth value.  Use this mechanism, rather than setting
the bandwidth values to zero and non-zero respectively to disable
and enable the IPA interconnects.

Disable each interconnect before setting its "enabled" average and
peak bandwidth values.  Thereafter, enable and disable interconnects
when required rather than setting their bandwidths.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 28be0e4..ec2ebc7 100644 (file)
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -75,17 +75,29 @@ static int ipa_interconnect_init_one(struct device *dev,
                                     const struct ipa_interconnect_data *data)
 {
        struct icc_path *path;
+       int ret;
 
        path = of_icc_get(dev, data->name);
        if (IS_ERR(path)) {
-               int ret = PTR_ERR(path);
-
+               ret = PTR_ERR(path);
                dev_err_probe(dev, ret, "error getting %s interconnect\n",
                              data->name);
 
                return ret;
        }
 
+       /* All interconnects are initially disabled */
+       (void)icc_disable(path);
+
+       /* Set the bandwidth values to be used when enabled */
+       ret = icc_set_bw(path, data->average_bandwidth, data->peak_bandwidth);
+       if (ret) {
+               dev_err(dev, "error %d setting %s interconnect bandwidths\n",
+                       ret, data->name);
+
+               return ret;
+       }
+
        interconnect->path = path;
        interconnect->name = data->name;
        interconnect->avg_bw = data->average_bandwidth;
@@ -154,9 +166,7 @@ static int ipa_interconnect_enable(struct ipa *ipa)
 
        interconnect = power->interconnect;
        for (i = 0; i < power->interconnect_count; i++) {
-               ret = icc_set_bw(interconnect->path,
-                                interconnect->avg_bw,
-                                interconnect->peak_bw);
+               ret = icc_enable(interconnect->path);
                if (ret) {
                        dev_err(&ipa->pdev->dev,
                                "error %d enabling %s interconnect\n",
@@ -170,7 +180,7 @@ static int ipa_interconnect_enable(struct ipa *ipa)
 
 out_unwind:
        while (interconnect-- > power->interconnect)
-               (void)icc_set_bw(interconnect->path, 0, 0);
+               (void)icc_disable(interconnect->path);
 
        return ret;
 }
@@ -189,7 +199,7 @@ static int ipa_interconnect_disable(struct ipa *ipa)
        interconnect = power->interconnect + count;
        while (count--) {
                interconnect--;
-               ret = icc_set_bw(interconnect->path, 0, 0);
+               ret = icc_disable(interconnect->path);
                if (ret) {
                        dev_err(dev, "error %d disabling %s interconnect\n",
                                ret, interconnect->name);