[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2af3023d-caaf-4b62-e2ba-fc3cb56b331c@codeaurora.org>
Date: Mon, 2 Apr 2018 15:30:49 +0530
From: Vivek Gautam <vivek.gautam@...eaurora.org>
To: Can Guo <cang@...eaurora.org>, subhashj@...eaurora.org,
asutoshd@...eaurora.org, rnayak@...eaurora.org,
vinholikatti@...il.com, jejb@...ux.vnet.ibm.com,
martin.petersen@...cle.com
Cc: linux-scsi@...r.kernel.org,
Venkat Gopalakrishnan <venkatg@...eaurora.org>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v1] scsi: ufs: add 2 lane support
Hi Can,
On 3/2/2018 1:48 PM, Can Guo wrote:
> From: Venkat Gopalakrishnan <venkatg@...eaurora.org>
>
> Qcom ufs controller v3.1.0 supports 2 lanes, add support
> to configure 2 lanes during phy initialization.
>
> Signed-off-by: Venkat Gopalakrishnan <venkatg@...eaurora.org>
> Signed-off-by: Subhash Jadavani <subhashj@...eaurora.org>
> Signed-off-by: Can Guo <cang@...eaurora.org>
> ---
> drivers/scsi/ufs/ufs-qcom.c | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
> index 2b38db2..51889ad 100644
> --- a/drivers/scsi/ufs/ufs-qcom.c
> +++ b/drivers/scsi/ufs/ufs-qcom.c
> @@ -113,10 +113,10 @@ static void ufs_qcom_disable_lane_clks(struct ufs_qcom_host *host)
> if (!host->is_lane_clks_enabled)
> return;
>
> - if (host->hba->lanes_per_direction > 1)
> + if (host->tx_l1_sync_clk)
> clk_disable_unprepare(host->tx_l1_sync_clk);
> clk_disable_unprepare(host->tx_l0_sync_clk);
> - if (host->hba->lanes_per_direction > 1)
> + if (host->rx_l1_sync_clk)
> clk_disable_unprepare(host->rx_l1_sync_clk);
> clk_disable_unprepare(host->rx_l0_sync_clk);
>
> @@ -147,18 +147,15 @@ static int ufs_qcom_enable_lane_clks(struct ufs_qcom_host *host)
> if (err)
> goto disable_tx_l0;
>
> - err = ufs_qcom_host_clk_enable(dev, "tx_lane1_sync_clk",
> - host->tx_l1_sync_clk);
> - if (err)
> - goto disable_rx_l1;
> + /* The tx lane1 clk could be muxed, hence keep this optional */
You need a similar change for "rx_l1_sync_clk" also.
And also get rid of 'lanes_per_direction' flag as well for
ufs_qcom_enable_lane_clks()
and ufs_qcom_init_lane_clks() too, as you are doing in
ufs_qcom_disable_lane_clks().
> + if (host->tx_l1_sync_clk)
> + ufs_qcom_host_clk_enable(dev, "tx_lane1_sync_clk",
> + host->tx_l1_sync_clk);
> }
>
> host->is_lane_clks_enabled = true;
> goto out;
>
> -disable_rx_l1:
> - if (host->hba->lanes_per_direction > 1)
> - clk_disable_unprepare(host->rx_l1_sync_clk);
> disable_tx_l0:
> clk_disable_unprepare(host->tx_l0_sync_clk);
> disable_rx_l0:
> @@ -189,8 +186,9 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
> if (err)
> goto out;
>
> - err = ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk",
> - &host->tx_l1_sync_clk);
> + /* The tx lane1 clk could be muxed, hence keep this optional */
> + ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk",
> + &host->tx_l1_sync_clk);
same here.
Best regards
Vivek
> }
> out:
> return err;
Powered by blists - more mailing lists