From patchwork Thu Dec 19 15:04:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 11303827 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7EDC814E3 for ; Thu, 19 Dec 2019 15:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CC0E21655 for ; Thu, 19 Dec 2019 15:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767900; bh=nGIBL8aVxoKmkDIwSClLd5dlI6t4JIUetskk9vvcXmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wd+Y2PkU223G8Y4p6JT7zmUne4tnoRH5akTr/cjn56g15MNhi1fsSV3wH3EzSpArI g/Mh1Ou3cvFHmS3JzdQdCKXjVMLmcqW55NjqBdEnWsIvK/x5ipg31+js2VKukwdfZ1 iEAUQ0H6AfG19TB4rDn0kprt4qIN34o64SxTca4Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726877AbfLSPE7 (ORCPT ); Thu, 19 Dec 2019 10:04:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:34160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726817AbfLSPE7 (ORCPT ); Thu, 19 Dec 2019 10:04:59 -0500 Received: from localhost.localdomain (unknown [122.178.234.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1970724672; Thu, 19 Dec 2019 15:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767898; bh=nGIBL8aVxoKmkDIwSClLd5dlI6t4JIUetskk9vvcXmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wEoffsMqqtDei+TxWhS4ErXebPe5/QAcEeRDjnuJ9hWoJuDCFZWni5wTkSw5v+0Q+ CzGqS0kYdZAd0Y9O503gtkAOKiGeCgwUjyD0KNFf3/GMMxtdcqF28IFUfVQ0PY2zeQ JOG8wfnizA3Yp3TbCOaBK+2Teopb8kCOPg/J93GI= From: Vinod Koul To: Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Andy Gross , Can Guo , Jeffrey Hugo , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] phy: qcom-qmp: Increase the phy init timeout Date: Thu, 19 Dec 2019 20:34:30 +0530 Message-Id: <20191219150433.2785427-2-vkoul@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191219150433.2785427-1-vkoul@kernel.org> References: <20191219150433.2785427-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org If we do full reset of the phy, it seems to take a couple of ms to come up on my system so increase the timeout to 10ms. This was found by full reset addition by commit 870b1279c7a0 ("scsi: ufs-qcom: Add reset control support for host controller") and fixes the regression to platforms by this commit. Suggested-by: Can Guo Signed-off-by: Vinod Koul Reviewed-by: Jeffrey Hugo Tested-by: Jeffrey Hugo --- drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 091e20303a14..c2e800a3825a 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -66,7 +66,7 @@ /* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */ #define CLAMP_EN BIT(0) /* enables i/o clamp_n */ -#define PHY_INIT_COMPLETE_TIMEOUT 1000 +#define PHY_INIT_COMPLETE_TIMEOUT 100000 #define POWER_DOWN_DELAY_US_MIN 10 #define POWER_DOWN_DELAY_US_MAX 11 From patchwork Thu Dec 19 15:04:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 11303829 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E806014E3 for ; Thu, 19 Dec 2019 15:05:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C526F21D7D for ; Thu, 19 Dec 2019 15:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767903; bh=HIjcrR1V5NJu2M5zDIohQ4KGUZPwSjZcbWqjK0s0U5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YS2y8a6dvZ9fITQc0Bd+4hlsyzHkqVYKevoa/TFwsFqpbPxdQjVhS1L3iK0CNYa1Z 2bZpgyT0RAYkIFa5lETVZYvd7tFt6BUsCy4XsFmYS9XM1xufWej7gLMLciXDVQyvOu GGwt07EkHneJhaSpxduCxTYOyu2F+fyRNgWBJK+k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726817AbfLSPFD (ORCPT ); Thu, 19 Dec 2019 10:05:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:34226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726801AbfLSPFC (ORCPT ); Thu, 19 Dec 2019 10:05:02 -0500 Received: from localhost.localdomain (unknown [122.178.234.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6591524679; Thu, 19 Dec 2019 15:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767902; bh=HIjcrR1V5NJu2M5zDIohQ4KGUZPwSjZcbWqjK0s0U5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TeQlztHqJ4CWsAjEPkYcnCF8m3ocN89NgCpOqQeRSl7oqxvuZu+N5FuEUgeVDKYo0 3S/rHRA0/SnGD97M9K6ppwM1oXxHVtKU11odsfVdLzgcU0G1ImZA+KHP59BnFoqW7/ 0krxxajWEc1Yz6WMsnSb5RF/xUkmokrrektMfc+Y= From: Vinod Koul To: Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Andy Gross , Can Guo , Jeffrey Hugo , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] phy: qcom-qmp: Use register defines Date: Thu, 19 Dec 2019 20:34:31 +0530 Message-Id: <20191219150433.2785427-3-vkoul@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191219150433.2785427-1-vkoul@kernel.org> References: <20191219150433.2785427-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org We already define register offsets so use them in register layout. Signed-off-by: Vinod Koul Reviewed-by: Jeffrey Hugo --- drivers/phy/qualcomm/phy-qcom-qmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index c2e800a3825a..06f971ca518e 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -166,8 +166,8 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = { }; static const unsigned int sm8150_ufsphy_regs_layout[] = { - [QPHY_START_CTRL] = 0x00, - [QPHY_PCS_READY_STATUS] = 0x180, + [QPHY_START_CTRL] = QPHY_V4_PHY_START, + [QPHY_SW_RESET] = QPHY_V4_SW_RESET, }; static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = { From patchwork Thu Dec 19 15:04:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 11303831 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4B0614F6 for ; Thu, 19 Dec 2019 15:05:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A25C42146E for ; Thu, 19 Dec 2019 15:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767907; bh=2vFU+S6HKqKhfz4jubJ0RuqI/YrwcWJmmCmTPInyZtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P54m9jUtpD/9icQOIxPOPpNoHZu0ieL5sIMJWDP+jJ87Ey6QYIZ0VLYPSKsdZcHlZ x+3Rzei2Dw2MVLIuRxFihqvCNMF7F7cWk+eOL2qt8ZttoZFB0l6Mgc/iNA3ebEHrxo FbY/Vnt2k24P9Z8HPZ61F0fpDdgIY9rSuGStl+84= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726930AbfLSPFG (ORCPT ); Thu, 19 Dec 2019 10:05:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:34314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726801AbfLSPFG (ORCPT ); Thu, 19 Dec 2019 10:05:06 -0500 Received: from localhost.localdomain (unknown [122.178.234.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1D8221655; Thu, 19 Dec 2019 15:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767905; bh=2vFU+S6HKqKhfz4jubJ0RuqI/YrwcWJmmCmTPInyZtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NYgNPf78Ks2olSLVdWXX45DQN+xgYZmkM4W7388mGgelnnhI4LdEBenVPTxkPpk/2 UEcAZTgAdfHMGHbTE9jdbwVmn9cE7bEXtNY1qqaM/QiN/2oEVkqjsGyXthHzzYLK2A f5vfJLWD/WFsYwnwiLKOE4NjGn04YwInN4WG7KiY= From: Vinod Koul To: Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Andy Gross , Can Guo , Jeffrey Hugo , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] phy: qcom-qmp: Add optional SW reset Date: Thu, 19 Dec 2019 20:34:32 +0530 Message-Id: <20191219150433.2785427-4-vkoul@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191219150433.2785427-1-vkoul@kernel.org> References: <20191219150433.2785427-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org For V4 QMP UFS Phy, we need to assert reset bits, configure the phy and then deassert it, so add optional has_sw_reset flag and use that to configure the QPHY_SW_RESET register. Signed-off-by: Vinod Koul Reviewed-by: Jeffrey Hugo --- drivers/phy/qualcomm/phy-qcom-qmp.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 06f971ca518e..80304b7cd895 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -1023,6 +1023,9 @@ struct qmp_phy_cfg { /* true, if PCS block has no separate SW_RESET register */ bool no_pcs_sw_reset; + + /* true if sw reset needs to be invoked */ + bool has_sw_reset; }; /** @@ -1391,6 +1394,7 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = { .is_dual_lane_phy = true, .no_pcs_sw_reset = true, + .has_sw_reset = true, }; static void qcom_qmp_phy_configure(void __iomem *base, @@ -1475,6 +1479,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET); } + if (cfg->has_sw_reset) + qphy_setbits(serdes, cfg->regs[QPHY_SW_RESET], SW_RESET); + if (cfg->has_phy_com_ctrl) qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL], SW_PWRDN); @@ -1651,6 +1658,9 @@ static int qcom_qmp_phy_enable(struct phy *phy) if (cfg->has_phy_dp_com_ctrl) qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET); + if (cfg->has_sw_reset) + qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET); + /* start SerDes and Phy-Coding-Sublayer */ qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl); From patchwork Thu Dec 19 15:04:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 11303833 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E65E114F6 for ; Thu, 19 Dec 2019 15:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C588924672 for ; Thu, 19 Dec 2019 15:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767911; bh=p80ASa2e+ERmBUt4/2lrbwFwRHc3FZsVGsG89n2xFRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u8tv1dguB3fc0z1C4CngOUWf0x+igqJaINGnIJnCDlGGwR/n0b6mtvwl1pDEAe4bP fmjufgBvnfVvEoYHQEno07Q53ZyXi5SUsd38MUC7AjHGwOpnsEM9iX8Jn/ioHYLNH5 P6ypc0FtB98Whjoz5BvJvJ7YElBS9h4z7R3lDttA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726801AbfLSPFL (ORCPT ); Thu, 19 Dec 2019 10:05:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:34354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726751AbfLSPFJ (ORCPT ); Thu, 19 Dec 2019 10:05:09 -0500 Received: from localhost.localdomain (unknown [122.178.234.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09EA824672; Thu, 19 Dec 2019 15:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576767908; bh=p80ASa2e+ERmBUt4/2lrbwFwRHc3FZsVGsG89n2xFRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VYxcHDDB7QXpMzgECtUDyu9s3nmp4cwHUCukVUhPwthi52qMM5l7Pdvp0ZIOOlHxU W5yEiCYGb+O1PifZMJacf8Bu1lVzfBe3TPqeXRIV8mcM+fGpx6ym1R5dhPiuDSJoxv 7E8WLVOZDky85i2qWroG2BzSIAigwJqadWt4H0Ck= From: Vinod Koul To: Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Andy Gross , Can Guo , Jeffrey Hugo , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] phy: qcom-qmp: remove duplicate powerdown write Date: Thu, 19 Dec 2019 20:34:33 +0530 Message-Id: <20191219150433.2785427-5-vkoul@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191219150433.2785427-1-vkoul@kernel.org> References: <20191219150433.2785427-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org We already write to QPHY_POWER_DOWN_CONTROL in qcom_qmp_phy_com_init() before invoking qcom_qmp_phy_configure() so remove the duplicate write. Signed-off-by: Vinod Koul Reviewed-by: Jeffrey Hugo Reviewed-by: Can Guo --- drivers/phy/qualcomm/phy-qcom-qmp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 80304b7cd895..309ef15e46b0 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -885,7 +885,6 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = { }; static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = { - QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01), QMP_PHY_INIT_CFG(QSERDES_V4_COM_SYSCLK_EN_SEL, 0xd9), QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_SEL, 0x11), QMP_PHY_INIT_CFG(QSERDES_V4_COM_HSCLK_HS_SWITCH_SEL, 0x00),