From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD824C433E0 for ; Tue, 30 Mar 2021 17:45:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E2C8619D1 for ; Tue, 30 Mar 2021 17:45:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232481AbhC3Rob (ORCPT ); Tue, 30 Mar 2021 13:44:31 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:27390 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232201AbhC3Ro0 (ORCPT ); Tue, 30 Mar 2021 13:44:26 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1617126266; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=S7SK+qoiRErE+p/MSlZzLNA48shm272YFHqZssNz+jc=; b=kou/LZ5Ha5SEqOiOB4KqF4bscxbGgZ5NhsLSCPVWDBaxLOMZ4qxmZohovV4I2CXam66TEgBu fbguwxa80z3wOVhRFId3yzcS5nuUzYhkdKHJKLCLwPaU+VR7D7i6f9cLj/D4qbeKSO08NjAB bNi89rRPoH9Crb/D6CimjVMXwQI= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-west-2.postgun.com with SMTP id 60636373a2ab6642db5d5c27 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 30 Mar 2021 17:44:19 GMT Sender: abhinavk=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 4437CC43462; Tue, 30 Mar 2021 17:44:19 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: abhinavk) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5B253C433CA; Tue, 30 Mar 2021 17:44:16 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Tue, 30 Mar 2021 10:44:16 -0700 From: abhinavk@codeaurora.org To: Dmitry Baryshkov Cc: Rob Clark , Sean Paul , Jonathan Marek , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Daniel Vetter , freedreno@lists.freedesktop.org, linux-clk@vger.kernel.org Subject: Re: [Freedreno] [PATCH v3 24/25] drm/msm/dsi: inline msm_dsi_phy_set_src_pll In-Reply-To: References: <20210327110305.3289784-1-dmitry.baryshkov@linaro.org> <20210327110305.3289784-25-dmitry.baryshkov@linaro.org> Message-ID: <4cf063ab6f3ced90653973855757f6eb@codeaurora.org> X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2021-03-30 06:42, Dmitry Baryshkov wrote: > On 30/03/2021 06:34, abhinavk@codeaurora.org wrote: >> On 2021-03-27 04:03, Dmitry Baryshkov wrote: >>> The src_truthtable config is not used for some of phys, which use >>> other >>> means of configuring the master/slave usecases. Inline this function >>> with the goal of removing src_pll_id argument in the next commit. >>> >>> Signed-off-by: Dmitry Baryshkov >>> --- >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy.c           | 17 >>> ----------------- >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy.h           |  8 -------- >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c      |  2 -- >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c      | 13 +++++++------ >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c      | 11 +++++++---- >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c      | 13 +++++++------ >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c |  1 - >>>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c       |  2 -- >>>  8 files changed, 21 insertions(+), 46 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c >>> index 74cc11c84d71..56f5134e3933 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c >>> @@ -461,23 +461,6 @@ int msm_dsi_dphy_timing_calc_v4(struct >>> msm_dsi_dphy_timing *timing, >>>      return 0; >>>  } >>> >>> -void msm_dsi_phy_set_src_pll(struct msm_dsi_phy *phy, int pll_id, >>> u32 reg, >>> -                u32 bit_mask) >>> -{ >>> -    int phy_id = phy->id; >>> -    u32 val; >>> - >>> -    if ((phy_id >= DSI_MAX) || (pll_id >= DSI_MAX)) >>> -        return; >>> - >>> -    val = dsi_phy_read(phy->base + reg); >>> - >>> -    if (phy->cfg->src_pll_truthtable[phy_id][pll_id]) >>> -        dsi_phy_write(phy->base + reg, val | bit_mask); >>> -    else >>> -        dsi_phy_write(phy->base + reg, val & (~bit_mask)); >>> -} >>> - >>>  static int dsi_phy_regulator_init(struct msm_dsi_phy *phy) >>>  { >>>      struct regulator_bulk_data *s = phy->supplies; >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h >>> index 8e828c5ca8f4..3b207cf9f6b4 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h >>> @@ -33,12 +33,6 @@ struct msm_dsi_phy_cfg { >>>      unsigned long    min_pll_rate; >>>      unsigned long    max_pll_rate; >>> >>> -    /* >>> -     * Each cell {phy_id, pll_id} of the truth table indicates >>> -     * if the source PLL selection bit should be set for each PHY. >>> -     * Fill default H/W values in illegal cells, eg. cell {0, 1}. >>> -     */ >>> -    bool src_pll_truthtable[DSI_MAX][DSI_MAX]; >>>      const resource_size_t io_start[DSI_MAX]; >>>      const int num_dsi_phy; >>>      const int quirks; >>> @@ -121,7 +115,5 @@ int msm_dsi_dphy_timing_calc_v3(struct >>> msm_dsi_dphy_timing *timing, >>>                  struct msm_dsi_phy_clk_request *clk_req); >>>  int msm_dsi_dphy_timing_calc_v4(struct msm_dsi_dphy_timing *timing, >>>                  struct msm_dsi_phy_clk_request *clk_req); >>> -void msm_dsi_phy_set_src_pll(struct msm_dsi_phy *phy, int pll_id, >>> u32 reg, >>> -                u32 bit_mask); >>> >>>  #endif /* __DSI_PHY_H__ */ >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c >>> index 1fbb54f4df98..04535ccd11ef 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c >>> @@ -919,7 +919,6 @@ static void dsi_10nm_phy_disable(struct >>> msm_dsi_phy *phy) >>>  } >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs = { >>> -    .src_pll_truthtable = { {false, false}, {true, false} }, >>>      .has_phy_lane = true, >>>      .reg_cfg = { >>>          .num = 1, >>> @@ -941,7 +940,6 @@ const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs = >>> { >>>  }; >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_10nm_8998_cfgs = { >>> -    .src_pll_truthtable = { {false, false}, {true, false} }, >>>      .has_phy_lane = true, >>>      .reg_cfg = { >>>          .num = 1, >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c >>> index d08ad0c632b4..7a87bed71e36 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c >>> @@ -947,6 +947,7 @@ static int dsi_14nm_phy_enable(struct msm_dsi_phy >>> *phy, int src_pll_id, >>>      int ret; >>>      void __iomem *base = phy->base; >>>      void __iomem *lane_base = phy->lane_base; >>> +    u32 glbl_test_ctrl; >>> >>>      if (msm_dsi_dphy_timing_calc_v2(timing, clk_req)) { >>>          DRM_DEV_ERROR(&phy->pdev->dev, >>> @@ -994,10 +995,12 @@ static int dsi_14nm_phy_enable(struct >>> msm_dsi_phy *phy, int src_pll_id, >>>      udelay(100); >>>      dsi_phy_write(base + REG_DSI_14nm_PHY_CMN_CTRL_1, 0x00); >>> >>> -    msm_dsi_phy_set_src_pll(phy, src_pll_id, >>> -                REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL, >>> -                DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL); >>> - >>> +    glbl_test_ctrl = dsi_phy_read(base + >>> REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL); >>> +    if (phy->id == DSI_1 && src_pll_id == DSI_0) >>> +        glbl_test_ctrl |= >>> DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    else >>> +        glbl_test_ctrl &= >>> ~DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    dsi_phy_write(base + REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL, >>> glbl_test_ctrl); >>>      ret = dsi_14nm_set_usecase(phy); >>>      if (ret) { >>>          DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, >>> %d\n", >>> @@ -1021,7 +1024,6 @@ static void dsi_14nm_phy_disable(struct >>> msm_dsi_phy *phy) >>>  } >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs = { >>> -    .src_pll_truthtable = { {false, false}, {true, false} }, >>>      .has_phy_lane = true, >>>      .reg_cfg = { >>>          .num = 1, >>> @@ -1043,7 +1045,6 @@ const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs >>> = { >>>  }; >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_14nm_660_cfgs = { >>> -    .src_pll_truthtable = { {false, false}, {true, false} }, >>>      .has_phy_lane = true, >>>      .reg_cfg = { >>>          .num = 1, >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c >>> index 5e73f811d645..f5b88c85a8fc 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c >>> @@ -70,6 +70,7 @@ static int dsi_20nm_phy_enable(struct msm_dsi_phy >>> *phy, int src_pll_id, >>>      int i; >>>      void __iomem *base = phy->base; >>>      u32 cfg_4[4] = {0x20, 0x40, 0x20, 0x00}; >>> +    u32 val; >>> >>>      DBG(""); >>> >>> @@ -83,9 +84,12 @@ static int dsi_20nm_phy_enable(struct msm_dsi_phy >>> *phy, int src_pll_id, >>> >>>      dsi_phy_write(base + REG_DSI_20nm_PHY_STRENGTH_0, 0xff); >>> >>> -    msm_dsi_phy_set_src_pll(phy, src_pll_id, >>> -                REG_DSI_20nm_PHY_GLBL_TEST_CTRL, >>> -                DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL); >>> +    val = dsi_phy_read(base + REG_DSI_20nm_PHY_GLBL_TEST_CTRL); >>> +    if (src_pll_id == DSI_1) >>> +        val |= DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    else >>> +        val &= ~DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    dsi_phy_write(base + REG_DSI_20nm_PHY_GLBL_TEST_CTRL, val); >>> >>>      for (i = 0; i < 4; i++) { >>>          dsi_phy_write(base + REG_DSI_20nm_PHY_LN_CFG_3(i), >>> @@ -125,7 +129,6 @@ static void dsi_20nm_phy_disable(struct >>> msm_dsi_phy *phy) >>>  } >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_20nm_cfgs = { >>> -    .src_pll_truthtable = { {false, true}, {false, true} }, >>>      .has_phy_regulator = true, >>>      .reg_cfg = { >>>          .num = 2, >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c >>> index 0bcea3f3eca3..9f83ab90d093 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c >>> @@ -704,6 +704,7 @@ static int dsi_28nm_phy_enable(struct msm_dsi_phy >>> *phy, int src_pll_id, >>>      struct msm_dsi_dphy_timing *timing = &phy->timing; >>>      int i; >>>      void __iomem *base = phy->base; >>> +    u32 val; >>> >>>      DBG(""); >>> >>> @@ -743,9 +744,12 @@ static int dsi_28nm_phy_enable(struct >>> msm_dsi_phy >>> *phy, int src_pll_id, >>> >>>      dsi_phy_write(base + REG_DSI_28nm_PHY_CTRL_0, 0x5f); >>> >>> -    msm_dsi_phy_set_src_pll(phy, src_pll_id, >>> -                REG_DSI_28nm_PHY_GLBL_TEST_CTRL, >>> -                DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL); >>> +    val = dsi_phy_read(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL); >>> +    if (phy->id == DSI_1 && src_pll_id == DSI_0) >>> +        val &= ~DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    else >>> +        val |= DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    dsi_phy_write(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL, val); >>> >>>      return 0; >>>  } >>> @@ -763,7 +767,6 @@ static void dsi_28nm_phy_disable(struct >>> msm_dsi_phy *phy) >>>  } >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs = { >>> -    .src_pll_truthtable = { {true, true}, {false, true} }, >>>      .has_phy_regulator = true, >>>      .reg_cfg = { >>>          .num = 1, >>> @@ -785,7 +788,6 @@ const struct msm_dsi_phy_cfg >>> dsi_phy_28nm_hpm_cfgs = { >>>  }; >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs = { >>> -    .src_pll_truthtable = { {true, true}, {false, true} }, >>>      .has_phy_regulator = true, >>>      .reg_cfg = { >>>          .num = 1, >>> @@ -807,7 +809,6 @@ const struct msm_dsi_phy_cfg >>> dsi_phy_28nm_hpm_famb_cfgs = { >>>  }; >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs = { >>> -    .src_pll_truthtable = { {true, true}, {true, true} }, >>>      .has_phy_regulator = true, >>>      .reg_cfg = { >>>          .num = 1, >> >> The src_pll_truthtable for dsi_phy_28nm_lp_cfgs has all entries as >> true, while the other >> 28nm_***_cfgs dont. So wouldnt this below logic end up breaking >> dsi_phy_28nm_lp_cfgs? > > 28nm_lp has just one PHY, so second half of the table does not make > sense at all. > > And it is exactly one of the reasons to get rid of it: it might be > misleading. > > Also consider the [0][1] table entry, which is also declared, but it > is not usable. Thanks for the clarification. You are right. There is only one PHY for 28nm so the second row and the second column seem unnecessary. Hence, Reviewed-by: Abhinav Kumar > >> >>> +    if (phy->id == DSI_1 && src_pll_id == DSI_0) >>> +        val &= ~DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    else >>> +        val |= DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; >>> +    dsi_phy_write(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL, val); >> >> If so, I think we can leave it in cfg itself since the 28nm phy driver >> is common and is managed >> using different config to differentiate the hpm, lp and hpn_famb >> variants. > > I'd prefer to drop it from all the drivers, to have fewer 'declared > but unused' cases/data. > >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c >>> index 9ddd0adccce3..d2bfe43c9ef1 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c >>> @@ -642,7 +642,6 @@ static void dsi_28nm_phy_disable(struct >>> msm_dsi_phy *phy) >>>  } >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_28nm_8960_cfgs = { >>> -    .src_pll_truthtable = { {true, true}, {false, true} }, >>>      .has_phy_regulator = true, >>>      .reg_cfg = { >>>          .num = 1, >>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c >>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c >>> index ce6ae2fba993..619998506b78 100644 >>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c >>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c >>> @@ -955,7 +955,6 @@ static void dsi_7nm_phy_disable(struct >>> msm_dsi_phy *phy) >>>  } >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = { >>> -    .src_pll_truthtable = { {false, false}, {true, false} }, >>>      .has_phy_lane = true, >>>      .reg_cfg = { >>>          .num = 1, >>> @@ -978,7 +977,6 @@ const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = { >>>  }; >>> >>>  const struct msm_dsi_phy_cfg dsi_phy_7nm_8150_cfgs = { >>> -    .src_pll_truthtable = { {false, false}, {true, false} }, >>>      .has_phy_lane = true, >>>      .reg_cfg = { >>>          .num = 1,