From: Neil Armstrong <neil.armstrong@linaro.org>
To: Johan Hovold <johan+linaro@kernel.org>, Vinod Koul <vkoul@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Kishon Vijay Abraham I <kishon@ti.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 15/17] phy: qcom-qmp-ufs: consolidate lane config
Date: Tue, 20 Sep 2022 15:52:15 +0200 [thread overview]
Message-ID: <603b436d-e6d7-da4c-bea9-7211b82654dd@linaro.org> (raw)
In-Reply-To: <20220920073826.20811-16-johan+linaro@kernel.org>
On 20/09/2022 09:38, Johan Hovold wrote:
> For legacy reasons, there are two configuration parameters that describe
> the number of lanes a PHY has.
>
> Replace them both with a new field simply named "lanes".
>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 31 ++++++++-----------------
> 1 file changed, 10 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> index ca9a42250556..d21b977850b3 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> @@ -533,8 +533,7 @@ static const struct qmp_phy_init_tbl sm8350_ufsphy_pcs_tbl[] = {
>
> /* struct qmp_phy_cfg - per-PHY initialization config */
> struct qmp_phy_cfg {
> - /* number of lanes provided by phy */
> - int nlanes;
> + int lanes;
>
> /* Init sequence for PHY blocks - serdes, tx, rx, pcs */
> const struct qmp_phy_init_tbl *serdes_tbl;
> @@ -561,9 +560,6 @@ struct qmp_phy_cfg {
> /* bit offset of PHYSTATUS in QPHY_PCS_STATUS register */
> unsigned int phy_status;
>
> - /* true, if PHY has secondary tx/rx lanes to be configured */
> - bool is_dual_lane_phy;
> -
> /* true, if PCS block has no separate SW_RESET register */
> bool no_pcs_sw_reset;
> };
> @@ -662,7 +658,7 @@ static const char * const qmp_phy_vreg_l[] = {
> };
>
> static const struct qmp_phy_cfg msm8996_ufs_cfg = {
> - .nlanes = 1,
> + .lanes = 1,
>
> .serdes_tbl = msm8996_ufs_serdes_tbl,
> .serdes_tbl_num = ARRAY_SIZE(msm8996_ufs_serdes_tbl),
> @@ -687,7 +683,7 @@ static const struct qmp_phy_cfg msm8996_ufs_cfg = {
> };
>
> static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {
> - .nlanes = 2,
> + .lanes = 2,
>
> .serdes_tbl = sdm845_ufsphy_serdes_tbl,
> .serdes_tbl_num = ARRAY_SIZE(sdm845_ufsphy_serdes_tbl),
> @@ -707,12 +703,11 @@ static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {
> .pwrdn_ctrl = SW_PWRDN,
> .phy_status = PHYSTATUS,
>
> - .is_dual_lane_phy = true,
> .no_pcs_sw_reset = true,
> };
>
> static const struct qmp_phy_cfg sm6115_ufsphy_cfg = {
> - .nlanes = 1,
> + .lanes = 1,
>
> .serdes_tbl = sm6115_ufsphy_serdes_tbl,
> .serdes_tbl_num = ARRAY_SIZE(sm6115_ufsphy_serdes_tbl),
> @@ -735,7 +730,7 @@ static const struct qmp_phy_cfg sm6115_ufsphy_cfg = {
> };
>
> static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
> - .nlanes = 2,
> + .lanes = 2,
>
> .serdes_tbl = sm8150_ufsphy_serdes_tbl,
> .serdes_tbl_num = ARRAY_SIZE(sm8150_ufsphy_serdes_tbl),
> @@ -754,12 +749,10 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = {
> .start_ctrl = SERDES_START,
> .pwrdn_ctrl = SW_PWRDN,
> .phy_status = PHYSTATUS,
> -
> - .is_dual_lane_phy = true,
> };
>
> static const struct qmp_phy_cfg sm8350_ufsphy_cfg = {
> - .nlanes = 2,
> + .lanes = 2,
>
> .serdes_tbl = sm8350_ufsphy_serdes_tbl,
> .serdes_tbl_num = ARRAY_SIZE(sm8350_ufsphy_serdes_tbl),
> @@ -778,12 +771,10 @@ static const struct qmp_phy_cfg sm8350_ufsphy_cfg = {
> .start_ctrl = SERDES_START,
> .pwrdn_ctrl = SW_PWRDN,
> .phy_status = PHYSTATUS,
> -
> - .is_dual_lane_phy = true,
> };
>
> static const struct qmp_phy_cfg sm8450_ufsphy_cfg = {
> - .nlanes = 2,
> + .lanes = 2,
>
> .serdes_tbl = sm8350_ufsphy_serdes_tbl,
> .serdes_tbl_num = ARRAY_SIZE(sm8350_ufsphy_serdes_tbl),
> @@ -802,8 +793,6 @@ static const struct qmp_phy_cfg sm8450_ufsphy_cfg = {
> .start_ctrl = SERDES_START,
> .pwrdn_ctrl = SW_PWRDN,
> .phy_status = PHYSTATUS,
> -
> - .is_dual_lane_phy = true,
> };
>
> static void qmp_ufs_configure_lane(void __iomem *base,
> @@ -956,14 +945,14 @@ static int qmp_ufs_power_on(struct phy *phy)
> /* Tx, Rx, and PCS configurations */
> qmp_ufs_configure_lane(tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num, 1);
>
> - if (cfg->is_dual_lane_phy) {
> + if (cfg->lanes >= 2) {
> qmp_ufs_configure_lane(qphy->tx2, cfg->regs,
> cfg->tx_tbl, cfg->tx_tbl_num, 2);
> }
>
> qmp_ufs_configure_lane(rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num, 1);
>
> - if (cfg->is_dual_lane_phy) {
> + if (cfg->lanes >= 2) {
> qmp_ufs_configure_lane(qphy->rx2, cfg->regs,
> cfg->rx_tbl, cfg->rx_tbl_num, 2);
> }
> @@ -1122,7 +1111,7 @@ static int qmp_ufs_create(struct device *dev, struct device_node *np, int id,
> if (IS_ERR(qphy->pcs))
> return PTR_ERR(qphy->pcs);
>
> - if (cfg->is_dual_lane_phy) {
> + if (cfg->lanes >= 2) {
> qphy->tx2 = devm_of_iomap(dev, np, 3, NULL);
> if (IS_ERR(qphy->tx2))
> return PTR_ERR(qphy->tx2);
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
next prev parent reply other threads:[~2022-09-20 13:53 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 7:38 [PATCH 00/17] phy: qcom-qmp: config and misc clean ups Johan Hovold
2022-09-20 7:38 ` [PATCH 01/17] phy: qcom-qmp-pcie: drop unused type from config Johan Hovold
2022-09-20 13:50 ` Neil Armstrong
2022-09-22 14:30 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 02/17] phy: qcom-qmp-pcie-msm8996: " Johan Hovold
2022-09-20 13:50 ` Neil Armstrong
2022-09-22 14:31 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 03/17] phy: qcom-qmp-ufs: " Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 14:31 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 04/17] phy: qcom-qmp-usb: " Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 14:33 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 05/17] phy: qcom-qmp-pcie: drop init and exit wrappers Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 17:58 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 06/17] phy: qcom-qmp-usb: " Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 17:58 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 07/17] phy: qcom-qmp: drop unused forward declarations Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 14:31 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 08/17] phy: qcom-qmp-pcie-msm8996: drop unused kernel doc Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 17:58 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 09/17] phy: qcom-qmp-pcie: drop unused mode field Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 17:58 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 10/17] phy: qcom-qmp-pcie: drop unused config field Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 17:59 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 11/17] phy: qcom-qmp: drop unused index field Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 17:59 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 12/17] phy: qcom-qmp-pcie: consolidate lane config Johan Hovold
2022-09-20 13:51 ` Neil Armstrong
2022-09-22 18:06 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 13/17] phy: qcom-qmp-pcie-msm8996: rename nlanes config Johan Hovold
2022-09-20 13:52 ` Neil Armstrong
2022-09-22 18:01 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 14/17] phy: qcom-qmp-combo: consolidate lane config Johan Hovold
2022-09-20 13:52 ` Neil Armstrong
2022-09-22 18:01 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 15/17] phy: qcom-qmp-ufs: " Johan Hovold
2022-09-20 13:52 ` Neil Armstrong [this message]
2022-09-22 18:02 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 16/17] phy: qcom-qmp-usb: " Johan Hovold
2022-09-20 13:52 ` Neil Armstrong
2022-09-22 18:02 ` Dmitry Baryshkov
2022-09-20 7:38 ` [PATCH 17/17] phy: qcom-qmp-combo: drop redundant DP config flag Johan Hovold
2022-09-20 13:52 ` Neil Armstrong
2022-09-20 14:08 ` Johan Hovold
2022-09-22 18:02 ` Dmitry Baryshkov
2022-09-23 6:14 ` Johan Hovold
2022-09-24 5:30 ` [PATCH 00/17] phy: qcom-qmp: config and misc clean ups Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=603b436d-e6d7-da4c-bea9-7211b82654dd@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=johan+linaro@kernel.org \
--cc=kishon@ti.com \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®