| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 23 Jun 2022 01:24:40 +0200
From: Robert Foss <robert.foss@...aro.org>
To: Konrad Dybcio <konrad.dybcio@...ainline.org>
Cc: bjorn.andersson@...aro.org, agross@...nel.org,
mturquette@...libre.com, sboyd@...nel.org, robh+dt@...nel.org,
krzk+dt@...nel.org, jonathan@...ek.ca,
linux-arm-msm@...r.kernel.org, linux-clk@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
Subject: Re: [PATCH v6 4/6] clk: qcom: add support for SM8350 DISPCC
On Wed, 22 Jun 2022 at 12:22, Konrad Dybcio
<konrad.dybcio@...ainline.org> wrote:
>
>
>
> On 22.06.2022 01:34, Robert Foss wrote:
> > From: Jonathan Marek <jonathan@...ek.ca>
> >
> > Add support to the SM8350 display clock controller by extending the SM8250
> > display clock controller, which is almost identical but has some minor
> > differences.
> >
> > Signed-off-by: Jonathan Marek <jonathan@...ek.ca>
> > Signed-off-by: Robert Foss <robert.foss@...aro.org>
> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
> > ---
> >
> > Changes since v1
> > - Remove comment - Dmitry
> >
> > Changes since v2
> > - Add my SoB - Bjorn
> > - Remove CLK_ASSUME_ENABLED_WHEN_UNUSED flag
> >
> > Changes since v3
> > - Add kconfig dependency on SM_GCC_8350 - Konrad
> > - Change hex to lowercase - Konrad
> > - Split from dispcc-sm8250.c implementation
> > - Switch from .fw_name to .index
> >
> > Changes since v4
> > - Hex to lowercase - Konrad
> > - Remove bad match table entries - Konrad
> >
> > Changes since v5
> > - Reverted split from dispcc-sm8250
> > - Re-added tags from v3
> >
> >
> > drivers/clk/qcom/Kconfig | 4 +--
> > drivers/clk/qcom/dispcc-sm8250.c | 60 +++++++++++++++++++++++++++++++-
> > 2 files changed, 61 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
> > index b11235c21952..4c3d1a548b7a 100644
> > --- a/drivers/clk/qcom/Kconfig
> > +++ b/drivers/clk/qcom/Kconfig
> > @@ -618,11 +618,11 @@ config SM_DISPCC_6125
> > splash screen
> >
> > config SM_DISPCC_8250
> > - tristate "SM8150 and SM8250 Display Clock Controller"
> > + tristate "SM8150/SM8250/SM8350 Display Clock Controller"
> > depends on SM_GCC_8150 || SM_GCC_8250
> || SM_GCC_8350
Ack
>
> > help
> > Support for the display clock controller on Qualcomm Technologies, Inc
> > - SM8150 and SM8250 devices.
> > + SM8150/SM8250/SM8350 devices.
> > Say Y if you want to support display devices and functionality such as
> > splash screen.
> >
> > diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c
> > index db9379634fb2..4e101d584115 100644
> > --- a/drivers/clk/qcom/dispcc-sm8250.c
> > +++ b/drivers/clk/qcom/dispcc-sm8250.c
> > @@ -43,6 +43,10 @@ static struct pll_vco vco_table[] = {
> > { 249600000, 2000000000, 0 },
> > };
> >
> > +static struct pll_vco lucid_5lpe_vco[] = {
> > + { 249600000, 1750000000, 0 },
> > +};
> > +
> > static struct alpha_pll_config disp_cc_pll0_config = {
> > .l = 0x47,
> > .alpha = 0xE000,
> > @@ -1228,6 +1232,7 @@ static const struct of_device_id disp_cc_sm8250_match_table[] = {
> > { .compatible = "qcom,sc8180x-dispcc" },
> > { .compatible = "qcom,sm8150-dispcc" },
> > { .compatible = "qcom,sm8250-dispcc" },
> > + { .compatible = "qcom,sm8350-dispcc" },
> > { }
> > };
> > MODULE_DEVICE_TABLE(of, disp_cc_sm8250_match_table);
> > @@ -1258,7 +1263,7 @@ static int disp_cc_sm8250_probe(struct platform_device *pdev)
> > return PTR_ERR(regmap);
> > }
> >
> > - /* note: trion == lucid, except for the prepare() op */
> > + /* Apply differences for SM8150 and SM8350 */
> I think both comments should stay, as the one you're adding doesn't explain the BUILD_BUG_ON()
Ack
>
>
> Konrad
> > BUILD_BUG_ON(CLK_ALPHA_PLL_TYPE_TRION != CLK_ALPHA_PLL_TYPE_LUCID);
> > if (of_device_is_compatible(pdev->dev.of_node, "qcom,sc8180x-dispcc") ||
> > of_device_is_compatible(pdev->dev.of_node, "qcom,sm8150-dispcc")) {
> > @@ -1270,6 +1275,59 @@ static int disp_cc_sm8250_probe(struct platform_device *pdev)
> > disp_cc_pll1_config.config_ctl_hi1_val = 0x00000024;
> > disp_cc_pll1_config.user_ctl_hi1_val = 0x000000D0;
> > disp_cc_pll1_init.ops = &clk_alpha_pll_trion_ops;
> > + } else if (of_device_is_compatible(pdev->dev.of_node, "qcom,sm8350-dispcc")) {
> > + static struct clk_rcg2 * const rcgs[] = {
> > + &disp_cc_mdss_byte0_clk_src,
> > + &disp_cc_mdss_byte1_clk_src,
> > + &disp_cc_mdss_dp_aux1_clk_src,
> > + &disp_cc_mdss_dp_aux_clk_src,
> > + &disp_cc_mdss_dp_link1_clk_src,
> > + &disp_cc_mdss_dp_link_clk_src,
> > + &disp_cc_mdss_dp_pixel1_clk_src,
> > + &disp_cc_mdss_dp_pixel2_clk_src,
> > + &disp_cc_mdss_dp_pixel_clk_src,
> > + &disp_cc_mdss_esc0_clk_src,
> > + &disp_cc_mdss_mdp_clk_src,
> > + &disp_cc_mdss_pclk0_clk_src,
> > + &disp_cc_mdss_pclk1_clk_src,
> > + &disp_cc_mdss_rot_clk_src,
> > + &disp_cc_mdss_vsync_clk_src,
> > + };
> > + static struct clk_regmap_div * const divs[] = {
> > + &disp_cc_mdss_byte0_div_clk_src,
> > + &disp_cc_mdss_byte1_div_clk_src,
> > + &disp_cc_mdss_dp_link1_div_clk_src,
> > + &disp_cc_mdss_dp_link_div_clk_src,
> > + };
> > + unsigned int i;
> > + static bool offset_applied;
> > +
> > + /* only apply the offsets once (in case of deferred probe) */
> > + if (!offset_applied) {
> > + for (i = 0; i < ARRAY_SIZE(rcgs); i++)
> > + rcgs[i]->cmd_rcgr -= 4;
> > +
> > + for (i = 0; i < ARRAY_SIZE(divs); i++) {
> > + divs[i]->reg -= 4;
> > + divs[i]->width = 4;
> > + }
> > +
> > + disp_cc_mdss_ahb_clk.halt_reg -= 4;
> > + disp_cc_mdss_ahb_clk.clkr.enable_reg -= 4;
> > +
> > + offset_applied = true;
> > + }
> > +
> > + disp_cc_mdss_ahb_clk_src.cmd_rcgr = 0x22a0;
> > +
> > + disp_cc_pll0_config.config_ctl_hi1_val = 0x2a9a699c;
> > + disp_cc_pll0_config.test_ctl_hi1_val = 0x01800000;
> > + disp_cc_pll0_init.ops = &clk_alpha_pll_lucid_5lpe_ops;
> > + disp_cc_pll0.vco_table = lucid_5lpe_vco;
> > + disp_cc_pll1_config.config_ctl_hi1_val = 0x2a9a699c;
> > + disp_cc_pll1_config.test_ctl_hi1_val = 0x01800000;
> > + disp_cc_pll1_init.ops = &clk_alpha_pll_lucid_5lpe_ops;
> > + disp_cc_pll1.vco_table = lucid_5lpe_vco;
> > }
> >
> > clk_lucid_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config);
Powered by blists - more mailing lists