clk: qcom: alpha-pll: Make error prints more informative

I recently ran across this printk error message spewing in my logs

 Call set rate on the PLL with rounded rates!

and I had no idea what clk that was or what rate was failing to round
properly. Make the printk more informative by telling us what went wrong
and also add the name of the clk that's failing to change rate.
Furthermore, update the other printks in this file with the clk name
each time so we know what clk we're talking about.

Cc: Taniya Das <tdas@codeaurora.org>
Cc: Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lkml.kernel.org/r/20200205065421.9426-1-swboyd@chromium.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
index 7c2936d..6d94677 100644 (file)
--- a/drivers/clk/qcom/clk-alpha-pll.c
+++ b/drivers/clk/qcom/clk-alpha-pll.c
@@ -544,7 +544,8 @@ static int __clk_alpha_pll_set_rate(struct clk_hw *hw, unsigned long rate,
        rate = alpha_pll_round_rate(rate, prate, &l, &a, alpha_width);
        vco = alpha_pll_find_vco(pll, rate);
        if (pll->vco_table && !vco) {
-               pr_err("alpha pll not in a valid vco range\n");
+               pr_err("%s: alpha pll not in a valid vco range\n",
+                      clk_hw_get_name(hw));
                return -EINVAL;
        }
 
@@ -722,7 +723,7 @@ static int alpha_pll_huayra_set_rate(struct clk_hw *hw, unsigned long rate,
         */
        if (clk_alpha_pll_is_enabled(hw)) {
                if (cur_alpha != a) {
-                       pr_err("clock needs to be gated %s\n",
+                       pr_err("%s: clock needs to be gated\n",
                               clk_hw_get_name(hw));
                        return -EBUSY;
                }
@@ -1170,7 +1171,7 @@ static int alpha_pll_fabia_set_rate(struct clk_hw *hw, unsigned long rate,
        struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
        u32 l, alpha_width = pll_alpha_width(pll);
        u64 a;
-       unsigned long rrate;
+       unsigned long rrate, max = rate + FABIA_PLL_RATE_MARGIN;
 
        rrate = alpha_pll_round_rate(rate, prate, &l, &a, alpha_width);
 
@@ -1178,8 +1179,9 @@ static int alpha_pll_fabia_set_rate(struct clk_hw *hw, unsigned long rate,
         * Due to limited number of bits for fractional rate programming, the
         * rounded up rate could be marginally higher than the requested rate.
         */
-       if (rrate > (rate + FABIA_PLL_RATE_MARGIN) || rrate < rate) {
-               pr_err("Call set rate on the PLL with rounded rates!\n");
+       if (rrate > max || rrate < rate) {
+               pr_err("%s: Rounded rate %lu not within range [%lu, %lu)\n",
+                      clk_hw_get_name(hw), rrate, rate, max);
                return -EINVAL;
        }
 
@@ -1196,6 +1198,7 @@ static int alpha_pll_fabia_prepare(struct clk_hw *hw)
        struct clk_hw *parent_hw;
        unsigned long cal_freq, rrate;
        u32 cal_l, val, alpha_width = pll_alpha_width(pll);
+       const char *name = clk_hw_get_name(hw);
        u64 a;
        int ret;
 
@@ -1210,7 +1213,7 @@ static int alpha_pll_fabia_prepare(struct clk_hw *hw)
 
        vco = alpha_pll_find_vco(pll, clk_hw_get_rate(hw));
        if (!vco) {
-               pr_err("alpha pll: not in a valid vco range\n");
+               pr_err("%s: alpha pll not in a valid vco range\n", name);
                return -EINVAL;
        }
 
@@ -1236,7 +1239,7 @@ static int alpha_pll_fabia_prepare(struct clk_hw *hw)
        /* Bringup the PLL at calibration frequency */
        ret = clk_alpha_pll_enable(hw);
        if (ret) {
-               pr_err("alpha pll calibration failed\n");
+               pr_err("%s: alpha pll calibration failed\n", name);
                return ret;
        }