From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ACA0C433B4 for ; Thu, 6 May 2021 11:10:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C5C0611AC for ; Thu, 6 May 2021 11:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234657AbhEFLLh (ORCPT ); Thu, 6 May 2021 07:11:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234580AbhEFLLg (ORCPT ); Thu, 6 May 2021 07:11:36 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E07F1C061574; Thu, 6 May 2021 04:10:36 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id h4so5147533wrt.12; Thu, 06 May 2021 04:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xHpHiNuOU0Ht2c6WWKHsUNUmx5o808QiQmCtxbc5adM=; b=vJJ+FV/5DMSCMGfnCgQSIIuYtjFKzxqj/1tSrigvtc7klIHZk29AyF6gt6hW8DuIzv 3YvqGWVkxrX/aoo/woRuC+7gwsqMkSKryegiub6K1P5qhgUUAYTNDOpSYKImAjDEPs// /43YfQUZtaLg7Cfc4KPzwqpEOUgMdphe/H0b/wNJIfajFs6WhP/JVT64xBqsnLyIddCu Ij5huGwJjAbhKnjHcJjG9ayLzXXZibyRzZZ+QiBR835sOzqTzkq4EUZzyF0am1nioXl8 QAYBl+kbYdU8Ftmos8LpOJGqJOyaYNWdb2H3wASL5MmMaupKjq1GNsQVuO8efd95RIov 3QLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xHpHiNuOU0Ht2c6WWKHsUNUmx5o808QiQmCtxbc5adM=; b=DOd3GRrwTW1AXBaKIyKix0KSmnqSZAJVmKFiL9QkgTtFqWOyUfCSdSPXvbkR0IfKap WzgeqcIXLerS903zonGxJjvNCLZUkQcnGVGLrQ+UZHtywAbvmtMKfO/aFxjUrifIR8Q2 XG5BcNgh/GpeT77qwnQftz1XDUijdz1m+DI0AuG+lrTVB8YxhiVSUpySwPf6NpkcrHmf lKZuYI4f4Kdo5TvybZQ15Ap7eqfbY0TBCvzvjj2QNUsYVHN8HRmzRwXPsb2//LMmx2yr +Z9kPgRBvNpx1D3WS9yRcYLwk+pUoqqOS3MtNjBTEIr4M+AwoAeCiF3TyWpToWfztN+8 o7HA== X-Gm-Message-State: AOAM531bJN+f9Tkp+pxY/YQL/yhikqMYyFxNrDxZiB70BQ+2PUJm+Km/ oCDzdGbLU1jC99lopy3I8h4yPEfql1A= X-Google-Smtp-Source: ABdhPJxZoe3gk/sOyJB2/ud+fB4tL1Jo+P5Spl/HNQ27tnGWSIKj2l4vN3v6AAKzRyO2yp/9DnDF5w== X-Received: by 2002:a5d:4ccc:: with SMTP id c12mr4557594wrt.268.1620299435416; Thu, 06 May 2021 04:10:35 -0700 (PDT) Received: from skbuf ([86.127.41.210]) by smtp.gmail.com with ESMTPSA id e10sm3875050wrw.20.2021.05.06.04.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 04:10:35 -0700 (PDT) Date: Thu, 6 May 2021 14:10:33 +0300 From: Vladimir Oltean To: Ansuel Smith Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , Russell King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH net-next v3 13/20] net: dsa: qca8k: make rgmii delay configurable Message-ID: <20210506111033.w4v4jj3amwhyj4r3@skbuf> References: <20210504222915.17206-1-ansuelsmth@gmail.com> <20210504222915.17206-13-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210504222915.17206-13-ansuelsmth@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 05, 2021 at 12:29:07AM +0200, Ansuel Smith wrote: > The legacy qsdk code used a different delay instead of the max value. > Qsdk use 1 ps for rx and 2 ps for tx. Make these values configurable > using the standard rx/tx-internal-delay-ps ethernet binding and apply > qsdk values by default. The connected gmac doesn't add any delay so no > additional delay is added to tx/rx. > > Signed-off-by: Ansuel Smith > --- > drivers/net/dsa/qca8k.c | 51 +++++++++++++++++++++++++++++++++++++++-- > drivers/net/dsa/qca8k.h | 11 +++++---- > 2 files changed, 55 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c > index 22334d416f53..cb9b44769e92 100644 > --- a/drivers/net/dsa/qca8k.c > +++ b/drivers/net/dsa/qca8k.c > @@ -779,6 +779,47 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv) > return 0; > } > > +static int > +qca8k_setup_of_rgmii_delay(struct qca8k_priv *priv) > +{ > + struct device_node *ports, *port; > + u32 val; > + > + ports = of_get_child_by_name(priv->dev->of_node, "ports"); Consider falling back to searching for the "ethernet-ports" name too, DSA should now support both. > + if (!ports) > + return -EINVAL; > + > + /* Assume only one port with rgmii-id mode */ > + for_each_available_child_of_node(ports, port) { > + if (!of_property_match_string(port, "phy-mode", "rgmii-id")) > + continue; > + > + if (of_property_read_u32(port, "rx-internal-delay-ps", &val)) > + val = 2; > + > + if (val > QCA8K_MAX_DELAY) { > + dev_err(priv->dev, "rgmii rx delay is limited to more than 3ps, setting to the max value"); > + priv->rgmii_rx_delay = 3; ?! 3 picoseconds is not a lot of clock skew for a 125/25/2.5 MHz clock. 3 nanoseconds maybe? > + } else { > + priv->rgmii_rx_delay = val; > + } > + > + if (of_property_read_u32(port, "rx-internal-delay-ps", &val)) > + val = 1; > + > + if (val > QCA8K_MAX_DELAY) { > + dev_err(priv->dev, "rgmii tx delay is limited to more than 3ps, setting to the max value"); > + priv->rgmii_tx_delay = 3; > + } else { > + priv->rgmii_rx_delay = val; > + } > + } > + > + of_node_put(ports); > + > + return 0; > +} > + > static int > qca8k_setup(struct dsa_switch *ds) > { > @@ -808,6 +849,10 @@ qca8k_setup(struct dsa_switch *ds) > if (ret) > return ret; > > + ret = qca8k_setup_of_rgmii_delay(priv); > + if (ret) > + return ret; > + > /* Enable CPU Port */ > ret = qca8k_reg_set(priv, QCA8K_REG_GLOBAL_FW_CTRL0, > QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN); > @@ -1018,8 +1063,10 @@ qca8k_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, > */ > qca8k_write(priv, reg, > QCA8K_PORT_PAD_RGMII_EN | > - QCA8K_PORT_PAD_RGMII_TX_DELAY(QCA8K_MAX_DELAY) | > - QCA8K_PORT_PAD_RGMII_RX_DELAY(QCA8K_MAX_DELAY)); > + QCA8K_PORT_PAD_RGMII_TX_DELAY(priv->rgmii_tx_delay) | > + QCA8K_PORT_PAD_RGMII_RX_DELAY(priv->rgmii_rx_delay) | > + QCA8K_PORT_PAD_RGMII_TX_DELAY_EN | > + QCA8K_PORT_PAD_RGMII_RX_DELAY_EN); > /* QCA8337 requires to set rgmii rx delay */ > if (data->id == QCA8K_ID_QCA8337) > qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL, > diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h > index 0b503f78bf92..80830bb42736 100644 > --- a/drivers/net/dsa/qca8k.h > +++ b/drivers/net/dsa/qca8k.h > @@ -36,12 +36,11 @@ > #define QCA8K_REG_PORT5_PAD_CTRL 0x008 > #define QCA8K_REG_PORT6_PAD_CTRL 0x00c > #define QCA8K_PORT_PAD_RGMII_EN BIT(26) > -#define QCA8K_PORT_PAD_RGMII_TX_DELAY(x) \ > - ((0x8 + (x & 0x3)) << 22) > -#define QCA8K_PORT_PAD_RGMII_RX_DELAY(x) \ > - ((0x10 + (x & 0x3)) << 20) > -#define QCA8K_MAX_DELAY 3 > +#define QCA8K_PORT_PAD_RGMII_TX_DELAY(x) ((x) << 22) > +#define QCA8K_PORT_PAD_RGMII_RX_DELAY(x) ((x) << 20) > +#define QCA8K_PORT_PAD_RGMII_TX_DELAY_EN BIT(25) > #define QCA8K_PORT_PAD_RGMII_RX_DELAY_EN BIT(24) > +#define QCA8K_MAX_DELAY 3 > #define QCA8K_PORT_PAD_SGMII_EN BIT(7) > #define QCA8K_REG_PWS 0x010 > #define QCA8K_PWS_SERDES_AEN_DIS BIT(7) > @@ -251,6 +250,8 @@ struct qca8k_match_data { > > struct qca8k_priv { > u8 switch_revision; > + u8 rgmii_tx_delay; > + u8 rgmii_rx_delay; > struct regmap *regmap; > struct mii_bus *bus; > struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS]; > -- > 2.30.2 >