net: phy: nxp-c45-tja11xx: add TJA112X PHY configuration errata

commit a07364b394697d2e0baffeb517f41385259aa484 upstream.

The most recent sillicon versions of TJA1120 and TJA1121 can achieve
full silicon performance by putting the PHY in managed mode.

It is necessary to apply these PHY writes before link gets established.
Application of this fix is required after restart of device and wakeup
from sleep.

Cc: stable@vger.kernel.org
Fixes: f1fe5dff2b8a ("net: phy: nxp-c45-tja11xx: add TJA1120 support")
Signed-off-by: Andrei Botila <andrei.botila@oss.nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250304160619.181046-2-andrei.botila@oss.nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c
index ae43103c76cbd8f426cb723ce951724266c38731..624ea863e7beb014b51da57fb251738a7436263f 100644 (file)
--- a/drivers/net/phy/nxp-c45-tja11xx.c
+++ b/drivers/net/phy/nxp-c45-tja11xx.c
@@ -21,6 +21,11 @@
 #define PHY_ID_TJA_1103                        0x001BB010
 #define PHY_ID_TJA_1120                        0x001BB031
 
+#define VEND1_DEVICE_ID3               0x0004
+#define TJA1120_DEV_ID3_SILICON_VERSION        GENMASK(15, 12)
+#define TJA1120_DEV_ID3_SAMPLE_TYPE    GENMASK(11, 8)
+#define DEVICE_ID3_SAMPLE_TYPE_R       0x9
+
 #define VEND1_DEVICE_CONTROL           0x0040
 #define DEVICE_CONTROL_RESET           BIT(15)
 #define DEVICE_CONTROL_CONFIG_GLOBAL_EN        BIT(14)
@@ -1583,6 +1588,50 @@ static int nxp_c45_set_phy_mode(struct phy_device *phydev)
        return 0;
 }
 
+/* Errata: ES_TJA1120 and ES_TJA1121 Rev. 1.0 — 28 November 2024 Section 3.1 */
+static void nxp_c45_tja1120_errata(struct phy_device *phydev)
+{
+       int silicon_version, sample_type;
+       bool macsec_ability;
+       int phy_abilities;
+       int ret = 0;
+
+       ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_DEVICE_ID3);
+       if (ret < 0)
+               return;
+
+       sample_type = FIELD_GET(TJA1120_DEV_ID3_SAMPLE_TYPE, ret);
+       if (sample_type != DEVICE_ID3_SAMPLE_TYPE_R)
+               return;
+
+       silicon_version = FIELD_GET(TJA1120_DEV_ID3_SILICON_VERSION, ret);
+
+       phy_abilities = phy_read_mmd(phydev, MDIO_MMD_VEND1,
+                                    VEND1_PORT_ABILITIES);
+       macsec_ability = !!(phy_abilities & MACSEC_ABILITY);
+       if ((!macsec_ability && silicon_version == 2) ||
+           (macsec_ability && silicon_version == 1)) {
+               /* TJA1120/TJA1121 PHY configuration errata workaround.
+                * Apply PHY writes sequence before link up.
+                */
+               if (!macsec_ability) {
+                       phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x4b95);
+                       phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0xf3cd);
+               } else {
+                       phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x89c7);
+                       phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0x0893);
+               }
+
+               phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x0476, 0x58a0);
+
+               phy_write_mmd(phydev, MDIO_MMD_PMAPMD, 0x8921, 0xa3a);
+               phy_write_mmd(phydev, MDIO_MMD_PMAPMD, 0x89F1, 0x16c1);
+
+               phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 0x0);
+               phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 0x0);
+       }
+}
+
 static int nxp_c45_config_init(struct phy_device *phydev)
 {
        int ret;
@@ -1599,6 +1648,9 @@ static int nxp_c45_config_init(struct phy_device *phydev)
        phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F8, 1);
        phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x01F9, 2);
 
+       if (phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, GENMASK(31, 4)))
+               nxp_c45_tja1120_errata(phydev);
+
        phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, VEND1_PHY_CONFIG,
                         PHY_CONFIG_AUTO);