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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0EF3C433F5 for ; Fri, 25 Feb 2022 18:29:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F23E836AC; Fri, 25 Feb 2022 19:29:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nkRGC+7o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 94A298303C; Fri, 25 Feb 2022 19:29:51 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9F87883811 for ; Fri, 25 Feb 2022 19:29:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-io1-xd29.google.com with SMTP id f14so7536189ioz.1 for ; Fri, 25 Feb 2022 10:29:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4wYzeNDE2bV3GUE6gL1dfFH4NWjaTyWR70gndA+uf9Y=; b=nkRGC+7oRYIZneIfIt3om5bG4Epf9VxzxaT78JrGoUEvRQp2f96yRDAuRST/VG1QKg dwice7tzX5RTfnImZJiWyOVY7IVbu2y+pfWNkh7RZlNXlDrXcOjEsuCzY7t3ex722pTl PJja2gm8O9u/nq8/9OMG6LIqcyjPGuGs4ayJgtISoeBXcbnCGgNYQPCAhCcNqNF7wMeA lepLm5BUtfMy67X/YBRuJRX3WAvxDsVIh1hpcnImEEyIz/BwjSWbOXAxraE2oUOmsTEl JWVi3iyqSE/RBySvy7Z1qfeeMkz2MNy9W1AyKD3e3h6TSQpRI3Eikn9o8837XXLGTl7+ oecA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4wYzeNDE2bV3GUE6gL1dfFH4NWjaTyWR70gndA+uf9Y=; b=wOaYUlxJsBXDrLh16FI5ge8dphVBV0zgDGYLuzk8RMy8BqdmfIOkBUoIB/nGizYdhs g3NiEYEuWRZ1dPL0DkxS4qwxnf01NxkO+wUE4Q1Py0C1912wZ7JYm1dKFUO8opWsIjSV yg0pgs5sNCxQH6lPlZgcDr91mAjh5CBF+mYRqM/rrh1JoFFz7IAfN5uTGZxHBqb4+gdZ 3/CgetGFN8tDmEhPZMZSb5wF/1SJpuMP5h5rk0KH2rfM/g9vdKzQjn4yrmgwdQq/qWxY X6SEWB2vzJVQNa4k5ocSKQvkRdaaMkT9xWXlLrWUb3lacdeWSDi4YY2bR+WUOOrvSOy6 dZWQ== X-Gm-Message-State: AOAM5314AkqJB1S2J29DAn/joaerv8rY2acLZXnWmC9MU7bWvavbyaxq sb3u0x2/Gunm7UUVtHx7OqcNEd/4rCuc3A== X-Google-Smtp-Source: ABdhPJzwXubOOISvhTqQlp709wqICNi/qF0fqwrf7GK23Wz3e5HebU8FK1FbBXptkxPPnmHars6xLA== X-Received: by 2002:a02:ccac:0:b0:314:2074:fec4 with SMTP id t12-20020a02ccac000000b003142074fec4mr7035235jap.41.1645813785275; Fri, 25 Feb 2022 10:29:45 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:5b80:a4b8:a089:497a]) by smtp.gmail.com with ESMTPSA id i14-20020a056e02152e00b002bee249710csm1974155ilu.15.2022.02.25.10.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 10:29:44 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: marex@denx.de, aford@beaconembedded.com, cstevens@beaconembedded.com, Adam Ford , Joe Hershberger , Ramon Fried Subject: [PATCH V2 1/2] net: ravb: Add tx/rx delay flag checks and support for rgmii-rxid Date: Fri, 25 Feb 2022 12:29:35 -0600 Message-Id: <20220225182936.417077-1-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Some boards like the Beacon RZ/G2 SOM use either flags for tx-internal-delay-ps, rx-internal-delay-ps or rgmii-rxid. In Linux the APSR_RDM flag is set when either rx-internal-delay-ps is set or the mode is rgmii-rxid, and the APSR_TDM is set when tx-internal-delay-ps is found or rgmii-txid is set, and both are set if rgmii-id is set. The ravb driver in U-Boot driver was missing rgmii-rxid support, so add that support in a similar fashion to what is done in Linux. Signed-off-by: Adam Ford --- V2: Add boolean for explit delays which skips the rgmii mode check if explicit delays are set. This more closely matches the behavior in Linux. Also add the same comments for the delays to match the comments found in Linux. diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 1d1118c341..7bc8c84aaa 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -52,6 +52,7 @@ #define CSR_OPS 0x0000000F #define CSR_OPS_CONFIG BIT(1) +#define APSR_RDM BIT(13) #define APSR_TDM BIT(14) #define TCCR_TSRQ0 BIT(0) @@ -376,6 +377,9 @@ static int ravb_dmac_init(struct udevice *dev) struct ravb_priv *eth = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); int ret = 0; + int mode = 0; + unsigned int delay; + bool explicit_delay = false; /* Set CONFIG mode */ ret = ravb_reset(dev); @@ -402,9 +406,33 @@ static int ravb_dmac_init(struct udevice *dev) (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77995)) return 0; - if ((pdata->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) || - (pdata->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID)) - writel(APSR_TDM, eth->iobase + RAVB_REG_APSR); + if (!dev_read_u32(dev, "tx-internal-delay-ps", &delay)) { + /* Valid values are 0 and 2000, according to DT bindings */ + if (delay) { + mode |= APSR_TDM; + explicit_delay = true; + } + } + + if (!dev_read_u32(dev, "rx-internal-delay-ps", &delay)) { + /* Valid values are 0 and 1800, according to DT bindings */ + if (delay) { + mode |= APSR_RDM; + explicit_delay = true; + } + } + + if (!explicit_delay) { + if (pdata->phy_interface == PHY_INTERFACE_MODE_RGMII_ID || + pdata->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) + mode |= APSR_RDM; + + if (pdata->phy_interface == PHY_INTERFACE_MODE_RGMII_ID || + pdata->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) + mode |= APSR_TDM; + } + + writel(mode, eth->iobase + RAVB_REG_APSR); return 0; } -- 2.34.1