From patchwork Thu Dec 5 16:15:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 11275119 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 6EE2A13A4 for ; Thu, 5 Dec 2019 16:15:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 420F424249 for ; Thu, 5 Dec 2019 16:15:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KWLZl2b/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729613AbfLEQPK (ORCPT ); Thu, 5 Dec 2019 11:15:10 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55130 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729099AbfLEQPK (ORCPT ); Thu, 5 Dec 2019 11:15:10 -0500 Received: by mail-wm1-f67.google.com with SMTP id b11so4491705wmj.4 for ; Thu, 05 Dec 2019 08:15:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wiYJvs9A2NXd1fHRkB6dBS+AK6nuaV80oV6YetXmGJI=; b=KWLZl2b/6PQlobWM37hoxWhnoNlsmP2tN1Krl0Fs6s1r3VFhXK25+dQAtKeDErFMdB 2pXs/RJvUaBMDMc9onLtaTz+R0liD9XHftl6yc5Gt/UD406Q++EiRzxpL0vo3ROAy3Ko WOsRJ6fuXByqkXcpB0BJoIb54lAvC+mhEN4TgKWLPHoBtqYxhjj7tBEipvEWB6aGp0Jo D2a7uubzElPPuDG4wFOq+3FxK7dXIXm/8lxvcJuszMOSCIMNR7frLWR+14pI3+fIvxxC cnvC1/vhoVOdw9M/9zeKGhahQX7AQe1urZ5/niqU6wMO+7ZPCcun7o8mJ9bQryG33g1S 3CfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wiYJvs9A2NXd1fHRkB6dBS+AK6nuaV80oV6YetXmGJI=; b=C0Qd/p+5a1llywZ/0cUdjW/NDp/7gkMmQL5RgJMaTLCvDyAHMhWTf55452/9Z+UwN7 vBKEi0ccvg/wO5JfLigcuX7nhmx5lVqitf0D2csAcc5mR6UhnTSUxZM8WRh57gI28UT1 PROO/rMw8DrO4ePl5XUJAMWm48yJQF1BZvvMFfar7Y0lreqHGrBS6yRrwUwil/Vueq9h 27KUAsCTmT2eW/QkyqJke/bO8Voer5E6vwYwt22ZXVaVK+Mk3i5ykdy/o2ADtls8PC1m SMaUXzqF3NCSktHKWBF+ku78f5YtfZS/El6/UiaKgF7FN+gF2c8KI/uSBOy7qHIBrMmB 6lmA== X-Gm-Message-State: APjAAAXFuD1VjNtRWfS9dhnCdRZF0AzPEeg64v2Lxfo7x1OGTrNVRocQ X7YFLiKNd1hDdI9hagVEyqk= X-Google-Smtp-Source: APXvYqwWw/PwEvyIzVeIeTgS8DvzAaqmQtFXahWlWFqVRobCJ2uMcVOwvB9LES5UllOXaXdh6K/OQg== X-Received: by 2002:a1c:f20c:: with SMTP id s12mr5863834wmc.133.1575562508266; Thu, 05 Dec 2019 08:15:08 -0800 (PST) Received: from gmail.com (net-37-119-134-251.cust.vodafonedsl.it. [37.119.134.251]) by smtp.gmail.com with ESMTPSA id w20sm291013wmk.34.2019.12.05.08.15.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 08:15:07 -0800 (PST) From: Paolo Pisati To: Andy Gross , Amit Pundir , Manu Gautam , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH 1/6] clk: qcom: Drop gcc_aggre1_pnoc_ahb_clk clock Date: Thu, 5 Dec 2019 17:15:00 +0100 Message-Id: <20191205161505.15295-2-p.pisati@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205161505.15295-1-p.pisati@gmail.com> References: <20191205161505.15295-1-p.pisati@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Amit Pundir Clock "gcc_aggre1_pnoc_ahb_clk" added in QcomLT commit 9a108d744fda ("clk: qcom: Add some missing gcc clks for msm8996"), broke USB gagdets for db820c. So drop it for now and re-visit the dropped changes while submitting it upstream. Fixes: 9a108d744fda ("clk: qcom: Add some missing gcc clks for msm8996") Signed-off-by: Amit Pundir --- drivers/clk/qcom/gcc-msm8996.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c index d004cda..c1e1148 100644 --- a/drivers/clk/qcom/gcc-msm8996.c +++ b/drivers/clk/qcom/gcc-msm8996.c @@ -2937,20 +2937,6 @@ static struct clk_branch gcc_smmu_aggre0_ahb_clk = { }, }; -static struct clk_branch gcc_aggre1_pnoc_ahb_clk = { - .halt_reg = 0x82014, - .clkr = { - .enable_reg = 0x82014, - .enable_mask = BIT(0), - .hw.init = &(struct clk_init_data){ - .name = "gcc_aggre1_pnoc_ahb_clk", - .parent_names = (const char *[]){ "periph_noc_clk_src" }, - .num_parents = 1, - .ops = &clk_branch2_ops, - }, - }, -}; - static struct clk_branch gcc_aggre2_ufs_axi_clk = { .halt_reg = 0x83014, .clkr = { @@ -3453,7 +3439,6 @@ static struct clk_regmap *gcc_msm8996_clocks[] = { [GCC_AGGRE0_CNOC_AHB_CLK] = &gcc_aggre0_cnoc_ahb_clk.clkr, [GCC_SMMU_AGGRE0_AXI_CLK] = &gcc_smmu_aggre0_axi_clk.clkr, [GCC_SMMU_AGGRE0_AHB_CLK] = &gcc_smmu_aggre0_ahb_clk.clkr, - [GCC_AGGRE1_PNOC_AHB_CLK] = &gcc_aggre1_pnoc_ahb_clk.clkr, [GCC_AGGRE2_UFS_AXI_CLK] = &gcc_aggre2_ufs_axi_clk.clkr, [GCC_AGGRE2_USB3_AXI_CLK] = &gcc_aggre2_usb3_axi_clk.clkr, [GCC_QSPI_AHB_CLK] = &gcc_qspi_ahb_clk.clkr, From patchwork Thu Dec 5 16:15:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 11275121 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 31D7C14BD for ; Thu, 5 Dec 2019 16:15:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F5EB24249 for ; Thu, 5 Dec 2019 16:15:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tWSneM55" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729653AbfLEQPL (ORCPT ); Thu, 5 Dec 2019 11:15:11 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41556 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbfLEQPL (ORCPT ); Thu, 5 Dec 2019 11:15:11 -0500 Received: by mail-wr1-f65.google.com with SMTP id c9so4299635wrw.8 for ; Thu, 05 Dec 2019 08:15:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ju89ATnfEEtURs7oNbXbvXQ1g0YptoejRq1xWoLZtLU=; b=tWSneM55d9WwcDRR/TfE7oxbRnVgT3/I3bz4h9VMzNG5Wh0fU33KL0t7sfPIQ2DHYs SNAoDW8OSVmqSKxV78emmFgxu2rLzQ7xeQBOKTdyCSlxuiqNP38RPIX88KGPnbN2gYvM WsMvheaIVe2JUZtwJyqlx2pcBhhTbeYZj28xxogtD4MjuRYrGkYY+jJa27E5hmVLRPHi Abj8yKbiskVWLr92pSNllkd+DhH9SIsRj3fqVyygnoTD98O0hqqVxhTnxfrOw1DUFl3g M9YlRTuKiKDlx0c68MYwQ0AM4lUVvyetntm3TnkIxpAhuYxJnFMaTLsomsn8qbNJiCm3 TGEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ju89ATnfEEtURs7oNbXbvXQ1g0YptoejRq1xWoLZtLU=; b=gTFqrwgN3tofs/Drqpa2Gef1NViYrR+LfPyeiSlkNPFr4gXyYY2bSU+NEioHsqYidA DvecE46rwTR4R47uxasoIM11xuvAK8BNJSr3Iyb4xKUMLQfAL1lkQAI6AyfTkZyJ1Ujs 7bg8yXsa2LQDyCIQpfDNcPifylz0pKHjUlKmszFIcAZGCvsXomarkRZuakYp/5MPGVkX ZUOIb5E2cK1CyzK6XdIbZtTIqr5WoIMGbebq6piX7iXm6RChLAFSdiy6qNFs5EFG27OV S40hl0gaQShnz8VUhEkDQVsBvGkFtivpveakDHITQR3ZB2pQYLR4Ho/IYXC7j142E5LW gjQg== X-Gm-Message-State: APjAAAWuRyL3oUHzOkJjx6PwHEBgffJtZbknJ9g6BMFDeQc9ZjDlkTyQ mzkCzcm87h9CIkJYnBNc6S0= X-Google-Smtp-Source: APXvYqy7rsg56I2Pu+ZocXfjNzAuKq+Zo/cTua1TPm++rUPt1dK1qJkuomqBzLQ5/neJEsglWpFynA== X-Received: by 2002:a5d:4f90:: with SMTP id d16mr10553367wru.395.1575562509292; Thu, 05 Dec 2019 08:15:09 -0800 (PST) Received: from gmail.com (net-37-119-134-251.cust.vodafonedsl.it. [37.119.134.251]) by smtp.gmail.com with ESMTPSA id 4sm280105wmg.22.2019.12.05.08.15.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 08:15:08 -0800 (PST) From: Paolo Pisati To: Andy Gross , Amit Pundir , Manu Gautam , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH 2/6] arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core Date: Thu, 5 Dec 2019 17:15:01 +0100 Message-Id: <20191205161505.15295-3-p.pisati@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205161505.15295-1-p.pisati@gmail.com> References: <20191205161505.15295-1-p.pisati@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Manu Gautam QUSB2 PHY on msm8996 doesn't work well when autosuspend by dwc3 core using USB2PHYCFG register is enabled. One of the issue seen is that PHY driver reports PLL lock failure and fails phy_init() if dwc3 core has USB2 PHY suspend enabled. Fix this by using quirks to disable USB2 PHY LPM/suspend and dwc3 core already takes care of explicitly suspending PHY during suspend if quirks are specified. Signed-off-by: Manu Gautam --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 87f4d9c..fbb8ce7 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1598,6 +1598,8 @@ interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>; phys = <&hsusb_phy2>; phy-names = "usb2-phy"; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; }; }; @@ -1628,6 +1630,8 @@ interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>; phys = <&hsusb_phy1>, <&ssusb_phy_0>; phy-names = "usb2-phy", "usb3-phy"; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; }; }; From patchwork Thu Dec 5 16:15:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 11275129 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 53B8314BD for ; Thu, 5 Dec 2019 16:15:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2721E24249 for ; Thu, 5 Dec 2019 16:15:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gVB4hAsL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729099AbfLEQPQ (ORCPT ); Thu, 5 Dec 2019 11:15:16 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37969 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729656AbfLEQPQ (ORCPT ); Thu, 5 Dec 2019 11:15:16 -0500 Received: by mail-wm1-f67.google.com with SMTP id p17so4299468wmi.3 for ; Thu, 05 Dec 2019 08:15:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=osUs1MXgqq64XnjQfyE6+biIqafx/NsQy/3on47ZeQc=; b=gVB4hAsLAgJa4rWpY/gdIDc3Ht4nVXm+ZgiEds5WPBm4kehXNFm9VaFK9wzd6FzJ9Q 5oEDrVh0k9luzhoi4ksu6IX04ouwMnAu18q4oJeMqXyBnrfubf6l2Uon5g/ZM6igkcou c98s2ZH7UPg1aEN2msaM9npjb0yO07MUtctw8WzXSWOvfko3S8lk7n2pFRPpUj2F1hUE Q0imXTtpmU1tTy8tx/Yy+HzSbBlDu6cKSWi5Amzrd9gzh1wFig+nYdwcKmMhYXJietZw mMokjfnc4DgIqwypH99tKCdyDlNAS7zoU1ZHQU7+87y/Es1eMRZWLVnv8hemg5msY3Iv P80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=osUs1MXgqq64XnjQfyE6+biIqafx/NsQy/3on47ZeQc=; b=dBpK6BSjp8txssMIEvT9oK3moQVx7b3+2pKWlBsJHgWccqoT0RXQcB9DOwh59CJxEc zpciRJq9i41ScVz1gtjhyv7OWj59pcaU7dxiLKNrxpCVrb18E4+3tMeo9dSKRDI9qXWL TcWRXxFSbpCsZ96uKuanWtgsb8sK56YQX+L7V0H9g3+etAJwOY6JDrqHOrChw3HXMG05 z0XBBEgXIjIGZpCpxCd9hEZQ6yRaC/REHfgxiimxMY6QjQePBudYIu7VDrvkjfa/w0F3 J5IIpknea37Vf7/g+HCGxZCl/wMqqstEqMlz6YncFoyjO4DSsL5wXyXBWJy4eemMZiHD 7rbg== X-Gm-Message-State: APjAAAUPuhv+N38juHQcINtr3fQkAx4Q4RVvt9xepO82Ul0gsD95gBOM oNix4UoOcO8dlIf4EzqfaBk= X-Google-Smtp-Source: APXvYqzhjP1ec/JKkxlElca4E0iYyLjoPOb43YCvMrmh0V+wUR+OxcaUq3RU1P8ylNpziO937KhtCQ== X-Received: by 2002:a7b:c216:: with SMTP id x22mr5728628wmi.51.1575562513453; Thu, 05 Dec 2019 08:15:13 -0800 (PST) Received: from gmail.com (net-37-119-134-251.cust.vodafonedsl.it. [37.119.134.251]) by smtp.gmail.com with ESMTPSA id e8sm12637330wrt.7.2019.12.05.08.15.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 08:15:12 -0800 (PST) From: Paolo Pisati To: Andy Gross , Amit Pundir , Manu Gautam , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH 3/6] Revert "phy: qcom-qmp: Correct ready status, again" Date: Thu, 5 Dec 2019 17:15:05 +0100 Message-Id: <20191205161505.15295-7-p.pisati@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205161505.15295-1-p.pisati@gmail.com> References: <20191205161505.15295-1-p.pisati@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This reverts commit 14ced7e3a1ae9bed7051df3718c8c7b583854a5c. Signed-off-by: Paolo Pisati --- drivers/phy/qualcomm/phy-qcom-qmp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 39e8deb..e7b8283 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -35,7 +35,7 @@ #define PLL_READY_GATE_EN BIT(3) /* QPHY_PCS_STATUS bit */ #define PHYSTATUS BIT(6) -/* QPHY_PCS_READY_STATUS & QPHY_COM_PCS_READY_STATUS bit */ +/* QPHY_COM_PCS_READY_STATUS bit */ #define PCS_READY BIT(0) /* QPHY_V3_DP_COM_RESET_OVRD_CTRL register bits */ @@ -115,7 +115,6 @@ enum qphy_reg_layout { QPHY_SW_RESET, QPHY_START_CTRL, QPHY_PCS_READY_STATUS, - QPHY_PCS_STATUS, QPHY_PCS_AUTONOMOUS_MODE_CTRL, QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR, QPHY_PCS_LFPS_RXTERM_IRQ_STATUS, @@ -134,7 +133,7 @@ static const unsigned int pciephy_regs_layout[] = { [QPHY_FLL_MAN_CODE] = 0xd4, [QPHY_SW_RESET] = 0x00, [QPHY_START_CTRL] = 0x08, - [QPHY_PCS_STATUS] = 0x174, + [QPHY_PCS_READY_STATUS] = 0x174, }; static const unsigned int usb3phy_regs_layout[] = { @@ -145,7 +144,7 @@ static const unsigned int usb3phy_regs_layout[] = { [QPHY_FLL_MAN_CODE] = 0xd0, [QPHY_SW_RESET] = 0x00, [QPHY_START_CTRL] = 0x08, - [QPHY_PCS_STATUS] = 0x17c, + [QPHY_PCS_READY_STATUS] = 0x17c, [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = 0x0d4, [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = 0x0d8, [QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x178, @@ -154,7 +153,7 @@ static const unsigned int usb3phy_regs_layout[] = { static const unsigned int qmp_v3_usb3phy_regs_layout[] = { [QPHY_SW_RESET] = 0x00, [QPHY_START_CTRL] = 0x08, - [QPHY_PCS_STATUS] = 0x174, + [QPHY_PCS_READY_STATUS] = 0x174, [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = 0x0d8, [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = 0x0dc, [QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170, @@ -912,6 +911,7 @@ struct qmp_phy_cfg { unsigned int start_ctrl; unsigned int pwrdn_ctrl; + unsigned int mask_pcs_ready; unsigned int mask_com_pcs_ready; /* true, if PHY has a separate PHY_COM control block */ @@ -1074,6 +1074,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { .start_ctrl = PCS_START | PLL_READY_GATE_EN, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, + .mask_pcs_ready = PHYSTATUS, .mask_com_pcs_ready = PCS_READY, .has_phy_com_ctrl = true, @@ -1105,6 +1106,7 @@ static const struct qmp_phy_cfg msm8996_usb3phy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, + .mask_pcs_ready = PHYSTATUS, }; /* list of resets */ @@ -1134,6 +1136,7 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, + .mask_pcs_ready = PHYSTATUS, .has_phy_com_ctrl = false, .has_lane_rst = false, @@ -1164,6 +1167,7 @@ static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, + .mask_pcs_ready = PHYSTATUS, .has_pwrdn_delay = true, .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, @@ -1195,6 +1199,7 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, + .mask_pcs_ready = PHYSTATUS, .has_pwrdn_delay = true, .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, @@ -1221,6 +1226,7 @@ static const struct qmp_phy_cfg sdm845_ufsphy_cfg = { .start_ctrl = SERDES_START, .pwrdn_ctrl = SW_PWRDN, + .mask_pcs_ready = PCS_READY, .is_dual_lane_phy = true, .no_pcs_sw_reset = true, @@ -1248,6 +1254,7 @@ static const struct qmp_phy_cfg msm8998_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, + .mask_pcs_ready = PHYSTATUS, }; static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { @@ -1272,6 +1279,7 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, + .mask_pcs_ready = PHYSTATUS, .is_dual_lane_phy = true, }; @@ -1449,7 +1457,7 @@ static int qcom_qmp_phy_enable(struct phy *phy) void __iomem *pcs = qphy->pcs; void __iomem *dp_com = qmp->dp_com; void __iomem *status; - unsigned int mask, val, ready; + unsigned int mask, val; int ret; dev_vdbg(qmp->dev, "Initializing QMP phy\n"); @@ -1537,17 +1545,10 @@ static int qcom_qmp_phy_enable(struct phy *phy) /* start SerDes and Phy-Coding-Sublayer */ qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl); - if (cfg->type == PHY_TYPE_UFS) { - status = pcs + cfg->regs[QPHY_PCS_READY_STATUS]; - mask = PCS_READY; - ready = PCS_READY; - } else { - status = pcs + cfg->regs[QPHY_PCS_STATUS]; - mask = PHYSTATUS; - ready = 0; - } + status = pcs + cfg->regs[QPHY_PCS_READY_STATUS]; + mask = cfg->mask_pcs_ready; - ret = readl_poll_timeout(status, val, (val & mask) == ready, 10, + ret = readl_poll_timeout(status, val, val & mask, 10, PHY_INIT_COMPLETE_TIMEOUT); if (ret) { dev_err(qmp->dev, "phy initialization timed-out\n"); From patchwork Thu Dec 5 16:15:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 11275123 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 B4FD61593 for ; Thu, 5 Dec 2019 16:15:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88A1524249 for ; Thu, 5 Dec 2019 16:15:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RQPUvP7/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726028AbfLEQPM (ORCPT ); Thu, 5 Dec 2019 11:15:12 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:46878 "EHLO mail-wr1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729099AbfLEQPM (ORCPT ); Thu, 5 Dec 2019 11:15:12 -0500 Received: by mail-wr1-f54.google.com with SMTP id z7so4243637wrl.13 for ; Thu, 05 Dec 2019 08:15:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WuMwjVSBMzVnDnIlTNQOghVeoKUE2zewSCvpjpDtqVQ=; b=RQPUvP7/OIuO2EODLuAaqegFB1J4lvc/a5MJlnGN4c4mFrUwWvJtc4GSfagc23ITJT UKWcXVNO4A6+cV+IeiniddDsx/c3RllQABTAW63rRsJUItGm5SE4g4aKbEjkTCTjEHdj Ugcd0I+SkATRDARyqnTP3NOSAgFt2pmumQNIOGKniLUA5qzXVXCbumUmX0VWBsHJ6ac1 EVwZssGAOZhnKaOZD1bGWh27Y+RfLKBcTSyY2fqbXSR9efKI4KuZHw8jUE0ODPFDgJb+ 39DHAFiXjErQxEv4C+AR5cmqGllY/mRdSglcbuZ5shNLkL4taqTTHK0Gl97nnpbUrhPA RP4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WuMwjVSBMzVnDnIlTNQOghVeoKUE2zewSCvpjpDtqVQ=; b=kNbK6Flt9+CxgEDPRuV1S/WKqX2JCIusziqV30y/qRnVZzLYRNBDOVGNgybaoia+hJ UPwMY+mAkGti1thz2xvCPS9Fg+GmAZCNMA1PsoGxhe9GqrrKuGI/VfxgJG7wOql15wTs EdkBSZD2to5Yu1a7vv7LWtbntvnREBtK6MOY3QqYfSX4LgXODxfRM4mcJUbGMuRDTXa9 pMmfzYLyLWE4HoIQ4UfZpeLnrQ+S0mXlS8jey05pVoU2MzGBSHFmmX9vwwnY3yjCnfOp tmyK4UcicHmEEZrRHdD7Uy5RIPwYrauHaFZSK9xVCoub4jo4Cfa7iSVYQelSyNUMgpjq TpmQ== X-Gm-Message-State: APjAAAVpCPdY9fzzxzjhfYy922wN/AYx52YBW3jIRvG2QOVLLNTRCYBB BuAYFz455j5Dc7cz7zVz86c= X-Google-Smtp-Source: APXvYqxd9QaTlEg3ZZPq2x53uF7h828EWqrI87AATWhjP8TMK8ZC8j0u5QZzUlaXUv/XtWSz3mVrDA== X-Received: by 2002:a5d:4d8d:: with SMTP id b13mr11613752wru.6.1575562510422; Thu, 05 Dec 2019 08:15:10 -0800 (PST) Received: from gmail.com (net-37-119-134-251.cust.vodafonedsl.it. [37.119.134.251]) by smtp.gmail.com with ESMTPSA id c80sm289648wme.20.2019.12.05.08.15.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 08:15:09 -0800 (PST) From: Paolo Pisati To: Andy Gross , Amit Pundir , Manu Gautam , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH 4/6] arm64: defconfig: PHY_QCOM_QMP=y Date: Thu, 5 Dec 2019 17:15:02 +0100 Message-Id: <20191205161505.15295-4-p.pisati@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205161505.15295-1-p.pisati@gmail.com> References: <20191205161505.15295-1-p.pisati@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Signed-off-by: Paolo Pisati --- arch/arm64/configs/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c9a867a..8f713091 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -787,7 +787,7 @@ CONFIG_PHY_HI6220_USB=y CONFIG_PHY_HISTB_COMBPHY=y CONFIG_PHY_HISI_INNO_USB2=y CONFIG_PHY_MVEBU_CP110_COMPHY=y -CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QMP=y CONFIG_PHY_QCOM_QUSB2=m CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_RCAR_GEN3_PCIE=y From patchwork Thu Dec 5 16:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 11275125 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 1B11D13A4 for ; Thu, 5 Dec 2019 16:15:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E33F42464D for ; Thu, 5 Dec 2019 16:15:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BEkLiPij" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729688AbfLEQPN (ORCPT ); Thu, 5 Dec 2019 11:15:13 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:34630 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729656AbfLEQPN (ORCPT ); Thu, 5 Dec 2019 11:15:13 -0500 Received: by mail-wr1-f48.google.com with SMTP id t2so4353151wrr.1 for ; Thu, 05 Dec 2019 08:15:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vb9iUzm5L50itQZMrHU7e+RHACgQh9iXw/KRJBG40FU=; b=BEkLiPijcG6/D2TFray9us6+y/JdP72xgxijZy5ieS54DbjXBW2QOAH6avRySSSAu9 Sskuu1euff+Lv7zwyE7/WqHjlL9TXjpSwiNEVDCX2qNB5H3KcMTo9SPIoGA49zd32pkF D85koJXChERUi4UqOGVxkKj6Gp++1O9lAlZbh/5QKuAlpzpJnPqFqR8MYyVNredqah3I d3n1URkOGZcuhCHcATXjqTnCSsJvPHzqhe+YbgzfNs+cr8Hk8tWr7b8L3cqTNrCDWUnN Nyaf0t996uoORT5K4MDDyHoL1hJYKMIvd4ZMstNkSTQT5Sl1xDiF44j6Q6Ti+pcpzaAH BFdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vb9iUzm5L50itQZMrHU7e+RHACgQh9iXw/KRJBG40FU=; b=RjKbbQtNTaerH+ZrAge7WqV0C9L+1Mx1aKQPaiDyUT6Ep4IWQSqevnUKIfp6S8kXn1 wCQK0qiEZnCVVFY+6XGg8cx/0Y4QnSmy1jEv/BNlelKqJtGwoPXjeeNb52MXd3aX+17q pGGM7vQZs8YqJOhR25Wo9YzosjTWuQx28EcELeArPP5R/uYXGmIljOi/pVV7YXri7Wnq tmogEVx70YEpBWUeNWeSKDVia4o6Xziy0yIhKWpxXJrYyZRugfHAejYsHgQSg2HRLHVU 6/YXpZlvVS13bftcJU12WkKTorlgnkUAecOAMih/Z0jGeG1XpOP6F9ansy/GEpSO2dX0 5gHA== X-Gm-Message-State: APjAAAV8qpp5MrXJt0VvitP8mSSMzyw5QQT8xEM+w0+l/taZFhMstOc3 fQJef3vGIxm+J13595tBPfA= X-Google-Smtp-Source: APXvYqy9tp0xrpamh5Bix4JOTobX/pSa6E7BHZKyvc3e3jZK0ncourFNrdkjyGalFtCMTz1CF5cN8g== X-Received: by 2002:adf:fc0c:: with SMTP id i12mr11736688wrr.74.1575562511481; Thu, 05 Dec 2019 08:15:11 -0800 (PST) Received: from gmail.com (net-37-119-134-251.cust.vodafonedsl.it. [37.119.134.251]) by smtp.gmail.com with ESMTPSA id t12sm12958245wrs.96.2019.12.05.08.15.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 08:15:10 -0800 (PST) From: Paolo Pisati To: Andy Gross , Amit Pundir , Manu Gautam , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH 5/6] arm64: defconfig: PHY_QCOM_QUSB2=y Date: Thu, 5 Dec 2019 17:15:03 +0100 Message-Id: <20191205161505.15295-5-p.pisati@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205161505.15295-1-p.pisati@gmail.com> References: <20191205161505.15295-1-p.pisati@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Signed-off-by: Paolo Pisati --- arch/arm64/configs/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 8f713091..560cb54 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -788,7 +788,7 @@ CONFIG_PHY_HISTB_COMBPHY=y CONFIG_PHY_HISI_INNO_USB2=y CONFIG_PHY_MVEBU_CP110_COMPHY=y CONFIG_PHY_QCOM_QMP=y -CONFIG_PHY_QCOM_QUSB2=m +CONFIG_PHY_QCOM_QUSB2=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_RCAR_GEN3_PCIE=y CONFIG_PHY_RCAR_GEN3_USB2=y From patchwork Thu Dec 5 16:15:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 11275127 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 4FDDA14BD for ; Thu, 5 Dec 2019 16:15:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 244822464D for ; Thu, 5 Dec 2019 16:15:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bOL+TW5m" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729701AbfLEQPO (ORCPT ); Thu, 5 Dec 2019 11:15:14 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:37682 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729099AbfLEQPO (ORCPT ); Thu, 5 Dec 2019 11:15:14 -0500 Received: by mail-wr1-f49.google.com with SMTP id w15so4330815wru.4 for ; Thu, 05 Dec 2019 08:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G+NmQUe0c+qIbje24nUgvku7Fmunjz9xZZxlYbhx3n8=; b=bOL+TW5mZxQmXzmHkX9fSwkNFV0qbQpXMcfExtFf8xEy1iEYs85yWLW6R+Mrh9EV1p RMc3E6HfMkMaxbHQPneFv6xG7zSCe1Ve6FzGotn/2zRjbhp8O7+zn0/sU7nD4tZ1Nr5S nxT9OmUxo/a7aDYzX0qvBTfhp3SbpSSlzfc0SZUpra/0Z1+I8JqHBJeAXix/QDI9fC99 PeuuCz/GbjBU/7oX0Cyt33NaFtSXsbfrtA/zJqrVZvk/7qWf0WDxM7ZPnids37HtzBWQ Liytzg3bwljUe8m5rdrvhBq76xaCiZ/9ArvflO/1JCF7x0rCKM23TDGviZYdB44xFh5X lLYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G+NmQUe0c+qIbje24nUgvku7Fmunjz9xZZxlYbhx3n8=; b=nAxwWEqRL1lxb8/cRvWnIJNEJ4sSy8EfHAB074Lsy6AALByY1DLr1JJOcQW3nSt7Dv eXYCzuQrqdDXw7ucjSJig78sO3lMO8QyHs7zAy4Zeip97hX+c15+rY42myCMc+9PeEj7 +zTZTAgFN3GS9Hztp6+pLlg+WcQoVgntv5t6lqvRPpgYib6MTZtKdgYJQzfjUDuveXYf ILhE82505kMyy2FLarGNmdtozCGT/zzS2farvR1NXOR04VFkuvkkghxbaZGsCIn22Ds1 M0arGU7ipuGpcZcMxYTXKmOFQE0Dx1hhYEGWFCndtH0Wmj0FicxJGR2k9RrLgQVWUC/2 rrPw== X-Gm-Message-State: APjAAAVW+ni99rpI2LxYj+INNGXDt63IaPUYaXMP66g/8agw7ZYU0EAQ +9gdgobiHQYw/7j3IPk74ww= X-Google-Smtp-Source: APXvYqzyKkg//0SPWNEm/nKvEpNzi1ibVSy1ePcpQh8H5MDHl06J93/QIICHP8lLjUYAwwMs0OX1xQ== X-Received: by 2002:adf:ce87:: with SMTP id r7mr10644583wrn.245.1575562512471; Thu, 05 Dec 2019 08:15:12 -0800 (PST) Received: from gmail.com (net-37-119-134-251.cust.vodafonedsl.it. [37.119.134.251]) by smtp.gmail.com with ESMTPSA id h2sm13235208wrt.45.2019.12.05.08.15.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 08:15:11 -0800 (PST) From: Paolo Pisati To: Andy Gross , Amit Pundir , Manu Gautam , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Subject: [PATCH 6/6] arm64: defconfig: PHY_QCOM_UFS=y Date: Thu, 5 Dec 2019 17:15:04 +0100 Message-Id: <20191205161505.15295-6-p.pisati@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205161505.15295-1-p.pisati@gmail.com> References: <20191205161505.15295-1-p.pisati@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Signed-off-by: Paolo Pisati --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 560cb54..2c91d75 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -859,3 +859,4 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y +CONFIG_PHY_QCOM_UFS=y