Quoting Amit Nischal (2018-08-12 23:33:05)
> diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
> index 52208d4..a57ce00 100644
> --- a/drivers/clk/qcom/clk-rcg2.c
> +++ b/drivers/clk/qcom/clk-rcg2.c
> @@ -866,7 +866,7 @@ static int clk_rcg2_shared_set_rate_and_parent(struct clk_hw *hw,
> return clk_rcg2_shared_set_rate(hw, rate, parent_rate);
> }
>
> -static int clk_rcg2_shared_enable(struct clk_hw *hw)
> +static int __clk_rcg2_shared_enable(struct clk_hw *hw)
Name this clk_rcg2_force_enable() please. Also add a comment above like:
/* Set RCG force enable bit and flush out any configuration settings */
> {
> struct clk_rcg2 *rcg = to_clk_rcg2(hw);
> int ret;
> @@ -879,7 +879,14 @@ static int clk_rcg2_shared_enable(struct clk_hw *hw)
> if (ret)
> return ret;
>
> - ret = update_config(rcg);
> + return update_config(rcg);
> +}
> +
> +static int clk_rcg2_shared_enable(struct clk_hw *hw)
> +{
> + int ret;
> +
> + ret = __clk_rcg2_shared_enable(hw);
> if (ret)
> return ret;
>
> @@ -929,3 +936,78 @@ static void clk_rcg2_shared_disable(struct clk_hw *hw)
> .set_rate_and_parent = clk_rcg2_shared_set_rate_and_parent,
> };
> EXPORT_SYMBOL_GPL(clk_rcg2_shared_ops);
> +
> +static int clk_rcg2_gfx3d_enable(struct clk_hw *hw)
> +{
> + return __clk_rcg2_shared_enable(hw);
> +}
And then drop this wrapper and just use clk_rcg2_force_enable() in the
clk_ops structure.
> +
> +static int clk_rcg2_gfx3d_determine_rate(struct clk_hw *hw,
> + struct clk_rate_request *req)
> +{
> + struct clk_rate_request parent_req = { };
> + struct clk_hw *p;
> + unsigned long rate = req->rate;
> + int ret;
> +
> + rate = clamp(rate, req->min_rate, req->max_rate);
Doesn't the core already clamp the rate for you? Seems wasteful to do it
again.
> +
> + /* Get fixed parent - GPU_CC_PLL0_OUT_EVEN */
I hope this doesn't change in the future! Any way to make this
detectable by storing the parent index somewhere so this op can work
with any future index selection instead of hardcoding '1' here?
> + p = clk_hw_get_parent_by_index(hw, 1);
> +
> + /* Parent should always run at twice of the requested rate */
> + parent_req.rate = 2 * rate;
> +
> + ret = __clk_determine_rate(req->best_parent_hw, &parent_req);
> + if (ret)
> + return ret;
> +
> + req->best_parent_hw = p;
> + req->best_parent_rate = parent_req.rate;
> + req->rate = parent_req.rate / 2;
> +
> + return 0;
> +}
> +
> +static int clk_rcg2_gfx3d_set_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long parent_rate)
> +{
> + struct clk_rcg2 *rcg = to_clk_rcg2(hw);
> + int ret;
> + u32 cfg;
> +
> + /* Configure fixed SRC and DIV */
> + cfg = rcg->parent_map[1].cfg << CFG_SRC_SEL_SHIFT;
This would need to be dynamic too instead of hardcoding '1'.
> + cfg |= 0x3 << CFG_SRC_DIV_SHIFT;
> +
> + ret = regmap_write(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, cfg);
> + if (ret)
> + return ret;
> +
> + /*
> + * In case clock is disabled, update the SRC and DIV only
> + * and return without configuration update.
Add:
When the clk is enabled, we'll configure the rate to be what we
requested here. This allows other users of this clk (i.e. GPU)
to change the rate when this clk is disabled from our perspective.
> + */
> + if (!__clk_is_enabled(hw->clk))
> + return 0;
> +
> + return update_config(rcg);
> +}
