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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA502C6FD1E for ; Fri, 10 Mar 2023 12:32:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbjCJMcB (ORCPT ); Fri, 10 Mar 2023 07:32:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjCJMb7 (ORCPT ); Fri, 10 Mar 2023 07:31:59 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D02410A2B6; Fri, 10 Mar 2023 04:31:57 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id g3so19842228eda.1; Fri, 10 Mar 2023 04:31:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678451516; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=dM/6y+pGZsHw46qcroeXZ+yxnyO472cga3XQ+CDNRQo=; b=gHqP0lRf5dmMfYkD1TjOI7h6LAWEfQwt2b2a9qiyr17EtN37FwLtvKzTkuLyluDHz9 7f/ht5bI4hYTxrokbmlLRiVa9a58dVg2mz/hqp3gC9dA5/IA3TxGlGarqpED4sS3xDef jXNOtINWcKZCFCTukwvWQ/1BNb84hLrd5KdCsmTVQ6yGWwZeCzQH2GpnUWQgJBhZNgQY 5gb1Mbpb6Mq1PieaRCLwYO9/Z/KyImLigYeKTySYFvGVhizpaNqgJuwoYhAVGk+Ag4yZ tdrIsJhU4iR6lgK57nPAv+hysvXtx8Mv+1asKNLKWWZ1RZSEdvKg96XbURHkatBYeSpA EPDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678451516; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dM/6y+pGZsHw46qcroeXZ+yxnyO472cga3XQ+CDNRQo=; b=xBVmymgArZ5BXKAwXJaesoBsPcuzMif3d1qmyqnwiS3YBD7bAM/lD2WhjFgm0hjc3L ZlhG+eJ3DLGzMgtbFBDjtwXQB0Eft0/Ojqq7C0lyHzhhg8qRntKlCROR/oiyeFyo2w1K XJuQHMSBOLMOTuTnGCtQu9fmc3GjZx18F0si04o8H6OF9oczb5bfr19hn6VyYKIv9sTi 7tRf80uAjxFpEdOVMUkk9asF11l5pyfr8CByo+LR9jQrTgPGU6G8BkqdDTtMi2XCGHj7 iYyggkyihmRgqvkZ6Hr8PCKa9lz8dA0/kvxtqQ8cYQZ0Csv4BlsoDUe9lKon0M8EC2+A zeow== X-Gm-Message-State: AO0yUKWKqIES8u8/u/cPSEUCVuc6/sacO6nrw7I2k5iL6z5q3MXvfLqb GROkcFm3lMRTL2OVhQ3xLepTPLD9StGg5vpRRW4= X-Google-Smtp-Source: AK7set/AhWVfI0IYhkF9qj0Q8joJWtwHebYeaOFmfigGs2Bw2cU7Ur07XbpMFa9pkCQGY/J+wqbNaHD2cok5VkdCkEo= X-Received: by 2002:a17:906:37ce:b0:8cb:56f3:95b2 with SMTP id o14-20020a17090637ce00b008cb56f395b2mr13055837ejc.9.1678451515947; Fri, 10 Mar 2023 04:31:55 -0800 (PST) MIME-Version: 1.0 References: <20230310080518.78054-1-lucas.tanure@collabora.com> <20230310080518.78054-5-lucas.tanure@collabora.com> In-Reply-To: <20230310080518.78054-5-lucas.tanure@collabora.com> From: Peter Geis Date: Fri, 10 Mar 2023 07:31:43 -0500 Message-ID: Subject: Re: [PATCH 4/7] phy: rockchip: Add naneng combo phy support for RK3588 To: Lucas Tanure Cc: Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Thomas Gleixner , Marc Zyngier , Lorenzo Pieralisi , Krzysztof Wilczynski , Bjorn Helgaas , Qu Wenruo , Piotr Oniszczuk , Kever Yang , linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, kernel@collabora.com, Andrew Powers-Holmes Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 10, 2023 at 3:05 AM Lucas Tanure wrote: > > Add support for RK3588 combo phy > > This is based on prior work from XiaoDong Huang and > Peter Geis fixing this issue specifically for Rockchip 356x. > > Co-developed-by: Andrew Powers-Holmes > Signed-off-by: Andrew Powers-Holmes > Signed-off-by: Lucas Tanure > --- > .../rockchip/phy-rockchip-naneng-combphy.c | 184 ++++++++++++++++++ > 1 file changed, 184 insertions(+) > > diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c > index 7b213825fb5d..7b8b001e4f9e 100644 > --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c > +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c > @@ -63,6 +63,9 @@ > #define PHYREG18 0x44 > #define PHYREG18_PLL_LOOP 0x32 > > +#define PHYREG27 0x6C > +#define PHYREG27_RX_TRIM_RK3588 0x4C > + > #define PHYREG32 0x7C > #define PHYREG32_SSC_MASK GENMASK(7, 4) > #define PHYREG32_SSC_DIR_SHIFT 4 > @@ -114,7 +117,10 @@ struct rockchip_combphy_grfcfg { > struct combphy_reg con2_for_sata; > struct combphy_reg con3_for_sata; > struct combphy_reg pipe_con0_for_sata; > + struct combphy_reg pipe_con1_for_sata; > struct combphy_reg pipe_xpcs_phy_ready; > + struct combphy_reg pipe_pcie1l0_sel; > + struct combphy_reg pipe_pcie1l1_sel; > }; > > struct rockchip_combphy_cfg { > @@ -559,11 +565,189 @@ static const struct rockchip_combphy_cfg rk3568_combphy_cfgs = { > .combphy_cfg = rk3568_combphy_cfg, > }; > > +static int rk3588_combphy_cfg(struct rockchip_combphy_priv *priv) > +{ > + const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; > + unsigned long rate; > + u32 val; > + > + switch (priv->type) { > + case PHY_TYPE_PCIE: > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_pcie, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_pcie, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_pcie, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_pcie, true); > + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_pcie1l0_sel, true); > + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_pcie1l1_sel, true); It's theoretically possible to have a different configuration than both lanes being PCIe. If this exists yet in hardware I can't answer, but you need to be able to support it. I recommend a similar solution to what we applied to the PCIe3 phy driver. > + break; > + case PHY_TYPE_USB3: > + /* Set SSC downward spread spectrum */ > + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, > + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, > + PHYREG32); > + > + /* Enable adaptive CTLE for USB3.0 Rx. */ > + val = readl(priv->mmio + PHYREG15); > + val |= PHYREG15_CTLE_EN; > + writel(val, priv->mmio + PHYREG15); > + > + /* Set PLL KVCO fine tuning signals. */ > + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, > + PHYREG33_PLL_KVCO_VALUE << PHYREG33_PLL_KVCO_SHIFT, > + PHYREG33); > + > + /* Enable controlling random jitter. */ > + writel(PHYREG12_PLL_LPF_ADJ_VALUE, priv->mmio + PHYREG12); > + > + /* Set PLL input clock divider 1/2. */ > + rockchip_combphy_updatel(priv, PHYREG6_PLL_DIV_MASK, > + PHYREG6_PLL_DIV_2 << PHYREG6_PLL_DIV_SHIFT, > + PHYREG6); > + > + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); > + writel(PHYREG11_SU_TRIM_0_7, priv->mmio + PHYREG11); > + > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txcomp_sel, false); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txelec_sel, false); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->usb_mode_set, true); > + break; > + case PHY_TYPE_SATA: > + /* Enable adaptive CTLE for SATA Rx. */ > + val = readl(priv->mmio + PHYREG15); > + val |= PHYREG15_CTLE_EN; > + writel(val, priv->mmio + PHYREG15); > + /* > + * Set tx_rterm=50ohm and rx_rterm=44ohm for SATA. > + * 0: 60ohm, 8: 50ohm 15: 44ohm (by step abort 1ohm) > + */ > + val = PHYREG7_TX_RTERM_50OHM << PHYREG7_TX_RTERM_SHIFT; > + val |= PHYREG7_RX_RTERM_44OHM << PHYREG7_RX_RTERM_SHIFT; > + writel(val, priv->mmio + PHYREG7); > + > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_sata, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_sata, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_sata, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_sata, true); > + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con0_for_sata, true); > + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con1_for_sata, true); > + break; > + case PHY_TYPE_SGMII: > + case PHY_TYPE_QSGMII: > + default: > + dev_err(priv->dev, "incompatible PHY type\n"); > + return -EINVAL; > + } > + > + rate = clk_get_rate(priv->refclk); > + > + switch (rate) { > + case REF_CLOCK_24MHz: > + if (priv->type == PHY_TYPE_USB3 || priv->type == PHY_TYPE_SATA) { > + /* Set ssc_cnt[9:0]=0101111101 & 31.5KHz. */ > + val = PHYREG15_SSC_CNT_VALUE << PHYREG15_SSC_CNT_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG15_SSC_CNT_MASK, > + val, PHYREG15); > + > + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); > + } > + break; > + > + case REF_CLOCK_25MHz: > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_25m, true); > + break; > + case REF_CLOCK_100MHz: > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_100m, true); > + if (priv->type == PHY_TYPE_PCIE) { > + /* PLL KVCO fine tuning. */ > + val = 4 << PHYREG33_PLL_KVCO_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, > + val, PHYREG33); > + > + /* Enable controlling random jitter. */ > + writel(PHYREG12_PLL_LPF_ADJ_VALUE, priv->mmio + PHYREG12); > + > + /* Set up rx_trim: PLL LPF C1 85pf R1 1.25kohm */ > + writel(PHYREG27_RX_TRIM_RK3588, priv->mmio + PHYREG27); > + > + /* Set up su_trim: */ > + writel(PHYREG11_SU_TRIM_0_7, priv->mmio + PHYREG11); > + } else if (priv->type == PHY_TYPE_SATA) { > + /* downward spread spectrum +500ppm */ > + val = PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT; > + val |= PHYREG32_SSC_OFFSET_500PPM << PHYREG32_SSC_OFFSET_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, val, PHYREG32); > + } > + break; > + default: > + dev_err(priv->dev, "Unsupported rate: %lu\n", rate); > + return -EINVAL; > + } > + > + if (priv->ext_refclk) { > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_ext, true); > + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_100MHz) { > + val = PHYREG13_RESISTER_HIGH_Z << PHYREG13_RESISTER_SHIFT; > + val |= PHYREG13_CKRCV_AMP0; > + rockchip_combphy_updatel(priv, PHYREG13_RESISTER_MASK, val, PHYREG13); > + > + val = readl(priv->mmio + PHYREG14); > + val |= PHYREG14_CKRCV_AMP1; > + writel(val, priv->mmio + PHYREG14); > + } > + } > + > + if (priv->enable_ssc) { > + val = readl(priv->mmio + PHYREG8); > + val |= PHYREG8_SSC_EN; > + writel(val, priv->mmio + PHYREG8); > + } > + > + return 0; > +} > + > +static const struct rockchip_combphy_grfcfg rk3588_combphy_grfcfgs = { > + /* pipe-phy-grf */ > + .pcie_mode_set = { 0x0000, 5, 0, 0x00, 0x11 }, > + .usb_mode_set = { 0x0000, 5, 0, 0x00, 0x04 }, > + .pipe_rxterm_set = { 0x0000, 12, 12, 0x00, 0x01 }, > + .pipe_txelec_set = { 0x0004, 1, 1, 0x00, 0x01 }, > + .pipe_txcomp_set = { 0x0004, 4, 4, 0x00, 0x01 }, > + .pipe_clk_25m = { 0x0004, 14, 13, 0x00, 0x01 }, > + .pipe_clk_100m = { 0x0004, 14, 13, 0x00, 0x02 }, > + .pipe_rxterm_sel = { 0x0008, 8, 8, 0x00, 0x01 }, > + .pipe_txelec_sel = { 0x0008, 12, 12, 0x00, 0x01 }, > + .pipe_txcomp_sel = { 0x0008, 15, 15, 0x00, 0x01 }, > + .pipe_clk_ext = { 0x000c, 9, 8, 0x02, 0x01 }, > + .pipe_phy_status = { 0x0034, 6, 6, 0x01, 0x00 }, > + .con0_for_pcie = { 0x0000, 15, 0, 0x00, 0x1000 }, > + .con1_for_pcie = { 0x0004, 15, 0, 0x00, 0x0000 }, > + .con2_for_pcie = { 0x0008, 15, 0, 0x00, 0x0101 }, > + .con3_for_pcie = { 0x000c, 15, 0, 0x00, 0x0200 }, > + .con0_for_sata = { 0x0000, 15, 0, 0x00, 0x0129 }, > + .con1_for_sata = { 0x0004, 15, 0, 0x00, 0x0000 }, > + .con2_for_sata = { 0x0008, 15, 0, 0x00, 0x80c1 }, > + .con3_for_sata = { 0x000c, 15, 0, 0x00, 0x0407 }, > + /* pipe-grf */ > + .pipe_con0_for_sata = { 0x0000, 11, 5, 0x00, 0x22 }, > + .pipe_con1_for_sata = { 0x0000, 2, 0, 0x00, 0x2 }, > + .pipe_pcie1l0_sel = { 0x0100, 0, 0, 0x01, 0x0 }, > + .pipe_pcie1l1_sel = { 0x0100, 1, 1, 0x01, 0x0 }, > +}; > + > +static const struct rockchip_combphy_cfg rk3588_combphy_cfgs = { > + .grfcfg = &rk3588_combphy_grfcfgs, > + .combphy_cfg = rk3588_combphy_cfg, > +}; > + > static const struct of_device_id rockchip_combphy_of_match[] = { > { > .compatible = "rockchip,rk3568-naneng-combphy", > .data = &rk3568_combphy_cfgs, > }, > + { > + .compatible = "rockchip,rk3588-naneng-combphy", > + .data = &rk3588_combphy_cfgs, > + }, > { }, > }; > MODULE_DEVICE_TABLE(of, rockchip_combphy_of_match); > -- > 2.39.2 >