From patchwork Wed Oct 19 15:37:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 13012097 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 11C40C4332F for ; Wed, 19 Oct 2022 15:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ISX6QpPRg7V9JoRSnj0d65sQzFiTPSAJngbgVAeUpIw=; b=riJspIcLYvXI5ImsZLo/N7aiWE qVttrtsuJWE7vDOPmvVDw1UmS0LtOW6SS8FI3SImpH1vwq2falfgaN7AcwTfa8MXJcgjnReWhkLM6 ZSOANoyXGORfwtRvFmC2WUOW+hwm2dkDaAnb14ZRrtAbb/mUNElveAHuQnP5F1qZi/i1jiyybPEha boaf0Dc4zM0jT9Q59r+vA12YJlY+RoyQ1l7YA2Co+JJj9v2tvIXeJGNfe8DJa5hQMuYGCkLy84Cse mBWtkehHjuFFAmkEWxHNMipsjh87O5fbmxKgBy77daTOFU+iyeIRBzewqBFzcljOH42R2Ejf0zxG9 y0tqoqCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olBSd-003apM-La; Wed, 19 Oct 2022 15:58:27 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olB8p-003LqV-3r; Wed, 19 Oct 2022 15:38:00 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.94.2) (envelope-from ) id 1olB8j-00015j-Gi; Wed, 19 Oct 2022 17:37:53 +0200 Date: Wed, 19 Oct 2022 16:37:44 +0100 From: Daniel Golle To: linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, Chunfeng Yun , Vinod Koul , Kishon Vijay Abraham I , Matthias Brugger Cc: linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] phy: phy-mtk-tphy: Add PCIe 2 lane efuse support Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221019_083759_242877_BAB3FBB4 X-CRM114-Status: GOOD ( 16.23 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Zhanyong Wang Add PCIe 2 lane efuse support in tphy driver. Signed-off-by: Jie Yang Signed-off-by: Zhanyong Wang Signed-off-by: Daniel Golle --- drivers/phy/mediatek/phy-mtk-tphy.c | 112 ++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c index e906a82791bdaa..b0c9834efec7ef 100644 --- a/drivers/phy/mediatek/phy-mtk-tphy.c +++ b/drivers/phy/mediatek/phy-mtk-tphy.c @@ -43,6 +43,15 @@ #define SSUSB_SIFSLV_V2_U3PHYD 0x200 #define SSUSB_SIFSLV_V2_U3PHYA 0x400 +/* version V4 sub-banks offset base address */ +/* pcie phy banks */ +#define SSUSB_SIFSLV_V4_SPLLC 0x000 +#define SSUSB_SIFSLV_V4_CHIP 0x100 +#define SSUSB_SIFSLV_V4_U3PHYD 0x900 +#define SSUSB_SIFSLV_V4_U3PHYA 0xb00 + +#define SSUSB_LN1_OFFSET 0x10000 + #define U3P_MISC_REG1 0x04 #define MR1_EFUSE_AUTO_LOAD_DIS BIT(6) @@ -268,6 +277,7 @@ enum mtk_phy_version { MTK_PHY_V1 = 1, MTK_PHY_V2, MTK_PHY_V3, + MTK_PHY_V4, }; struct mtk_phy_pdata { @@ -317,6 +327,9 @@ struct mtk_phy_instance { u32 efuse_intr; u32 efuse_tx_imp; u32 efuse_rx_imp; + u32 efuse_intr_ln1; + u32 efuse_tx_imp_ln1; + u32 efuse_rx_imp_ln1; int eye_src; int eye_vrt; int eye_term; @@ -760,6 +773,36 @@ static void phy_v2_banks_init(struct mtk_tphy *tphy, } } +static void phy_v4_banks_init(struct mtk_tphy *tphy, + struct mtk_phy_instance *instance) +{ + struct u2phy_banks *u2_banks = &instance->u2_banks; + struct u3phy_banks *u3_banks = &instance->u3_banks; + + switch (instance->type) { + case PHY_TYPE_USB2: + u2_banks->misc = instance->port_base + SSUSB_SIFSLV_V2_MISC; + u2_banks->fmreg = instance->port_base + SSUSB_SIFSLV_V2_U2FREQ; + u2_banks->com = instance->port_base + SSUSB_SIFSLV_V2_U2PHY_COM; + break; + case PHY_TYPE_USB3: + u3_banks->spllc = instance->port_base + SSUSB_SIFSLV_V2_SPLLC; + u3_banks->chip = instance->port_base + SSUSB_SIFSLV_V2_CHIP; + u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V2_U3PHYD; + u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V2_U3PHYA; + break; + case PHY_TYPE_PCIE: + u3_banks->spllc = instance->port_base + SSUSB_SIFSLV_V4_SPLLC; + u3_banks->chip = instance->port_base + SSUSB_SIFSLV_V4_CHIP; + u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V4_U3PHYD; + u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V4_U3PHYA; + break; + default: + dev_err(tphy->dev, "incompatible PHY type\n"); + return; + } +} + static void phy_parse_property(struct mtk_tphy *tphy, struct mtk_phy_instance *instance) { @@ -951,6 +994,40 @@ static int phy_efuse_get(struct mtk_tphy *tphy, struct mtk_phy_instance *instanc dev_dbg(dev, "u3 efuse - intr %x, rx_imp %x, tx_imp %x\n", instance->efuse_intr, instance->efuse_rx_imp,instance->efuse_tx_imp); + + if (tphy->pdata->version != MTK_PHY_V4) + break; + + ret = nvmem_cell_read_variable_le_u32(dev, "intr_ln1", &instance->efuse_intr_ln1); + if (ret) { + dev_err(dev, "fail to get u3 lane1 intr efuse, %d\n", ret); + break; + } + + ret = nvmem_cell_read_variable_le_u32(dev, "rx_imp_ln1", &instance->efuse_rx_imp_ln1); + if (ret) { + dev_err(dev, "fail to get u3 lane1 rx_imp efuse, %d\n", ret); + break; + } + + ret = nvmem_cell_read_variable_le_u32(dev, "tx_imp_ln1", &instance->efuse_tx_imp_ln1); + if (ret) { + dev_err(dev, "fail to get u3 lane1 tx_imp efuse, %d\n", ret); + break; + } + + /* no efuse, ignore it */ + if (!instance->efuse_intr_ln1 && + !instance->efuse_rx_imp_ln1 && + !instance->efuse_tx_imp_ln1) { + dev_warn(dev, "no u3 lane1 efuse, but dts enable it\n"); + instance->efuse_sw_en = 0; + break; + } + + dev_info(dev, "u3 lane1 efuse - intr %x, rx_imp %x, tx_imp %x\n", + instance->efuse_intr_ln1, instance->efuse_rx_imp_ln1, + instance->efuse_tx_imp_ln1); break; default: dev_err(dev, "no sw efuse for type %d\n", instance->type); @@ -990,6 +1067,31 @@ static void phy_efuse_set(struct mtk_phy_instance *instance) mtk_phy_update_field(u3_banks->phya + U3P_U3_PHYA_REG0, P3A_RG_IEXT_INTR, instance->efuse_intr); + if (instance->type == PHY_TYPE_USB3 || ( + !instance->efuse_intr_ln1 && + !instance->efuse_rx_imp_ln1 && + !instance->efuse_tx_imp_ln1)) + break; + + mtk_phy_set_bits(u3_banks->phyd + SSUSB_LN1_OFFSET + U3P_U3_PHYD_RSV, + P3D_RG_EFUSE_AUTO_LOAD_DIS); + + mtk_phy_update_field(u3_banks->phyd + SSUSB_LN1_OFFSET + U3P_U3_PHYD_IMPCAL0, + P3D_RG_TX_IMPEL, instance->efuse_tx_imp_ln1); + mtk_phy_set_bits(u3_banks->phyd + SSUSB_LN1_OFFSET + U3P_U3_PHYD_IMPCAL0, + P3D_RG_FORCE_TX_IMPEL); + + mtk_phy_update_field(u3_banks->phyd + SSUSB_LN1_OFFSET + U3P_U3_PHYD_IMPCAL1, + P3D_RG_RX_IMPEL, instance->efuse_rx_imp_ln1); + mtk_phy_set_bits(u3_banks->phyd + SSUSB_LN1_OFFSET + U3P_U3_PHYD_IMPCAL1, + P3D_RG_FORCE_RX_IMPEL); + + mtk_phy_update_field(u3_banks->phya + SSUSB_LN1_OFFSET + U3P_U3_PHYA_REG0, + P3A_RG_IEXT_INTR, instance->efuse_intr_ln1); + + dev_info(dev, "%s set LN1 efuse, tx_imp %x, rx_imp %x intr %x\n", + __func__, instance->efuse_tx_imp_ln1, + instance->efuse_rx_imp_ln1, instance->efuse_intr_ln1); break; default: dev_warn(dev, "no sw efuse for type %d\n", instance->type); @@ -1129,6 +1231,9 @@ static struct phy *mtk_phy_xlate(struct device *dev, case MTK_PHY_V3: phy_v2_banks_init(tphy, instance); break; + case MTK_PHY_V4: + phy_v4_banks_init(tphy, instance); + break; default: dev_err(dev, "phy version is not supported\n"); return ERR_PTR(-EINVAL); @@ -1169,6 +1274,12 @@ static const struct mtk_phy_pdata tphy_v3_pdata = { .version = MTK_PHY_V3, }; +static const struct mtk_phy_pdata tphy_v4_pdata = { + .avoid_rx_sen_degradation = false, + .sw_efuse_supported = true, + .version = MTK_PHY_V4, +}; + static const struct mtk_phy_pdata mt8173_pdata = { .avoid_rx_sen_degradation = true, .version = MTK_PHY_V1, @@ -1188,6 +1299,7 @@ static const struct of_device_id mtk_tphy_id_table[] = { { .compatible = "mediatek,generic-tphy-v1", .data = &tphy_v1_pdata }, { .compatible = "mediatek,generic-tphy-v2", .data = &tphy_v2_pdata }, { .compatible = "mediatek,generic-tphy-v3", .data = &tphy_v3_pdata }, + { .compatible = "mediatek,generic-tphy-v4", .data = &tphy_v4_pdata }, { }, }; MODULE_DEVICE_TABLE(of, mtk_tphy_id_table); From patchwork Wed Oct 19 15:38:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 13012098 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89980C433FE for ; Wed, 19 Oct 2022 16:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QPBVcim80ZEA2cpucSN5geGdm9XZKu9ZntbpN9+CTng=; b=YynMuZVxlKPzbALwwrayndFGCg AR92m7Ky7vuItNU80bE25VWwhGPbQMd6zDom2orVnhbAIMwzZHWfRySCdljsC2MnUInIpktANloSf lnIcgKmnVh2hG4Ncw1RhWB7etT4MhQzcPMm8tda1/8Y8e3e1EnPG72XUqXR25IFkm84yvge7dFSs7 YokawT0wIODUvXYmwA+q/l/gj+glNfer4Oiq7lXZD06mNUsQT59jE5LI8mtLBNSy+C2UBbmG4XGhW O2HgqqhxwdJH86uP5iz76/piGEMtcft1NrM6v18PkQwqYSnBxeRJT+3gsb44dic65/Ng5MV0gTCen noS9Gk5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olBU4-003c9Z-F9; Wed, 19 Oct 2022 15:59:56 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olB9G-003M9k-9N; Wed, 19 Oct 2022 15:38:27 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.94.2) (envelope-from ) id 1olB9A-000167-Pv; Wed, 19 Oct 2022 17:38:20 +0200 Date: Wed, 19 Oct 2022 16:38:14 +0100 From: Daniel Golle To: linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, Chunfeng Yun , Vinod Koul , Kishon Vijay Abraham I , Matthias Brugger Cc: linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/2] dt-bindings: phy: mediatek: tphy: add compatible for tphy-v4 Message-ID: <07c5d962515c4f675f076bb91d69eaf651b187c6.1666193782.git.daniel@makrotopia.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221019_083826_406050_702F25CE X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org V4 can be found in MT7986 and MT7981 SoCs, it supports PCIe with two lanes. Signed-off-by: Daniel Golle Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/phy/mediatek,tphy.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml b/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml index 5613cc5106e32f..851e3dda7b638b 100644 --- a/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml +++ b/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml @@ -89,6 +89,11 @@ properties: - mediatek,mt8188-tphy - mediatek,mt8195-tphy - const: mediatek,generic-tphy-v3 + - items: + - enum: + - mediatek,mt7981-tphy + - mediatek,mt7986-tphy + - const: mediatek,generic-tphy-v4 - const: mediatek,mt2701-u3phy deprecated: true - const: mediatek,mt2712-u3phy @@ -99,7 +104,7 @@ properties: description: Register shared by multiple ports, exclude port's private register. It is needed for T-PHY V1, such as mt2701 and mt8173, but not for - T-PHY V2/V3, such as mt2712. + T-PHY V2/V3/V4, such as mt2712. maxItems: 1 "#address-cells":