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;
Date:   Thu, 11 May 2023 16:00:37 +0200
From:   Simon Horman <simon.horman@corigine.com>
To:     Harini Katakam <harini.katakam@amd.com>
Cc:     andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk,
        davem@davemloft.net, kuba@kernel.org, edumazet@google.com,
        pabeni@redhat.com, vladimir.oltean@nxp.com,
        wsa+renesas@sang-engineering.com, mkl@pengutronix.de,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        harinikatakamlinux@gmail.com, michal.simek@amd.com,
        radhey.shyam.pandey@amd.com
Subject: Re: [PATCH net-next v3 2/3] phy: mscc: Add support for RGMII delay
 configuration
Message-ID: <ZFz1Bb8byoR1mQxH@corigine.com>
References: <20230511120808.28646-1-harini.katakam@amd.com>
 <20230511120808.28646-3-harini.katakam@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230511120808.28646-3-harini.katakam@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wiThRKD5Up2h3/k/0L6W0xS4XFVSSzlGf7kAqR08ZZf91wcI1p860g7WRsTo?=
 =?us-ascii?Q?rJEWi1v7AMXvbgS8R78RuVy3+JXw05fpUWXH0wLy1OP1rBSfDyGlPyaJjw2H?=
 =?us-ascii?Q?/HknvyQ/p9CyXU8DiMap/FLayiQZThAlazRw7nwRG0xvwU8xkeTcaaobp0Jv?=
 =?us-ascii?Q?4DWpiAiMcWgerfRVugt/uhNbccTO9+cM1zr5i2IJESvg/cD4iyU4BDNN1q0M?=
 =?us-ascii?Q?ACWgSkT0iOAx/UInAXqsp82BRk0aZkdJJU6sqMOt25zuTqWpGSjO6MxmAr3E?=
 =?us-ascii?Q?lDTpm0SC1ivc/0KLKdsEXAskhQCuCKtq6L+eE/aqSIvsf1wDJsglYroIJD01?=
 =?us-ascii?Q?AtDv2HmyiXmeqU3eF9zboNUodLarbkv1g4brb28h7VgQ2Jdjces4biTTKswe?=
 =?us-ascii?Q?347D9sy4vXeG64lG+VsBz0Ehmj1hVJsxlbl7mn0jI+gcVbNHfNEdZrhnBdT6?=
 =?us-ascii?Q?Wn+N1vOzoZ3SxwgHjSDzl1KidSfv384A0P8a+MdC3FwvsXkFNWLXD/1WvrzA?=
 =?us-ascii?Q?S5IDUrl3aTP24U9iZ0IzA4kedYVKBeG/KDjiUv295ezyLE2dLcMoX05cOU+z?=
 =?us-ascii?Q?V76aBEV4YOfcQjuSjXWlO8mum65IDoSVX2D5oyyKG5x1xsJMj9EmEuORv/te?=
 =?us-ascii?Q?ZjTIFfbglGGtgloYeTbH77bnPY8oKQQTPeAqwmR8AKU3hBEgV4ICH6Mg5K16?=
 =?us-ascii?Q?m9Fg+u15XV6PviT/ahvmX1LZJsKgHIojGsm3Ie9F+y0n8DlMR344z9jCGyTp?=
 =?us-ascii?Q?Z3xg9ei0Le+FZumrwU1Nh8rr6VENUe4f/afuG64/nLb+yLm9KApGtcTirTWH?=
 =?us-ascii?Q?6XuVhIAmPOIYRV+ax/ES+cosCMMx64eg2C3Kaf9MjkArhd/nf+EDWggbEKVH?=
 =?us-ascii?Q?w1dyrgjkO+XSb9WbIBlIHiLIyVQRMlEC07sUcnmDRB7oMJ5j8D/Sn63BQyLW?=
 =?us-ascii?Q?55FTcuWQr4xCFMMkqTLXaoT+Li49UzT5EbI4mp4fXbO/9V79/5RrWPpZZjz/?=
 =?us-ascii?Q?0P9xQWVXJ/GgKTmWcsvTgFhoDUTOaX6QfhXudHD15KoyjjWUEbdSRDiD1TG+?=
 =?us-ascii?Q?0T8sPVU0zKEGPSoTeXvKCpLvydit4sgKMJMZGdn4Dx83p7jbEPsl9+eKTam1?=
 =?us-ascii?Q?CnRKONN4eU9djfiVHCLN4hVXp4cBjnMXjRBWNL2ct0emetqeuAuUug6BZ4eA?=
 =?us-ascii?Q?Uwj3hiRqhgFDO21P8A38+6YwBckwZ7EmYZq8GO8nrYS/WSxtAf3uNNwLFWlZ?=
 =?us-ascii?Q?LNUJ/FxSduwXRBh0KdtN/1lun12bUT0aIR4XBt4FvRbemk3ygAINyGM7f6Av?=
 =?us-ascii?Q?z9sNGOHLKTNuwPqK5l81gqp6feXTRnS6P1F35nUXP3SbYjEt9vwGcjVszTZp?=
 =?us-ascii?Q?g4TuWACxBamz6IyUtqiOJ/s0LfKixstbK/DRXce+cscAwzRmVp/QKchZPo2q?=
 =?us-ascii?Q?emLLRZ8bsHyHn555Q9uCJvtqQLshnQ9baYqdnhXLqZRkWbyOVHFmGKfRr0W2?=
 =?us-ascii?Q?sW8nccjqtnqOnL+eZSt4bLKeu/tTLguuzOdy4onSSZJPMgM27y4pa0R6m1yj?=
 =?us-ascii?Q?FcNIxkNAd+3I9f68gsQ/xePhUsisNujI4UKf5LRp7ma/Y63FOjtwPPFNjlG3?=
 =?us-ascii?Q?SR2VDT5ewsTPhP21BGa0XKjqm4keXP14Z2zO4yKuB2FUqkStP1UdIEkkc2lj?=
 =?us-ascii?Q?KYdjaw=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 507718f9-5a87-45b0-b3a4-08db52282d9e
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 14:01:12.2416
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Hz3CtzpR4VjzyCu+kkMi7GsCFPCzoVCM9QnBOQGL2SkJA7td7R+exwUI20HeSFmE9Y1kAJG+L6UdnccKxuKjJjRDGKBdg4JqGPA2oxqNnpM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5581
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, May 11, 2023 at 05:38:07PM +0530, Harini Katakam wrote:
> Add support for optional rx/tx-internal-delay-ps from devicetree.
> - When rx/tx-internal-delay-ps is/are specified, these take priority
> - When either is absent,
> 1) use 2ns for respective settings if rgmii-id/rxid/txid is/are present
> 2) use 0.2ns for respective settings if mode is rgmii
> 
> Signed-off-by: Harini Katakam <harini.katakam@amd.com>
> ---
> v3 - Patch split:
> - Use rx/tx-internal-delay-ps with phy_get_internal_delay
> - Change RGMII delay selection precedence
> - Update commit description and subject everywhere to say RGMII delays
> instead of RGMII tuning.
> 
>  drivers/net/phy/mscc/mscc.h      |  2 ++
>  drivers/net/phy/mscc/mscc_main.c | 35 +++++++++++++++++++++++++-------
>  2 files changed, 30 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h
> index 9acee8759105..ab6c0b7c2136 100644
> --- a/drivers/net/phy/mscc/mscc.h
> +++ b/drivers/net/phy/mscc/mscc.h
> @@ -374,6 +374,8 @@ struct vsc8531_private {
>  	 * package.
>  	 */
>  	unsigned int base_addr;
> +	u32 rx_delay;
> +	u32 tx_delay;

rx_delay and tx_delay are unsigned...

>  
>  #if IS_ENABLED(CONFIG_MACSEC)
>  	/* MACsec fields:
> diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
> index 91010524e03d..9e856231e464 100644
> --- a/drivers/net/phy/mscc/mscc_main.c
> +++ b/drivers/net/phy/mscc/mscc_main.c
> @@ -525,17 +525,14 @@ static int vsc85xx_rgmii_set_skews(struct phy_device *phydev, u32 rgmii_cntl,
>  {
>  	u16 rgmii_rx_delay_pos = ffs(rgmii_rx_delay_mask) - 1;
>  	u16 rgmii_tx_delay_pos = ffs(rgmii_tx_delay_mask) - 1;
> +	struct vsc8531_private *vsc8531 = phydev->priv;
>  	u16 reg_val = 0;
>  	int rc;
>  
>  	mutex_lock(&phydev->lock);
>  
> -	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID ||
> -	    phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
> -		reg_val |= RGMII_CLK_DELAY_2_0_NS << rgmii_rx_delay_pos;
> -	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID ||
> -	    phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
> -		reg_val |= RGMII_CLK_DELAY_2_0_NS << rgmii_tx_delay_pos;
> +	reg_val |= vsc8531->rx_delay << rgmii_rx_delay_pos;
> +	reg_val |= vsc8531->tx_delay << rgmii_tx_delay_pos;
>  
>  	rc = phy_modify_paged(phydev, MSCC_PHY_PAGE_EXTENDED_2,
>  			      rgmii_cntl,
> @@ -1808,10 +1805,34 @@ static irqreturn_t vsc8584_handle_interrupt(struct phy_device *phydev)
>  	return IRQ_HANDLED;
>  }
>  
> +static const int vsc8531_internal_delay[] = {200, 800, 1100, 1700, 2000, 2300,
> +					     2600, 3400};
>  static int vsc85xx_config_init(struct phy_device *phydev)
>  {
> -	int rc, i, phy_id;
> +	int delay_size = ARRAY_SIZE(vsc8531_internal_delay);
>  	struct vsc8531_private *vsc8531 = phydev->priv;
> +	struct device *dev = &phydev->mdio.dev;
> +	int rc, i, phy_id;
> +
> +	vsc8531->rx_delay = phy_get_internal_delay(phydev, dev, &vsc8531_internal_delay[0],
> +						   delay_size, true);

But phy_get_internal_delay a signed value.

> +	if (vsc8531->rx_delay < 0) {

This comparison can never be true due to the unsigned type of rx_delay.

> +		if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID ||
> +		    phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
> +			vsc8531->rx_delay = RGMII_CLK_DELAY_2_0_NS;
> +		else
> +			vsc8531->rx_delay = RGMII_CLK_DELAY_0_2_NS;
> +	}
> +
> +	vsc8531->tx_delay = phy_get_internal_delay(phydev, dev, &vsc8531_internal_delay[0],
> +						   delay_size, false);
> +	if (vsc8531->tx_delay < 0) {

Here too.

> +		if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID ||
> +		    phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
> +			vsc8531->rx_delay = RGMII_CLK_DELAY_2_0_NS;
> +		else
> +			vsc8531->rx_delay = RGMII_CLK_DELAY_0_2_NS;
> +	}
>  
>  	rc = vsc85xx_default_config(phydev);
>  	if (rc)

---
pw-bot: cr