linux-phy.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
@ 2023-02-20 14:12 Swapnil Jakhade
  2023-02-20 16:20 ` Roger Quadros
  2023-03-31 13:44 ` Vinod Koul
  0 siblings, 2 replies; 7+ messages in thread
From: Swapnil Jakhade @ 2023-02-20 14:12 UTC (permalink / raw)
  To: vkoul, kishon, linux-phy, linux-kernel; +Cc: mparab, sjakhade, rogerq

Add register sequences for PCIe + SGMII PHY multilink configuration.
This has been validated on TI J7 platforms.

Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
---
 drivers/phy/cadence/phy-cadence-sierra.c | 141 ++++++++++++++++++++++-
 1 file changed, 139 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c
index 6e86a6517f37..7c0daf3e8880 100644
--- a/drivers/phy/cadence/phy-cadence-sierra.c
+++ b/drivers/phy/cadence/phy-cadence-sierra.c
@@ -24,7 +24,7 @@
 #include <dt-bindings/phy/phy-cadence.h>
 
 #define NUM_SSC_MODE		3
-#define NUM_PHY_TYPE		4
+#define NUM_PHY_TYPE		5
 
 /* PHY register offsets */
 #define SIERRA_COMMON_CDB_OFFSET			0x0
@@ -46,7 +46,9 @@
 #define SIERRA_CMN_REFRCV_PREG				0x98
 #define SIERRA_CMN_REFRCV1_PREG				0xB8
 #define SIERRA_CMN_PLLLC1_GEN_PREG			0xC2
+#define SIERRA_CMN_PLLLC1_FBDIV_INT_PREG		0xC3
 #define SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG		0xCA
+#define SIERRA_CMN_PLLLC1_CLK0_PREG			0xCE
 #define SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG		0xD0
 #define SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG	0xE2
 
@@ -74,6 +76,7 @@
 #define SIERRA_PSC_RX_A1_PREG				0x031
 #define SIERRA_PSC_RX_A2_PREG				0x032
 #define SIERRA_PSC_RX_A3_PREG				0x033
+#define SIERRA_PLLCTRL_FBDIV_MODE01_PREG		0x039
 #define SIERRA_PLLCTRL_SUBRATE_PREG			0x03A
 #define SIERRA_PLLCTRL_GEN_A_PREG			0x03B
 #define SIERRA_PLLCTRL_GEN_D_PREG			0x03E
@@ -298,6 +301,7 @@ enum cdns_sierra_phy_type {
 	TYPE_NONE,
 	TYPE_PCIE,
 	TYPE_USB,
+	TYPE_SGMII,
 	TYPE_QSGMII
 };
 
@@ -936,6 +940,9 @@ static int cdns_sierra_get_optional(struct cdns_sierra_inst *inst,
 	case PHY_TYPE_USB3:
 		inst->phy_type = TYPE_USB;
 		break;
+	case PHY_TYPE_SGMII:
+		inst->phy_type = TYPE_SGMII;
+		break;
 	case PHY_TYPE_QSGMII:
 		inst->phy_type = TYPE_QSGMII;
 		break;
@@ -1339,7 +1346,7 @@ static int cdns_sierra_phy_configure_multilink(struct cdns_sierra_phy *sp)
 			}
 		}
 
-		if (phy_t1 == TYPE_QSGMII)
+		if (phy_t1 == TYPE_SGMII || phy_t1 == TYPE_QSGMII)
 			reset_control_deassert(sp->phys[node].lnk_rst);
 	}
 
@@ -1537,6 +1544,71 @@ static int cdns_sierra_phy_remove(struct platform_device *pdev)
 	return 0;
 }
 
