Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp1906298rwi; Thu, 20 Oct 2022 19:41:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4W5TpFpWUa4boCPlXJDOIsnjbl77F1Uo9jK+c8EMagvtq5Nnjlj4olMdskTrsl5UGU396J X-Received: by 2002:a63:1b5d:0:b0:461:7362:e8b5 with SMTP id b29-20020a631b5d000000b004617362e8b5mr14172369pgm.83.1666320114146; Thu, 20 Oct 2022 19:41:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666320114; cv=none; d=google.com; s=arc-20160816; b=y3oG7MUhT6coi9KpiFQ0US2Sktu5VZFCg3e9Ykv69qhVem3htOdx8j7r+t1Z24ncUT 649TR+m9wNsmtTHMjVaXngqgenhNlcX+EHOH7W1D7mfUkmJjE7Y/4JLwGd9qpt3uAWzn q8x9AsZMzANSlBxe4nVMps8r02PdqaoxCfzEOWbQSgDu4j6WtyIQqXONRVy3v+8Zlmnr uSc+c8s7zuYLIupJTyVjeml3G7lEKaknJm6Z9+m3Efpcn8gsmLdZ0bNyvqoVjr3lAyP/ UsQhpqXg83B/oFmRu1y7PF7/ijUk9dVm8JMHfnVKXclbK0v0Xap88W+bLQiT5SLkB18t 1Z4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:date:cc:to:from:subject:message-id :dkim-signature; bh=qdjsFEH0oh9embVqdIaj4MZM1exUIQFOODo3uNBVQKo=; b=LTlAWTPovldXqsOAp1p0gQDrbJk14j0qcd1VXJPWfbOLIdALsxlEROVALaO/wGYsv/ 7vvZ88OPPPwnQaNudNfOYpdRtXJqj5uuhNuU1GjyJzk/b14CiaDL1AISGtap00eCsvaC D3Wxj13zMRLxMPLSdKttBrgd1Robe/6fNSd1eByyJbfvCysAN4JHMTd88iFeE38XZshx j4Uvuwc58uLSmS7ya1POdwdHjRk0ez2gsYdQDT43SCjFbqz3Hfx3XUQjzfdXagk17K2X X2EENopVcVTM5jAlJ+Xo9l2/FAbjajL6Zz3VeirRub52bvrENS6Ulh/bc+CKR2JUcoko UbYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=RxFc6gfo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w184-20020a6282c1000000b00562e2899394si21470436pfd.310.2022.10.20.19.41.42; Thu, 20 Oct 2022 19:41:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=RxFc6gfo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229887AbiJUCZV (ORCPT + 99 others); Thu, 20 Oct 2022 22:25:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230087AbiJUCY5 (ORCPT ); Thu, 20 Oct 2022 22:24:57 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BC1813FA7 for ; Thu, 20 Oct 2022 19:24:25 -0700 (PDT) X-UUID: 815b1f48c225428aa7995b16dec31883-20221021 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=qdjsFEH0oh9embVqdIaj4MZM1exUIQFOODo3uNBVQKo=; b=RxFc6gfoUQWug62VyKwzfozzbWxvneruLmpKmWAegOy1HNx9WAquTZYhx/idDXJYRJyMpDOyLLsEIoaXgMd4nCj7BFl56ffd6Ys9Vjg4l0Ao+XcQLp35d1j1vg1lqd38xKhcqACNOVTABYx8BZL9tisezQkng68O47+QDs03YKk=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.12,REQID:a17d3cf6-438a-4804-93cf-231a248b2394,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:62cd327,CLOUDID:d5d2f6ee-314c-4293-acb8-ca4299dd021f,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 815b1f48c225428aa7995b16dec31883-20221021 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2056403782; Fri, 21 Oct 2022 10:23:57 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Fri, 21 Oct 2022 10:23:55 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Fri, 21 Oct 2022 10:23:55 +0800 Message-ID: Subject: Re: [PATCH 1/2] phy: phy-mtk-tphy: Add PCIe 2 lane efuse support From: Sam Shih To: Daniel Golle , , , Chunfeng Yun , Vinod Koul , Kishon Vijay Abraham I , Matthias Brugger CC: , , "Jie Yang" Date: Fri, 21 Oct 2022 10:23:55 +0800 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Daniel, The only difference between V2 and V4 tphy drivers is that V4 provides 2 channel efuse loading support. MT7981 and MT7986 SoC support the 'autoload' feature to automatically load PCIE 2nd lane efuse values into hardware, and this feature is enabled on all MT7986 chips on the production line. So I think we can directly use tphy V2 driver instead of tphy V4 for MT7986 and MT7981 SoCs. Best Regards, Sam Shih On Wed, 2022-10-19 at 16:37 +0100, Daniel Golle wrote: > 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); > -- > 2.37.3 > >