From: Michal Simek <michal.simek@xilinx.com>
To: Robert Hancock <robert.hancock@calian.com>,
<netdev@vger.kernel.org>, Harini Katakam <harinik@xilinx.com>,
Piyush Mehta <piyush.mehta@xilinx.com>
Cc: <davem@davemloft.net>, <kuba@kernel.org>, <robh+dt@kernel.org>,
<michal.simek@xilinx.com>, <nicolas.ferre@microchip.com>,
<claudiu.beznea@microchip.com>, <devicetree@vger.kernel.org>
Subject: Re: [PATCH net-next 2/3] net: macb: Added ZynqMP-specific initialization
Date: Thu, 13 Jan 2022 08:27:50 +0100 [thread overview]
Message-ID: <3caae1db-b577-1e1f-3377-11272945054c@xilinx.com> (raw)
In-Reply-To: <20220112181113.875567-3-robert.hancock@calian.com>
On 1/12/22 19:11, Robert Hancock wrote:
> The GEM controllers on ZynqMP were missing some initialization steps which
> are required in some cases when using SGMII mode, which uses the PS-GTR
> transceivers managed by the phy-zynqmp driver.
>
> The GEM core appears to need a hardware-level reset in order to work
> properly in SGMII mode in cases where the GT reference clock was not
> present at initial power-on. This can be done using a reset mapped to
> the zynqmp-reset driver in the device tree.
>
> Also, when in SGMII mode, the GEM driver needs to ensure the PHY is
> initialized and powered on when it is initializing.
>
> Signed-off-by: Robert Hancock <robert.hancock@calian.com>
> ---
> drivers/net/ethernet/cadence/macb_main.c | 47 +++++++++++++++++++++++-
> 1 file changed, 46 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index a363da928e8b..65b0360c487a 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -34,7 +34,9 @@
> #include <linux/udp.h>
> #include <linux/tcp.h>
> #include <linux/iopoll.h>
> +#include <linux/phy/phy.h>
> #include <linux/pm_runtime.h>
> +#include <linux/reset.h>
> #include "macb.h"
>
> /* This structure is only used for MACB on SiFive FU540 devices */
> @@ -4455,6 +4457,49 @@ static int fu540_c000_init(struct platform_device *pdev)
> return macb_init(pdev);
> }
>
> +static int zynqmp_init(struct platform_device *pdev)
> +{
> + struct net_device *dev = platform_get_drvdata(pdev);
> + struct macb *bp = netdev_priv(dev);
> + int ret;
> +
> + /* Fully reset GEM controller at hardware level using zynqmp-reset driver,
> + * if mapped in device tree.
> + */
> + ret = device_reset(&pdev->dev);
> + if (ret) {
> + dev_err_probe(&pdev->dev, ret, "failed to reset controller");
> + return ret;
> + }
> +
> + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII) {
> + /* Ensure PS-GTR PHY device used in SGMII mode is ready */
> + struct phy *sgmii_phy = devm_phy_get(&pdev->dev, "sgmii-phy");
> +
> + if (IS_ERR(sgmii_phy)) {
> + ret = PTR_ERR(sgmii_phy);
> + dev_err_probe(&pdev->dev, ret,
> + "failed to get PS-GTR PHY\n");
> + return ret;
> + }
> +
> + ret = phy_init(sgmii_phy);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to init PS-GTR PHY: %d\n",
> + ret);
> + return ret;
> + }
I was playing with it recently on u-boot side and device reset should happen
between phy init and phy power on to finish calibration.
At least that's I was told and that's I use in u-boot driver.
Harini/Piyush: Please correct me if I am wrong.
Thanks,
Michal
next prev parent reply other threads:[~2022-01-13 7:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 18:11 [PATCH net-next 0/3] Cadence MACB/GEM support for ZynqMP SGMII Robert Hancock
2022-01-12 18:11 ` [PATCH net-next 1/3] macb: bindings doc: added generic PHY and reset mappings for ZynqMP Robert Hancock
2022-01-13 7:25 ` Michal Simek
2022-01-13 16:34 ` Robert Hancock
2022-01-13 17:43 ` Geert Uytterhoeven
2022-01-13 17:49 ` Robert Hancock
2022-01-12 18:11 ` [PATCH net-next 2/3] net: macb: Added ZynqMP-specific initialization Robert Hancock
2022-01-13 7:27 ` Michal Simek [this message]
2022-01-13 10:14 ` Harini Katakam
2022-01-13 17:14 ` Robert Hancock
2022-01-13 8:04 ` Claudiu.Beznea
2022-01-13 16:32 ` Robert Hancock
2022-01-12 18:11 ` [PATCH net-next 3/3] arm64: dts: zynqmp: Added GEM reset definitions Robert Hancock
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3caae1db-b577-1e1f-3377-11272945054c@xilinx.com \
--to=michal.simek@xilinx.com \
--cc=claudiu.beznea@microchip.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=harinik@xilinx.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=piyush.mehta@xilinx.com \
--cc=robert.hancock@calian.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).