+/* SGMII PHY PMA lane configuration */
+static struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = {
+	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
+};
+
+static struct cdns_sierra_vals sgmii_phy_pma_ln_vals = {
+	.reg_pairs = sgmii_phy_pma_ln_regs,
+	.num_regs = ARRAY_SIZE(sgmii_phy_pma_ln_regs),
+};
+
+/* SGMII refclk 100MHz, no ssc, opt3 and GE1 links using PLL LC1 */
+static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_cmn_regs[] = {
+	{0x002D, SIERRA_CMN_PLLLC1_FBDIV_INT_PREG},
+	{0x2085, SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG},
+	{0x1005, SIERRA_CMN_PLLLC1_CLK0_PREG},
+	{0x0000, SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG},
+	{0x0800, SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG}
+};
+
+static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_ln_regs[] = {
+	{0x688E, SIERRA_DET_STANDEC_D_PREG},
+	{0x0004, SIERRA_PSC_LN_IDLE_PREG},
+	{0x0FFE, SIERRA_PSC_RX_A0_PREG},
+	{0x0106, SIERRA_PLLCTRL_FBDIV_MODE01_PREG},
+	{0x0013, SIERRA_PLLCTRL_SUBRATE_PREG},
+	{0x0003, SIERRA_PLLCTRL_GEN_A_PREG},
+	{0x0106, SIERRA_PLLCTRL_GEN_D_PREG},
+	{0x5231, SIERRA_PLLCTRL_CPGAIN_MODE_PREG },
+	{0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
+	{0x9702, SIERRA_DRVCTRL_BOOST_PREG},
+	{0x0051, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
+	{0x3C0E, SIERRA_CREQ_CCLKDET_MODE01_PREG},
+	{0x3220, SIERRA_CREQ_FSMCLK_SEL_PREG},
+	{0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
+	{0x0002, SIERRA_DEQ_PHALIGN_CTRL},
+	{0x0186, SIERRA_DEQ_GLUT0},
+	{0x0186, SIERRA_DEQ_GLUT1},
+	{0x0186, SIERRA_DEQ_GLUT2},
+	{0x0186, SIERRA_DEQ_GLUT3},
+	{0x0186, SIERRA_DEQ_GLUT4},
+	{0x0861, SIERRA_DEQ_ALUT0},
+	{0x07E0, SIERRA_DEQ_ALUT1},
+	{0x079E, SIERRA_DEQ_ALUT2},
+	{0x071D, SIERRA_DEQ_ALUT3},
+	{0x03F5, SIERRA_DEQ_DFETAP_CTRL_PREG},
+	{0x0C01, SIERRA_DEQ_TAU_CTRL1_FAST_MAINT_PREG},
+	{0x3C40, SIERRA_DEQ_TAU_CTRL1_SLOW_MAINT_PREG},
+	{0x1C04, SIERRA_DEQ_TAU_CTRL2_PREG},
+	{0x0033, SIERRA_DEQ_PICTRL_PREG},
+	{0x0000, SIERRA_CPI_OUTBUF_RATESEL_PREG},
+	{0x0B6D, SIERRA_CPI_RESBIAS_BIN_PREG},
+	{0x0102, SIERRA_RXBUFFER_CTLECTRL_PREG},
+	{0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG}
+};
+
+static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = {
+	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_cmn_regs,
+	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_cmn_regs),
+};
+
+static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = {
+	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_ln_regs,
+	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_ln_regs),
+};
+
 /* QSGMII PHY PMA lane configuration */
 static struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = {
 	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
@@ -2363,6 +2435,11 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
@@ -2377,6 +2454,11 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_cmn_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
+				[INTERNAL_SSC] = &pcie_100_int_ssc_plllc_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
@@ -2388,6 +2470,13 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_cmn_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_cmn_vals,
@@ -2403,6 +2492,11 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
+				[EXTERNAL_SSC] = &ml_pcie_100_ext_ssc_ln_vals,
+				[INTERNAL_SSC] = &ml_pcie_100_int_ssc_ln_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
 				[EXTERNAL_SSC] = &ml_pcie_100_ext_ssc_ln_vals,
@@ -2414,6 +2508,13 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_ln_vals,
@@ -2435,6 +2536,11 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
@@ -2443,6 +2549,13 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 		},
 	},
 	.phy_pma_ln_vals = {
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_phy_pma_ln_vals,
+				[EXTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
+				[INTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_phy_pma_ln_vals,
@@ -2458,6 +2571,11 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_cmn_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
+				[INTERNAL_SSC] = &pcie_100_int_ssc_plllc_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
@@ -2469,6 +2587,13 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_cmn_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_cmn_vals,
@@ -2484,6 +2609,11 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
+				[EXTERNAL_SSC] = &ti_ml_pcie_100_ext_ssc_ln_vals,
+				[INTERNAL_SSC] = &ti_ml_pcie_100_int_ssc_ln_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
 				[EXTERNAL_SSC] = &ti_ml_pcie_100_ext_ssc_ln_vals,
@@ -2495,6 +2625,13 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_ln_vals,
-- 
2.34.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
  2023-02-20 14:12 [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration Swapnil Jakhade
@ 2023-02-20 16:20 ` Roger Quadros
  2023-03-27  5:34   ` Swapnil Kashinath Jakhade
  2023-03-31 13:44 ` Vinod Koul
  1 sibling, 1 reply; 7+ messages in thread
From: Roger Quadros @ 2023-02-20 16:20 UTC (permalink / raw)
  To: Swapnil Jakhade, vkoul, kishon, linux-phy, linux-kernel; +Cc: mparab



On 20/02/2023 16:12, Swapnil Jakhade wrote:
> Add register sequences for PCIe + SGMII PHY multilink configuration.
> This has been validated on TI J7 platforms.
> 
> Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>

Reviewed-by: Roger Quadros <rogerq@kernel.org>

-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
  2023-02-20 16:20 ` Roger Quadros
@ 2023-03-27  5:34   ` Swapnil Kashinath Jakhade
  0 siblings, 0 replies; 7+ messages in thread
From: Swapnil Kashinath Jakhade @ 2023-03-27  5:34 UTC (permalink / raw)
  To: Roger Quadros, vkoul, kishon, linux-phy, linux-kernel; +Cc: Milind Parab

Hi Vinod,

> -----Original Message-----
> From: Roger Quadros <rogerq@kernel.org>
> Sent: Monday, February 20, 2023 9:50 PM
> To: Swapnil Kashinath Jakhade <sjakhade@cadence.com>;
> vkoul@kernel.org; kishon@kernel.org; linux-phy@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Cc: Milind Parab <mparab@cadence.com>
> Subject: Re: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink
> configuration
> 
> EXTERNAL MAIL
> 
> 
> 
> 
> On 20/02/2023 16:12, Swapnil Jakhade wrote:
> > Add register sequences for PCIe + SGMII PHY multilink configuration.
> > This has been validated on TI J7 platforms.
> >
> > Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
> 
> Reviewed-by: Roger Quadros <rogerq@kernel.org>

Could you please consider reviewing and merging this patch.

Thanks & regards,
Swapnil
-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
  2023-02-20 14:12 [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration Swapnil Jakhade
  2023-02-20 16:20 ` Roger Quadros
@ 2023-03-31 13:44 ` Vinod Koul
  1 sibling, 0 replies; 7+ messages in thread
From: Vinod Koul @ 2023-03-31 13:44 UTC (permalink / raw)
  To: Swapnil Jakhade; +Cc: kishon, linux-phy, linux-kernel, mparab, rogerq

On 20-02-23, 15:12, Swapnil Jakhade wrote:
> Add register sequences for PCIe + SGMII PHY multilink configuration.
> This has been validated on TI J7 platforms.

This fails to apply for me, can you please rebase

-- 
~Vinod

-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
  2023-03-09 10:12 ` Swapnil Kashinath Jakhade
@ 2023-03-09 10:28   ` Siddharth Vadapalli
  0 siblings, 0 replies; 7+ messages in thread
From: Siddharth Vadapalli @ 2023-03-09 10:28 UTC (permalink / raw)
  To: Swapnil Kashinath Jakhade
  Cc: vkoul, kishon, lars, linux-phy, linux-kernel, linux-arm-kernel,
	srk, s-vadapalli

Hello Swapnil,

Thank you for letting me know. I wasn't aware of it.

Regards,
Siddharth.

On 09/03/23 15:42, Swapnil Kashinath Jakhade wrote:
> Hi Siddharth,
> 
>> -----Original Message-----
>> From: Siddharth Vadapalli <s-vadapalli@ti.com>
>> Sent: Thursday, March 9, 2023 3:34 PM
>> To: vkoul@kernel.org; kishon@kernel.org; lars@metafoo.de
>> Cc: linux-phy@lists.infradead.org; linux-kernel@vger.kernel.org; linux-arm-
>> kernel@lists.infradead.org; Swapnil Kashinath Jakhade
>> <sjakhade@cadence.com>; srk@ti.com; s-vadapalli@ti.com
>> Subject: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink
>> configuration
>>
>> EXTERNAL MAIL
>>
>>
>> From: Swapnil Jakhade <sjakhade@cadence.com>
>>
>> Add register sequences for PCIe + SGMII PHY multilink configuration.
>>
>> Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
>> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
>> ---
> 
> I have already sent this patch for review.
> https://patchwork.kernel.org/project/linux-phy/patch/20230220141216.25326-1-sjakhade@cadence.com/
> 
> Thanks & regards,
> Swapnil
> 
>>  drivers/phy/cadence/phy-cadence-sierra.c | 141 ++++++++++++++++++++++-
>>  1 file changed, 139 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/phy/cadence/phy-cadence-sierra.c
>> b/drivers/phy/cadence/phy-cadence-sierra.c
>> index 6e86a6517f37..7c0daf3e8880 100644
>> --- a/drivers/phy/cadence/phy-cadence-sierra.c
>> +++ b/drivers/phy/cadence/phy-cadence-sierra.c
>> @@ -24,7 +24,7 @@
>>  #include <dt-bindings/phy/phy-cadence.h>
>>
>>  #define NUM_SSC_MODE		3
>> -#define NUM_PHY_TYPE		4
>> +#define NUM_PHY_TYPE		5
>>
>>  /* PHY register offsets */
>>  #define SIERRA_COMMON_CDB_OFFSET			0x0
>> @@ -46,7 +46,9 @@
>>  #define SIERRA_CMN_REFRCV_PREG				0x98
>>  #define SIERRA_CMN_REFRCV1_PREG				0xB8
>>  #define SIERRA_CMN_PLLLC1_GEN_PREG			0xC2
>> +#define SIERRA_CMN_PLLLC1_FBDIV_INT_PREG		0xC3
>>  #define SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG		0xCA
>> +#define SIERRA_CMN_PLLLC1_CLK0_PREG			0xCE
>>  #define SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG		0xD0
>>  #define SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG	0xE2
>>
>> @@ -74,6 +76,7 @@
>>  #define SIERRA_PSC_RX_A1_PREG				0x031
>>  #define SIERRA_PSC_RX_A2_PREG				0x032
>>  #define SIERRA_PSC_RX_A3_PREG				0x033
>> +#define SIERRA_PLLCTRL_FBDIV_MODE01_PREG		0x039
>>  #define SIERRA_PLLCTRL_SUBRATE_PREG			0x03A
>>  #define SIERRA_PLLCTRL_GEN_A_PREG			0x03B
>>  #define SIERRA_PLLCTRL_GEN_D_PREG			0x03E
>> @@ -298,6 +301,7 @@ enum cdns_sierra_phy_type {
>>  	TYPE_NONE,
>>  	TYPE_PCIE,
>>  	TYPE_USB,
>> +	TYPE_SGMII,
>>  	TYPE_QSGMII
>>  };
>>
>> @@ -936,6 +940,9 @@ static int cdns_sierra_get_optional(struct
>> cdns_sierra_inst *inst,
>>  	case PHY_TYPE_USB3:
>>  		inst->phy_type = TYPE_USB;
>>  		break;
>> +	case PHY_TYPE_SGMII:
>> +		inst->phy_type = TYPE_SGMII;
>> +		break;
>>  	case PHY_TYPE_QSGMII:
>>  		inst->phy_type = TYPE_QSGMII;
>>  		break;
>> @@ -1339,7 +1346,7 @@ static int
>> cdns_sierra_phy_configure_multilink(struct cdns_sierra_phy *sp)
>>  			}
>>  		}
>>
>> -		if (phy_t1 == TYPE_QSGMII)
>> +		if (phy_t1 == TYPE_SGMII || phy_t1 == TYPE_QSGMII)
>>  			reset_control_deassert(sp->phys[node].lnk_rst);
>>  	}
>>
>> @@ -1537,6 +1544,71 @@ static int cdns_sierra_phy_remove(struct
>> platform_device *pdev)
>>  	return 0;
>>  }
>>
>> +/* SGMII PHY PMA lane configuration */
>> +static struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = {
>> +	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
>> +};
>> +
>> +static struct cdns_sierra_vals sgmii_phy_pma_ln_vals = {
>> +	.reg_pairs = sgmii_phy_pma_ln_regs,
>> +	.num_regs = ARRAY_SIZE(sgmii_phy_pma_ln_regs),
>> +};
>> +
>> +/* SGMII refclk 100MHz, no ssc, opt3 and GE1 links using PLL LC1 */
>> +static const struct cdns_reg_pairs
>> sgmii_100_no_ssc_plllc1_opt3_cmn_regs[] = {
>> +	{0x002D, SIERRA_CMN_PLLLC1_FBDIV_INT_PREG},
>> +	{0x2085, SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG},
>> +	{0x1005, SIERRA_CMN_PLLLC1_CLK0_PREG},
>> +	{0x0000, SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG},
>> +	{0x0800, SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG}
>> +};
>> +
>> +static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_ln_regs[] =
>> {
>> +	{0x688E, SIERRA_DET_STANDEC_D_PREG},
>> +	{0x0004, SIERRA_PSC_LN_IDLE_PREG},
>> +	{0x0FFE, SIERRA_PSC_RX_A0_PREG},
>> +	{0x0106, SIERRA_PLLCTRL_FBDIV_MODE01_PREG},
>> +	{0x0013, SIERRA_PLLCTRL_SUBRATE_PREG},
>> +	{0x0003, SIERRA_PLLCTRL_GEN_A_PREG},
>> +	{0x0106, SIERRA_PLLCTRL_GEN_D_PREG},
>> +	{0x5231, SIERRA_PLLCTRL_CPGAIN_MODE_PREG },
>> +	{0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
>> +	{0x9702, SIERRA_DRVCTRL_BOOST_PREG},
>> +	{0x0051, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
>> +	{0x3C0E, SIERRA_CREQ_CCLKDET_MODE01_PREG},
>> +	{0x3220, SIERRA_CREQ_FSMCLK_SEL_PREG},
>> +	{0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
>> +	{0x0002, SIERRA_DEQ_PHALIGN_CTRL},
>> +	{0x0186, SIERRA_DEQ_GLUT0},
>> +	{0x0186, SIERRA_DEQ_GLUT1},
>> +	{0x0186, SIERRA_DEQ_GLUT2},
>> +	{0x0186, SIERRA_DEQ_GLUT3},
>> +	{0x0186, SIERRA_DEQ_GLUT4},
>> +	{0x0861, SIERRA_DEQ_ALUT0},
>> +	{0x07E0, SIERRA_DEQ_ALUT1},
>> +	{0x079E, SIERRA_DEQ_ALUT2},
>> +	{0x071D, SIERRA_DEQ_ALUT3},
>> +	{0x03F5, SIERRA_DEQ_DFETAP_CTRL_PREG},
>> +	{0x0C01, SIERRA_DEQ_TAU_CTRL1_FAST_MAINT_PREG},
>> +	{0x3C40, SIERRA_DEQ_TAU_CTRL1_SLOW_MAINT_PREG},
>> +	{0x1C04, SIERRA_DEQ_TAU_CTRL2_PREG},
>> +	{0x0033, SIERRA_DEQ_PICTRL_PREG},
>> +	{0x0000, SIERRA_CPI_OUTBUF_RATESEL_PREG},
>> +	{0x0B6D, SIERRA_CPI_RESBIAS_BIN_PREG},
>> +	{0x0102, SIERRA_RXBUFFER_CTLECTRL_PREG},
>> +	{0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG}
>> +};
>> +
>> +static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = {
>> +	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_cmn_regs,
>> +	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_cmn_regs),
>> +};
>> +
>> +static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = {
>> +	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_ln_regs,
>> +	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_ln_regs),
>> +};
>> +
>>  /* QSGMII PHY PMA lane configuration */
>>  static struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = {
>>  	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
>> @@ -2363,6 +2435,11 @@ static const struct cdns_sierra_data
>> cdns_map_sierra = {
>>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>>  				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>>  			},
>> +			[TYPE_SGMII] = {
>> +				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
>> +				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>> +				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>> +			},
>>  			[TYPE_QSGMII] = {
>>  				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
>>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>> @@ -2377,6 +2454,11 @@ static const struct cdns_sierra_data
>> cdns_map_sierra = {
>>  				[EXTERNAL_SSC] =
>> &pcie_100_ext_ssc_cmn_vals,
>>  				[INTERNAL_SSC] =
>> &pcie_100_int_ssc_cmn_vals,
>>  			},
>> +			[TYPE_SGMII] = {
>> +				[NO_SSC] =
>> &pcie_100_no_ssc_plllc_cmn_vals,
>> +				[EXTERNAL_SSC] =
>> &pcie_100_ext_ssc_plllc_cmn_vals,
>> +				[INTERNAL_SSC] =
>> &pcie_100_int_ssc_plllc_cmn_vals,
>> +			},
>>  			[TYPE_QSGMII] = {
>>  				[NO_SSC] =
>> &pcie_100_no_ssc_plllc_cmn_vals,
>>  				[EXTERNAL_SSC] =
>> &pcie_100_ext_ssc_plllc_cmn_vals,
>> @@ -2388,6 +2470,13 @@ static const struct cdns_sierra_data
>> cdns_map_sierra = {
>>  				[EXTERNAL_SSC] =
>> &usb_100_ext_ssc_cmn_vals,
>>  			},
>>  		},
>> +		[TYPE_SGMII] = {
>> +			[TYPE_PCIE] = {
>> +				[NO_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
>> +				[EXTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
>> +				[INTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
>> +			},
>> +		},
>>  		[TYPE_QSGMII] = {
>>  			[TYPE_PCIE] = {
>>  				[NO_SSC] =
>> &qsgmii_100_no_ssc_plllc1_cmn_vals,
>> @@ -2403,6 +2492,11 @@ static const struct cdns_sierra_data
>> cdns_map_sierra = {
>>  				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
>>  				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
>>  			},
>> +			[TYPE_SGMII] = {
>> +				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
>> +				[EXTERNAL_SSC] =
>> &ml_pcie_100_ext_ssc_ln_vals,
>> +				[INTERNAL_SSC] =
>> &ml_pcie_100_int_ssc_ln_vals,
>> +			},
>>  			[TYPE_QSGMII] = {
>>  				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
>>  				[EXTERNAL_SSC] =
>> &ml_pcie_100_ext_ssc_ln_vals,
>> @@ -2414,6 +2508,13 @@ static const struct cdns_sierra_data
>> cdns_map_sierra = {
>>  				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
>>  			},
>>  		},
>> +		[TYPE_SGMII] = {
>> +			[TYPE_PCIE] = {
>> +				[NO_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
>> +				[EXTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
>> +				[INTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
>> +			},
>> +		},
>>  		[TYPE_QSGMII] = {
>>  			[TYPE_PCIE] = {
>>  				[NO_SSC] =
>> &qsgmii_100_no_ssc_plllc1_ln_vals,
>> @@ -2435,6 +2536,11 @@ static const struct cdns_sierra_data
>> cdns_ti_map_sierra = {
>>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>>  				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>>  			},
>> +			[TYPE_SGMII] = {
>> +				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
>> +				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>> +				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>> +			},
>>  			[TYPE_QSGMII] = {
>>  				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
>>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>> @@ -2443,6 +2549,13 @@ static const struct cdns_sierra_data
>> cdns_ti_map_sierra = {
>>  		},
>>  	},
>>  	.phy_pma_ln_vals = {
>> +		[TYPE_SGMII] = {
>> +			[TYPE_PCIE] = {
>> +				[NO_SSC] = &sgmii_phy_pma_ln_vals,
>> +				[EXTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
>> +				[INTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
>> +			},
>> +		},
>>  		[TYPE_QSGMII] = {
>>  			[TYPE_PCIE] = {
>>  				[NO_SSC] = &qsgmii_phy_pma_ln_vals,
>> @@ -2458,6 +2571,11 @@ static const struct cdns_sierra_data
>> cdns_ti_map_sierra = {
>>  				[EXTERNAL_SSC] =
>> &pcie_100_ext_ssc_cmn_vals,
>>  				[INTERNAL_SSC] =
>> &pcie_100_int_ssc_cmn_vals,
>>  			},
>> +			[TYPE_SGMII] = {
>> +				[NO_SSC] =
>> &pcie_100_no_ssc_plllc_cmn_vals,
>> +				[EXTERNAL_SSC] =
>> &pcie_100_ext_ssc_plllc_cmn_vals,
>> +				[INTERNAL_SSC] =
>> &pcie_100_int_ssc_plllc_cmn_vals,
>> +			},
>>  			[TYPE_QSGMII] = {
>>  				[NO_SSC] =
>> &pcie_100_no_ssc_plllc_cmn_vals,
>>  				[EXTERNAL_SSC] =
>> &pcie_100_ext_ssc_plllc_cmn_vals,
>> @@ -2469,6 +2587,13 @@ static const struct cdns_sierra_data
>> cdns_ti_map_sierra = {
>>  				[EXTERNAL_SSC] =
>> &usb_100_ext_ssc_cmn_vals,
>>  			},
>>  		},
>> +		[TYPE_SGMII] = {
>> +			[TYPE_PCIE] = {
>> +				[NO_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
>> +				[EXTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
>> +				[INTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
>> +			},
>> +		},
>>  		[TYPE_QSGMII] = {
>>  			[TYPE_PCIE] = {
>>  				[NO_SSC] =
>> &qsgmii_100_no_ssc_plllc1_cmn_vals,
>> @@ -2484,6 +2609,11 @@ static const struct cdns_sierra_data
>> cdns_ti_map_sierra = {
>>  				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
>>  				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
>>  			},
>> +			[TYPE_SGMII] = {
>> +				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
>> +				[EXTERNAL_SSC] =
>> &ti_ml_pcie_100_ext_ssc_ln_vals,
>> +				[INTERNAL_SSC] =
>> &ti_ml_pcie_100_int_ssc_ln_vals,
>> +			},
>>  			[TYPE_QSGMII] = {
>>  				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
>>  				[EXTERNAL_SSC] =
>> &ti_ml_pcie_100_ext_ssc_ln_vals,
>> @@ -2495,6 +2625,13 @@ static const struct cdns_sierra_data
>> cdns_ti_map_sierra = {
>>  				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
>>  			},
>>  		},
>> +		[TYPE_SGMII] = {
>> +			[TYPE_PCIE] = {
>> +				[NO_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
>> +				[EXTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
>> +				[INTERNAL_SSC] =
>> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
>> +			},
>> +		},
>>  		[TYPE_QSGMII] = {
>>  			[TYPE_PCIE] = {
>>  				[NO_SSC] =
>> &qsgmii_100_no_ssc_plllc1_ln_vals,
>> --
>> 2.25.1
> 

-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
  2023-03-09 10:03 Siddharth Vadapalli
@ 2023-03-09 10:12 ` Swapnil Kashinath Jakhade
  2023-03-09 10:28   ` Siddharth Vadapalli
  0 siblings, 1 reply; 7+ messages in thread
From: Swapnil Kashinath Jakhade @ 2023-03-09 10:12 UTC (permalink / raw)
  To: Siddharth Vadapalli, vkoul, kishon, lars
  Cc: linux-phy, linux-kernel, linux-arm-kernel, srk

Hi Siddharth,

> -----Original Message-----
> From: Siddharth Vadapalli <s-vadapalli@ti.com>
> Sent: Thursday, March 9, 2023 3:34 PM
> To: vkoul@kernel.org; kishon@kernel.org; lars@metafoo.de
> Cc: linux-phy@lists.infradead.org; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; Swapnil Kashinath Jakhade
> <sjakhade@cadence.com>; srk@ti.com; s-vadapalli@ti.com
> Subject: [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink
> configuration
> 
> EXTERNAL MAIL
> 
> 
> From: Swapnil Jakhade <sjakhade@cadence.com>
> 
> Add register sequences for PCIe + SGMII PHY multilink configuration.
> 
> Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
> ---

I have already sent this patch for review.
https://patchwork.kernel.org/project/linux-phy/patch/20230220141216.25326-1-sjakhade@cadence.com/

Thanks & regards,
Swapnil

>  drivers/phy/cadence/phy-cadence-sierra.c | 141 ++++++++++++++++++++++-
>  1 file changed, 139 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/phy/cadence/phy-cadence-sierra.c
> b/drivers/phy/cadence/phy-cadence-sierra.c
> index 6e86a6517f37..7c0daf3e8880 100644
> --- a/drivers/phy/cadence/phy-cadence-sierra.c
> +++ b/drivers/phy/cadence/phy-cadence-sierra.c
> @@ -24,7 +24,7 @@
>  #include <dt-bindings/phy/phy-cadence.h>
> 
>  #define NUM_SSC_MODE		3
> -#define NUM_PHY_TYPE		4
> +#define NUM_PHY_TYPE		5
> 
>  /* PHY register offsets */
>  #define SIERRA_COMMON_CDB_OFFSET			0x0
> @@ -46,7 +46,9 @@
>  #define SIERRA_CMN_REFRCV_PREG				0x98
>  #define SIERRA_CMN_REFRCV1_PREG				0xB8
>  #define SIERRA_CMN_PLLLC1_GEN_PREG			0xC2
> +#define SIERRA_CMN_PLLLC1_FBDIV_INT_PREG		0xC3
>  #define SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG		0xCA
> +#define SIERRA_CMN_PLLLC1_CLK0_PREG			0xCE
>  #define SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG		0xD0
>  #define SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG	0xE2
> 
> @@ -74,6 +76,7 @@
>  #define SIERRA_PSC_RX_A1_PREG				0x031
>  #define SIERRA_PSC_RX_A2_PREG				0x032
>  #define SIERRA_PSC_RX_A3_PREG				0x033
> +#define SIERRA_PLLCTRL_FBDIV_MODE01_PREG		0x039
>  #define SIERRA_PLLCTRL_SUBRATE_PREG			0x03A
>  #define SIERRA_PLLCTRL_GEN_A_PREG			0x03B
>  #define SIERRA_PLLCTRL_GEN_D_PREG			0x03E
> @@ -298,6 +301,7 @@ enum cdns_sierra_phy_type {
>  	TYPE_NONE,
>  	TYPE_PCIE,
>  	TYPE_USB,
> +	TYPE_SGMII,
>  	TYPE_QSGMII
>  };
> 
> @@ -936,6 +940,9 @@ static int cdns_sierra_get_optional(struct
> cdns_sierra_inst *inst,
>  	case PHY_TYPE_USB3:
>  		inst->phy_type = TYPE_USB;
>  		break;
> +	case PHY_TYPE_SGMII:
> +		inst->phy_type = TYPE_SGMII;
> +		break;
>  	case PHY_TYPE_QSGMII:
>  		inst->phy_type = TYPE_QSGMII;
>  		break;
> @@ -1339,7 +1346,7 @@ static int
> cdns_sierra_phy_configure_multilink(struct cdns_sierra_phy *sp)
>  			}
>  		}
> 
> -		if (phy_t1 == TYPE_QSGMII)
> +		if (phy_t1 == TYPE_SGMII || phy_t1 == TYPE_QSGMII)
>  			reset_control_deassert(sp->phys[node].lnk_rst);
>  	}
> 
> @@ -1537,6 +1544,71 @@ static int cdns_sierra_phy_remove(struct
> platform_device *pdev)
>  	return 0;
>  }
> 
> +/* SGMII PHY PMA lane configuration */
> +static struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = {
> +	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
> +};
> +
> +static struct cdns_sierra_vals sgmii_phy_pma_ln_vals = {
> +	.reg_pairs = sgmii_phy_pma_ln_regs,
> +	.num_regs = ARRAY_SIZE(sgmii_phy_pma_ln_regs),
> +};
> +
> +/* SGMII refclk 100MHz, no ssc, opt3 and GE1 links using PLL LC1 */
> +static const struct cdns_reg_pairs
> sgmii_100_no_ssc_plllc1_opt3_cmn_regs[] = {
> +	{0x002D, SIERRA_CMN_PLLLC1_FBDIV_INT_PREG},
> +	{0x2085, SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG},
> +	{0x1005, SIERRA_CMN_PLLLC1_CLK0_PREG},
> +	{0x0000, SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG},
> +	{0x0800, SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG}
> +};
> +
> +static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_ln_regs[] =
> {
> +	{0x688E, SIERRA_DET_STANDEC_D_PREG},
> +	{0x0004, SIERRA_PSC_LN_IDLE_PREG},
> +	{0x0FFE, SIERRA_PSC_RX_A0_PREG},
> +	{0x0106, SIERRA_PLLCTRL_FBDIV_MODE01_PREG},
> +	{0x0013, SIERRA_PLLCTRL_SUBRATE_PREG},
> +	{0x0003, SIERRA_PLLCTRL_GEN_A_PREG},
> +	{0x0106, SIERRA_PLLCTRL_GEN_D_PREG},
> +	{0x5231, SIERRA_PLLCTRL_CPGAIN_MODE_PREG },
> +	{0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
> +	{0x9702, SIERRA_DRVCTRL_BOOST_PREG},
> +	{0x0051, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
> +	{0x3C0E, SIERRA_CREQ_CCLKDET_MODE01_PREG},
> +	{0x3220, SIERRA_CREQ_FSMCLK_SEL_PREG},
> +	{0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
> +	{0x0002, SIERRA_DEQ_PHALIGN_CTRL},
> +	{0x0186, SIERRA_DEQ_GLUT0},
> +	{0x0186, SIERRA_DEQ_GLUT1},
> +	{0x0186, SIERRA_DEQ_GLUT2},
> +	{0x0186, SIERRA_DEQ_GLUT3},
> +	{0x0186, SIERRA_DEQ_GLUT4},
> +	{0x0861, SIERRA_DEQ_ALUT0},
> +	{0x07E0, SIERRA_DEQ_ALUT1},
> +	{0x079E, SIERRA_DEQ_ALUT2},
> +	{0x071D, SIERRA_DEQ_ALUT3},
> +	{0x03F5, SIERRA_DEQ_DFETAP_CTRL_PREG},
> +	{0x0C01, SIERRA_DEQ_TAU_CTRL1_FAST_MAINT_PREG},
> +	{0x3C40, SIERRA_DEQ_TAU_CTRL1_SLOW_MAINT_PREG},
> +	{0x1C04, SIERRA_DEQ_TAU_CTRL2_PREG},
> +	{0x0033, SIERRA_DEQ_PICTRL_PREG},
> +	{0x0000, SIERRA_CPI_OUTBUF_RATESEL_PREG},
> +	{0x0B6D, SIERRA_CPI_RESBIAS_BIN_PREG},
> +	{0x0102, SIERRA_RXBUFFER_CTLECTRL_PREG},
> +	{0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG}
> +};
> +
> +static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = {
> +	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_cmn_regs,
> +	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_cmn_regs),
> +};
> +
> +static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = {
> +	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_ln_regs,
> +	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_ln_regs),
> +};
> +
>  /* QSGMII PHY PMA lane configuration */
>  static struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = {
>  	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
> @@ -2363,6 +2435,11 @@ static const struct cdns_sierra_data
> cdns_map_sierra = {
>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>  				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>  			},
> +			[TYPE_SGMII] = {
> +				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
> +				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
> +				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
> +			},
>  			[TYPE_QSGMII] = {
>  				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
> @@ -2377,6 +2454,11 @@ static const struct cdns_sierra_data
> cdns_map_sierra = {
>  				[EXTERNAL_SSC] =
> &pcie_100_ext_ssc_cmn_vals,
>  				[INTERNAL_SSC] =
> &pcie_100_int_ssc_cmn_vals,
>  			},
> +			[TYPE_SGMII] = {
> +				[NO_SSC] =
> &pcie_100_no_ssc_plllc_cmn_vals,
> +				[EXTERNAL_SSC] =
> &pcie_100_ext_ssc_plllc_cmn_vals,
> +				[INTERNAL_SSC] =
> &pcie_100_int_ssc_plllc_cmn_vals,
> +			},
>  			[TYPE_QSGMII] = {
>  				[NO_SSC] =
> &pcie_100_no_ssc_plllc_cmn_vals,
>  				[EXTERNAL_SSC] =
> &pcie_100_ext_ssc_plllc_cmn_vals,
> @@ -2388,6 +2470,13 @@ static const struct cdns_sierra_data
> cdns_map_sierra = {
>  				[EXTERNAL_SSC] =
> &usb_100_ext_ssc_cmn_vals,
>  			},
>  		},
> +		[TYPE_SGMII] = {
> +			[TYPE_PCIE] = {
> +				[NO_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
> +				[EXTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
> +				[INTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
> +			},
> +		},
>  		[TYPE_QSGMII] = {
>  			[TYPE_PCIE] = {
>  				[NO_SSC] =
> &qsgmii_100_no_ssc_plllc1_cmn_vals,
> @@ -2403,6 +2492,11 @@ static const struct cdns_sierra_data
> cdns_map_sierra = {
>  				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
>  				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
>  			},
> +			[TYPE_SGMII] = {
> +				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
> +				[EXTERNAL_SSC] =
> &ml_pcie_100_ext_ssc_ln_vals,
> +				[INTERNAL_SSC] =
> &ml_pcie_100_int_ssc_ln_vals,
> +			},
>  			[TYPE_QSGMII] = {
>  				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
>  				[EXTERNAL_SSC] =
> &ml_pcie_100_ext_ssc_ln_vals,
> @@ -2414,6 +2508,13 @@ static const struct cdns_sierra_data
> cdns_map_sierra = {
>  				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
>  			},
>  		},
> +		[TYPE_SGMII] = {
> +			[TYPE_PCIE] = {
> +				[NO_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
> +				[EXTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
> +				[INTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
> +			},
> +		},
>  		[TYPE_QSGMII] = {
>  			[TYPE_PCIE] = {
>  				[NO_SSC] =
> &qsgmii_100_no_ssc_plllc1_ln_vals,
> @@ -2435,6 +2536,11 @@ static const struct cdns_sierra_data
> cdns_ti_map_sierra = {
>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>  				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
>  			},
> +			[TYPE_SGMII] = {
> +				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
> +				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
> +				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
> +			},
>  			[TYPE_QSGMII] = {
>  				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
>  				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
> @@ -2443,6 +2549,13 @@ static const struct cdns_sierra_data
> cdns_ti_map_sierra = {
>  		},
>  	},
>  	.phy_pma_ln_vals = {
> +		[TYPE_SGMII] = {
> +			[TYPE_PCIE] = {
> +				[NO_SSC] = &sgmii_phy_pma_ln_vals,
> +				[EXTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
> +				[INTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
> +			},
> +		},
>  		[TYPE_QSGMII] = {
>  			[TYPE_PCIE] = {
>  				[NO_SSC] = &qsgmii_phy_pma_ln_vals,
> @@ -2458,6 +2571,11 @@ static const struct cdns_sierra_data
> cdns_ti_map_sierra = {
>  				[EXTERNAL_SSC] =
> &pcie_100_ext_ssc_cmn_vals,
>  				[INTERNAL_SSC] =
> &pcie_100_int_ssc_cmn_vals,
>  			},
> +			[TYPE_SGMII] = {
> +				[NO_SSC] =
> &pcie_100_no_ssc_plllc_cmn_vals,
> +				[EXTERNAL_SSC] =
> &pcie_100_ext_ssc_plllc_cmn_vals,
> +				[INTERNAL_SSC] =
> &pcie_100_int_ssc_plllc_cmn_vals,
> +			},
>  			[TYPE_QSGMII] = {
>  				[NO_SSC] =
> &pcie_100_no_ssc_plllc_cmn_vals,
>  				[EXTERNAL_SSC] =
> &pcie_100_ext_ssc_plllc_cmn_vals,
> @@ -2469,6 +2587,13 @@ static const struct cdns_sierra_data
> cdns_ti_map_sierra = {
>  				[EXTERNAL_SSC] =
> &usb_100_ext_ssc_cmn_vals,
>  			},
>  		},
> +		[TYPE_SGMII] = {
> +			[TYPE_PCIE] = {
> +				[NO_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
> +				[EXTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
> +				[INTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
> +			},
> +		},
>  		[TYPE_QSGMII] = {
>  			[TYPE_PCIE] = {
>  				[NO_SSC] =
> &qsgmii_100_no_ssc_plllc1_cmn_vals,
> @@ -2484,6 +2609,11 @@ static const struct cdns_sierra_data
> cdns_ti_map_sierra = {
>  				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
>  				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
>  			},
> +			[TYPE_SGMII] = {
> +				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
> +				[EXTERNAL_SSC] =
> &ti_ml_pcie_100_ext_ssc_ln_vals,
> +				[INTERNAL_SSC] =
> &ti_ml_pcie_100_int_ssc_ln_vals,
> +			},
>  			[TYPE_QSGMII] = {
>  				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
>  				[EXTERNAL_SSC] =
> &ti_ml_pcie_100_ext_ssc_ln_vals,
> @@ -2495,6 +2625,13 @@ static const struct cdns_sierra_data
> cdns_ti_map_sierra = {
>  				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
>  			},
>  		},
> +		[TYPE_SGMII] = {
> +			[TYPE_PCIE] = {
> +				[NO_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
> +				[EXTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
> +				[INTERNAL_SSC] =
> &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
> +			},
> +		},
>  		[TYPE_QSGMII] = {
>  			[TYPE_PCIE] = {
>  				[NO_SSC] =
> &qsgmii_100_no_ssc_plllc1_ln_vals,
> --
> 2.25.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
@ 2023-03-09 10:03 Siddharth Vadapalli
  2023-03-09 10:12 ` Swapnil Kashinath Jakhade
  0 siblings, 1 reply; 7+ messages in thread
From: Siddharth Vadapalli @ 2023-03-09 10:03 UTC (permalink / raw)
  To: vkoul, kishon, lars
  Cc: linux-phy, linux-kernel, linux-arm-kernel, sjakhade, srk, s-vadapalli

From: Swapnil Jakhade <sjakhade@cadence.com>

Add register sequences for PCIe + SGMII PHY multilink configuration.

Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
---
 drivers/phy/cadence/phy-cadence-sierra.c | 141 ++++++++++++++++++++++-
 1 file changed, 139 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c
index 6e86a6517f37..7c0daf3e8880 100644
--- a/drivers/phy/cadence/phy-cadence-sierra.c
+++ b/drivers/phy/cadence/phy-cadence-sierra.c
@@ -24,7 +24,7 @@
 #include <dt-bindings/phy/phy-cadence.h>
 
 #define NUM_SSC_MODE		3
-#define NUM_PHY_TYPE		4
+#define NUM_PHY_TYPE		5
 
 /* PHY register offsets */
 #define SIERRA_COMMON_CDB_OFFSET			0x0
@@ -46,7 +46,9 @@
 #define SIERRA_CMN_REFRCV_PREG				0x98
 #define SIERRA_CMN_REFRCV1_PREG				0xB8
 #define SIERRA_CMN_PLLLC1_GEN_PREG			0xC2
+#define SIERRA_CMN_PLLLC1_FBDIV_INT_PREG		0xC3
 #define SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG		0xCA
+#define SIERRA_CMN_PLLLC1_CLK0_PREG			0xCE
 #define SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG		0xD0
 #define SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG	0xE2
 
@@ -74,6 +76,7 @@
 #define SIERRA_PSC_RX_A1_PREG				0x031
 #define SIERRA_PSC_RX_A2_PREG				0x032
 #define SIERRA_PSC_RX_A3_PREG				0x033
+#define SIERRA_PLLCTRL_FBDIV_MODE01_PREG		0x039
 #define SIERRA_PLLCTRL_SUBRATE_PREG			0x03A
 #define SIERRA_PLLCTRL_GEN_A_PREG			0x03B
 #define SIERRA_PLLCTRL_GEN_D_PREG			0x03E
@@ -298,6 +301,7 @@ enum cdns_sierra_phy_type {
 	TYPE_NONE,
 	TYPE_PCIE,
 	TYPE_USB,
+	TYPE_SGMII,
 	TYPE_QSGMII
 };
 
@@ -936,6 +940,9 @@ static int cdns_sierra_get_optional(struct cdns_sierra_inst *inst,
 	case PHY_TYPE_USB3:
 		inst->phy_type = TYPE_USB;
 		break;
+	case PHY_TYPE_SGMII:
+		inst->phy_type = TYPE_SGMII;
+		break;
 	case PHY_TYPE_QSGMII:
 		inst->phy_type = TYPE_QSGMII;
 		break;
@@ -1339,7 +1346,7 @@ static int cdns_sierra_phy_configure_multilink(struct cdns_sierra_phy *sp)
 			}
 		}
 
-		if (phy_t1 == TYPE_QSGMII)
+		if (phy_t1 == TYPE_SGMII || phy_t1 == TYPE_QSGMII)
 			reset_control_deassert(sp->phys[node].lnk_rst);
 	}
 
@@ -1537,6 +1544,71 @@ static int cdns_sierra_phy_remove(struct platform_device *pdev)
 	return 0;
 }
 
+/* SGMII PHY PMA lane configuration */
+static struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = {
+	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
+};
+
+static struct cdns_sierra_vals sgmii_phy_pma_ln_vals = {
+	.reg_pairs = sgmii_phy_pma_ln_regs,
+	.num_regs = ARRAY_SIZE(sgmii_phy_pma_ln_regs),
+};
+
+/* SGMII refclk 100MHz, no ssc, opt3 and GE1 links using PLL LC1 */
+static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_cmn_regs[] = {
+	{0x002D, SIERRA_CMN_PLLLC1_FBDIV_INT_PREG},
+	{0x2085, SIERRA_CMN_PLLLC1_LF_COEFF_MODE0_PREG},
+	{0x1005, SIERRA_CMN_PLLLC1_CLK0_PREG},
+	{0x0000, SIERRA_CMN_PLLLC1_BWCAL_MODE0_PREG},
+	{0x0800, SIERRA_CMN_PLLLC1_SS_TIME_STEPSIZE_MODE_PREG}
+};
+
+static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_ln_regs[] = {
+	{0x688E, SIERRA_DET_STANDEC_D_PREG},
+	{0x0004, SIERRA_PSC_LN_IDLE_PREG},
+	{0x0FFE, SIERRA_PSC_RX_A0_PREG},
+	{0x0106, SIERRA_PLLCTRL_FBDIV_MODE01_PREG},
+	{0x0013, SIERRA_PLLCTRL_SUBRATE_PREG},
+	{0x0003, SIERRA_PLLCTRL_GEN_A_PREG},
+	{0x0106, SIERRA_PLLCTRL_GEN_D_PREG},
+	{0x5231, SIERRA_PLLCTRL_CPGAIN_MODE_PREG },
+	{0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
+	{0x9702, SIERRA_DRVCTRL_BOOST_PREG},
+	{0x0051, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
+	{0x3C0E, SIERRA_CREQ_CCLKDET_MODE01_PREG},
+	{0x3220, SIERRA_CREQ_FSMCLK_SEL_PREG},
+	{0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
+	{0x0002, SIERRA_DEQ_PHALIGN_CTRL},
+	{0x0186, SIERRA_DEQ_GLUT0},
+	{0x0186, SIERRA_DEQ_GLUT1},
+	{0x0186, SIERRA_DEQ_GLUT2},
+	{0x0186, SIERRA_DEQ_GLUT3},
+	{0x0186, SIERRA_DEQ_GLUT4},
+	{0x0861, SIERRA_DEQ_ALUT0},
+	{0x07E0, SIERRA_DEQ_ALUT1},
+	{0x079E, SIERRA_DEQ_ALUT2},
+	{0x071D, SIERRA_DEQ_ALUT3},
+	{0x03F5, SIERRA_DEQ_DFETAP_CTRL_PREG},
+	{0x0C01, SIERRA_DEQ_TAU_CTRL1_FAST_MAINT_PREG},
+	{0x3C40, SIERRA_DEQ_TAU_CTRL1_SLOW_MAINT_PREG},
+	{0x1C04, SIERRA_DEQ_TAU_CTRL2_PREG},
+	{0x0033, SIERRA_DEQ_PICTRL_PREG},
+	{0x0000, SIERRA_CPI_OUTBUF_RATESEL_PREG},
+	{0x0B6D, SIERRA_CPI_RESBIAS_BIN_PREG},
+	{0x0102, SIERRA_RXBUFFER_CTLECTRL_PREG},
+	{0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG}
+};
+
+static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = {
+	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_cmn_regs,
+	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_cmn_regs),
+};
+
+static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = {
+	.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_ln_regs,
+	.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_ln_regs),
+};
+
 /* QSGMII PHY PMA lane configuration */
 static struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = {
 	{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
@@ -2363,6 +2435,11 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
@@ -2377,6 +2454,11 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_cmn_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
+				[INTERNAL_SSC] = &pcie_100_int_ssc_plllc_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
@@ -2388,6 +2470,13 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_cmn_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_cmn_vals,
@@ -2403,6 +2492,11 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
+				[EXTERNAL_SSC] = &ml_pcie_100_ext_ssc_ln_vals,
+				[INTERNAL_SSC] = &ml_pcie_100_int_ssc_ln_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &ml_pcie_100_no_ssc_ln_vals,
 				[EXTERNAL_SSC] = &ml_pcie_100_ext_ssc_ln_vals,
@@ -2414,6 +2508,13 @@ static const struct cdns_sierra_data cdns_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_ln_vals,
@@ -2435,6 +2536,11 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+				[INTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_phy_pcs_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_phy_pcs_cmn_vals,
@@ -2443,6 +2549,13 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 		},
 	},
 	.phy_pma_ln_vals = {
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_phy_pma_ln_vals,
+				[EXTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
+				[INTERNAL_SSC] = &sgmii_phy_pma_ln_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_phy_pma_ln_vals,
@@ -2458,6 +2571,11 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_cmn_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_cmn_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
+				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
+				[INTERNAL_SSC] = &pcie_100_int_ssc_plllc_cmn_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &pcie_100_no_ssc_plllc_cmn_vals,
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_plllc_cmn_vals,
@@ -2469,6 +2587,13 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_cmn_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_cmn_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_cmn_vals,
@@ -2484,6 +2609,11 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
 				[INTERNAL_SSC] = &pcie_100_int_ssc_ln_vals,
 			},
+			[TYPE_SGMII] = {
+				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
+				[EXTERNAL_SSC] = &ti_ml_pcie_100_ext_ssc_ln_vals,
+				[INTERNAL_SSC] = &ti_ml_pcie_100_int_ssc_ln_vals,
+			},
 			[TYPE_QSGMII] = {
 				[NO_SSC] = &ti_ml_pcie_100_no_ssc_ln_vals,
 				[EXTERNAL_SSC] = &ti_ml_pcie_100_ext_ssc_ln_vals,
@@ -2495,6 +2625,13 @@ static const struct cdns_sierra_data cdns_ti_map_sierra = {
 				[EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
 			},
 		},
+		[TYPE_SGMII] = {
+			[TYPE_PCIE] = {
+				[NO_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[EXTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+				[INTERNAL_SSC] = &sgmii_100_no_ssc_plllc1_opt3_ln_vals,
+			},
+		},
 		[TYPE_QSGMII] = {
 			[TYPE_PCIE] = {
 				[NO_SSC] = &qsgmii_100_no_ssc_plllc1_ln_vals,
-- 
2.25.1


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-03-31 13:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-20 14:12 [PATCH] phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration Swapnil Jakhade
2023-02-20 16:20 ` Roger Quadros
2023-03-27  5:34   ` Swapnil Kashinath Jakhade
2023-03-31 13:44 ` Vinod Koul
2023-03-09 10:03 Siddharth Vadapalli
2023-03-09 10:12 ` Swapnil Kashinath Jakhade
2023-03-09 10:28   ` Siddharth Vadapalli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).