Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     "Russell King (Oracle)" <linux@armlinux.org.uk>
CC:     Wong Vee Khee <vee.khee.wong@linux.intel.com>,
        "David S . Miller" <davem@davemloft.net>,
        Jose Abreu <Jose.Abreu@synopsys.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Jakub Kicinski <kuba@kernel.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Wong Vee Khee <veekhee@gmail.com>
Subject: Re: [PATCH net v3 1/1] net: pcs: xpcs: fix incorrect CL37 AN sequence
Thread-Topic: [PATCH net v3 1/1] net: pcs: xpcs: fix incorrect CL37 AN
 sequence
Thread-Index: AQHXtbUKKyhIRXal/0mOmtJkI1WPdqu8TpGAgAD6HoCAAKFlAIAABCSA
Date:   Fri, 1 Oct 2021 10:12:20 +0000
Message-ID: <20211001101219.g5llt6biexzij7ev@skbuf>
References: <20210930044421.1309538-1-vee.khee.wong@linux.intel.com>
 <YVWCV1Vaq5SAJflX@shell.armlinux.org.uk>
 <20211001001951.erebmghjsewuk3lh@skbuf>
 <YVbbitGJDZhd6eW/@shell.armlinux.org.uk>
In-Reply-To: <YVbbitGJDZhd6eW/@shell.armlinux.org.uk>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?5yUXYPQBmgXKeYCXsvgee5ax23Pi5GetPhQoCJrhLtIhDdZPBtxrBhTZ96IL?=
 =?us-ascii?Q?3bSi1e5ZvrrhrDFyTzrSJZ2hkkCu3n7LGcTVuvuXCzC+tQjHqCx8jt+W9diM?=
 =?us-ascii?Q?Hp1wAsJQOgd3sdf7UoLRcLSOzjaYfyQfB5m76ZotGrmh9hLuJJbuCEZ9dPd1?=
 =?us-ascii?Q?WGwMxBZ8aNN8G/nZVDDc8u3PdTodpKEppviPNX2tPrJZ2SPc8MniRBRkWuom?=
 =?us-ascii?Q?fK8+Dnfc61gYA0+6+N9EkUYQFi7QtR1nUlyrPE2XABJ2xxCbLrdRhhpkw5a3?=
 =?us-ascii?Q?JoTk7YoF/eFBf1u8P/HzC1/O478xRoiK45eFNnrPokqI84LfFOY538e0zVH8?=
 =?us-ascii?Q?nGExoV1YnDh014qxK4/K3Sw5qzapga+nOencsgkKoyRy9cRUSL/+3N71zRv9?=
 =?us-ascii?Q?VtrYJHfNKGqmmZrSiRb4Ak3JwJ50rmngTYvCJ38As/43ynqFH8W+uKc6uZJo?=
 =?us-ascii?Q?wpMg4FkIHD8noW12pxnNo6zPtmu1d18atGtQmXXTBQGAntDKVk5o3cUsalR5?=
 =?us-ascii?Q?Ee9G1QFa/C27yc0wWD71hTq7HL3XCjr6IOBddm2GtElUSjGNab16oN8aYtUc?=
 =?us-ascii?Q?dwQzt1xeyOSWRyAj6mg6KqHzXgyT3R8hc3juipdEKeaU9JX9c0ngv9GOC64O?=
 =?us-ascii?Q?KqJT1WhWHiLBVmV54GbIx2E/VV5ZHQ8u7GV57m/0fEVEJ3m8aXFlL7Z8LWcL?=
 =?us-ascii?Q?KrS3fQvOKPfPf2FbM3augpGV43FuIvwSxncUJ0i9hAtqZYWAExCUGPAt1fZi?=
 =?us-ascii?Q?ID+Nk0eLxeRqID7lA8tv/lRvYKp4vWxj+UaUjsfAGNqHCK5MRMdFb7ggcwO5?=
 =?us-ascii?Q?aQy9feOVPKgdYZVkRNRCd1K32ohayOZ1qIKX6GzD+qC2zpSUssvF9v58p+Ry?=
 =?us-ascii?Q?MNSM4Vjk2e09gxKZmVhogyz2I/Mft2ZsilCQWj0g3eZiI4AJ9ckdaCUw1n0C?=
 =?us-ascii?Q?iN1suoRE+9r5F4Qrb3rzzB5rC6ISwqeEYItkFtwJjPoFEk4FUs8VAkn0Sa3K?=
 =?us-ascii?Q?jLnZnaAdtUpBG3djxZkAvqzH9uXCO2hQUFj/EyDyhP/F0yx0PNUhgOLtgZtp?=
 =?us-ascii?Q?KVchYW6+OqVuoFJPwB+FeHfQZWGAPFCOJjZ1ZAjbxyv5fQowB5FHDCgndkbx?=
 =?us-ascii?Q?koZnbs0LqkpVKCzdz3LyLaeytjIvCi5gKaCAiJzTWf9hJIUWrXzuFSLCy1Dx?=
 =?us-ascii?Q?f57xCj2CcqipTUMRnJd7TgGAzt1Ue8iB7p5t1CoM/3wykTYNj3LPcLBrsaej?=
 =?us-ascii?Q?K+OMfo6WTehqIz5Au+4/URlKtSVh2jSC0+PePuOLCZAGrz6Ve8u2Y1OZVy/D?=
 =?us-ascii?Q?CPghB96KrEU2QhWtqXPWah2B?=
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="us-ascii"
Content-ID: <1C36FCA2DCF2E74A819066A53223510B@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 892c746c-ecae-4e00-6076-08d984c3f455
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Oct 2021 10:12:20.0791
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: ms8BpaoCmH6VALZ9zEcKzS+C0GHIPNFRvJfYPN/sdlGJApz8QTzEHW2W4IZlm6su5hUe3YhQ08mb4Ov/RgdH9A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2687
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Oct 01, 2021 at 10:57:30AM +0100, Russell King (Oracle) wrote:
> On Fri, Oct 01, 2021 at 12:19:52AM +0000, Vladimir Oltean wrote:
> > static int xpcs_config_aneg_c37_sgmii(struct dw_xpcs *xpcs, unsigned in=
t mode)
> > {
> > 	int ret, mdio_ctrl1, old_an_ctrl, an_ctrl, old_dig_ctrl1, dig_ctrl1;
> >=20
> > 	/* Disable SGMII AN in case it is already enabled */
> > 	mdio_ctrl1 =3D xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_CTRL);
> > 	if (mdio_ctrl1 < 0)
> > 		return mdio_ctrl1;
> >=20
> > 	if (mdio_ctrl1 & AN_CL37_EN) {
> > 		ret =3D xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_CTRL,
> > 				 mdio_ctrl1 & ~AN_CL37_EN);
> > 		if (ret < 0)
> > 			return ret;
> > 	}
>=20
> This is fine...
>=20
> > 	if (!(mdio_ctrl1 & AN_CL37_EN) && phylink_autoneg_inband(mode)) {
> > 		ret =3D xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_CTRL,
> > 				 mdio_ctrl1 | AN_CL37_EN);
> > 		if (ret)
> > 			return ret;
> > 	}
>=20
> This is not. If the control register had AN_CL37_EN set initially, then
> in the first test above, we clear the bit. However, mdio_ctrl1 will
> still contain the bit set. When we get here, we will skip setting the
> register bit back to one even if in-band mode was requested.
>=20
> As I said in a previous email, at this point there is no reason to check
> the previous state, because if it was set on entry, we will have cleared
> it, so the register state at this point has the bit clear no matter
> what. If we need to set it, then we /always/ need to write it here - it
> doesn't matter what the initial state was.

Correct, it should have been:

	if (phylink_autoneg_inband(mode)) {
		ret =3D xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_CTRL,
				 mdio_ctrl1 | AN_CL37_EN);
		if (ret)
			return ret;
	}

For the record, just in case this code gets copied anywhere, there's
another mistake in my placement of one of the comments.

	/* If using in-band autoneg, enable automatic speed/duplex mode change
	 * by HW after SGMII AN complete.
	 * 5) VR_MII_MMD_CTRL Bit(12) [AN_ENABLE] =3D 1b (Enable SGMII AN)        =
    <- this part of the comment
	 */
	old_dig_ctrl1 =3D xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_DIG_CTRL1);
	if (old_dig_ctrl1 < 0)
		return old_dig_ctrl1;

really belongs here:

	/* If using SGMII AN, enable it here */
	if (phylink_autoneg_inband(mode)) {
		ret =3D xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_CTRL,
				 mdio_ctrl1 | AN_CL37_EN);
		if (ret)
			return ret;
	}=