Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <220e82d4-1c20-c540-7dcf-a8fb25f8935d@ti.com>
Date:   Thu, 24 Feb 2022 16:11:55 +0530
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
From:   Siddharth Narayan Vadapalli <s-vadapalli@ti.com>
Subject: Re: [PATCH] net: phy: mscc: enable MAC SerDes autonegotiation
To:     Raag Jadav <raagjadav@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Steen Hegelund <steen.hegelund@microchip.com>,
        Bjarni Jonasson <bjarni.jonasson@microchip.com>
CC:     <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Kishon Vijay Abraham <kishon@ti.com>, <s-vadapalli@ti.com>
References: <1644043492-31307-1-git-send-email-raagjadav@gmail.com>
Content-Language: en-US
In-Reply-To: <1644043492-31307-1-git-send-email-raagjadav@gmail.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi All,

On 05/02/22 12:14, Raag Jadav wrote:
> Enable MAC SerDes autonegotiation to distinguish between
> 1000BASE-X, SGMII and QSGMII MAC.
> 
> Signed-off-by: Raag Jadav <raagjadav@gmail.com>
> ---
>   drivers/net/phy/mscc/mscc.h      |  2 ++
>   drivers/net/phy/mscc/mscc_main.c | 24 ++++++++++++++++++++++++
>   2 files changed, 26 insertions(+)
> 
> diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h
> index a50235f..366db14 100644
> --- a/drivers/net/phy/mscc/mscc.h
> +++ b/drivers/net/phy/mscc/mscc.h
> @@ -195,6 +195,8 @@ enum rgmii_clock_delay {
>   #define MSCC_PHY_EXTENDED_INT_MS_EGR	  BIT(9)
>   
>   /* Extended Page 3 Registers */
> +#define MSCC_PHY_SERDES_PCS_CTRL	  16
> +#define MSCC_PHY_SERDES_ANEG		  BIT(7)
>   #define MSCC_PHY_SERDES_TX_VALID_CNT	  21
>   #define MSCC_PHY_SERDES_TX_CRC_ERR_CNT	  22
>   #define MSCC_PHY_SERDES_RX_VALID_CNT	  28
> diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
> index ebfeeb3..6db43a5 100644
> --- a/drivers/net/phy/mscc/mscc_main.c
> +++ b/drivers/net/phy/mscc/mscc_main.c
> @@ -1685,6 +1685,25 @@ static int vsc8574_config_host_serdes(struct phy_device *phydev)
>   			   PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_1000BASE_X);
>   }
>   
> +static int vsc85xx_config_inband_aneg(struct phy_device *phydev, bool enabled)
> +{
> +	int rc;
> +	u16 reg_val = 0;
> +
> +	if (enabled)
> +		reg_val = MSCC_PHY_SERDES_ANEG;
> +
> +	mutex_lock(&phydev->lock);
> +
> +	rc = phy_modify_paged(phydev, MSCC_PHY_PAGE_EXTENDED_3,
> +			      MSCC_PHY_SERDES_PCS_CTRL, MSCC_PHY_SERDES_ANEG,
> +			      reg_val);
> +
> +	mutex_unlock(&phydev->lock);
> +
> +	return rc;
> +}
> +
>   static int vsc8584_config_init(struct phy_device *phydev)
>   {
>   	struct vsc8531_private *vsc8531 = phydev->priv;
> @@ -1772,6 +1791,11 @@ static int vsc8584_config_init(struct phy_device *phydev)
>   					      VSC8572_RGMII_TX_DELAY_MASK);
>   		if (ret)
>   			return ret;
> +	} else {
> +		/* Enable clause 37 */
> +		ret = vsc85xx_config_inband_aneg(phydev, true);
> +		if (ret)
> +			return ret;
>   	}
>   
>   	ret = genphy_soft_reset(phydev);

The same auto-negotiation configuration is also required for VSC8514.
The following patch is required to get Ethernet working with the Quad
port Ethernet Add-On card (QSGMII mode) connected to Texas Instruments
J7 common processor board.

Let me know if I should send it as a separate patch.

Thanks and Regards,
Siddharth Vadapalli.

8<------------------SNIP----------------------------

 From 2ab92251ba7a09bc97476cef6c760beefb0d3cae Mon Sep 17 00:00:00 2001
From: Siddharth Vadapalli <s-vadapalli@ti.com>
Date: Thu, 17 Feb 2022 15:45:20 +0530
Subject: [PATCH] net: phy: mscc: Add auto-negotiation feature to VSC8514

Auto-negotiation is currently enabled for VSC8584. It is also required
for VSC8514. Invoke the vsc85xx_config_inband_aneg() function from the
vsc8514_config_init() function present in mscc_main.c to start the
auto-negotiation process. This is required to get Ethernet working with
the Quad port Ethernet Add-On card (QSGMII mode) connected to Texas
Instruments J7 common processor board.

Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
---
  drivers/net/phy/mscc/mscc_main.c | 5 +++++
  1 file changed, 5 insertions(+)

diff --git a/drivers/net/phy/mscc/mscc_main.c 
b/drivers/net/phy/mscc/mscc_main.c
index 6db43a5c3b5e..b9a5662e7934 100644
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
@@ -2119,6 +2119,11 @@ static int vsc8514_config_init(struct phy_device 
*phydev)

  	ret = genphy_soft_reset(phydev);

+	if (ret)
+		return ret;
+
+	ret = vsc85xx_config_inband_aneg(phydev, true);
+
  	if (ret)
  		return ret;