From nobody Thu Nov 12 18:58:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQV5f64Jvz7156S for ; Thu, 12 Nov 2026 18:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQV5f5RJ4z4s8m for ; Thu, 12 Nov 2026 18:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794509894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1O+bQ5swfr6QptcsI+NbqHDuk9dlnzpVQ7ZRpD1EKI0=; b=Uwi4kcY5BfvDDkiMgE6BtXQjtJNE/dZwiS20giL++c8mQJCv9Kc6QO4otmjpV8mfjHdFRL S0oXn0bFgQjY55VQVRdT9uABheET4ypfKV0sQYXw0TfJoL8YyZJdkP5y3ZqXp89xrJfHhL GuworaQ6mhxf2IkHbgCzXNdIPIuf3ifrmklb2HrFnb7FyXWZzeITSCRdTl8o/fgIoSI73A GNC4mEf3MrHcDLbyJk/8FYkixqeZk1YQGuI/oyOr3FyqyChIpmZb6q44QTLuZV9NUNLkWL Ba1HSHqW1IFFlWIIbzZihNA3KRK2QCc0oJdyHkVNx9OeTMoThV2Y0JazGkqrLQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794509894; b=fduAZuWpkw8Eic+9zw2xSgzmpiNGcHzCiBSk+ICL0phy/9bg4ACFOugUxVTLNMzdFkYXpG In+ehstWFwSXEKPuT4+WEHothU5IQfb05kzgyQhaQQkmn9EVssDpKIihSLTfQGf95I2p6k 36ggajWe+SyX+TU254TE9Swsa1m693EhYlWCjtXwlIrxKoXEoKmBrPl0hGysNM37ZXoyZu 9Ms7cLAlG8FLsqkwEpivVscfG2uBwxukMi7Q7Dp8APiQ0Au+Oq6H1acSNbTAuNs8daeMsf tjGNnnifhpUE0+Bwwz/diW/lkuKOW5Nu/BjS6tBuPNePVpHe6piLy/dcISks7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794509894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1O+bQ5swfr6QptcsI+NbqHDuk9dlnzpVQ7ZRpD1EKI0=; b=rTCi+I449PuyUD7Jx6m1R3RTGIqntjk7Wbkj3rPlhOOvKG3LPk/QFpWvmdGlndvJm5JUGY g6kStIAqE65faMXCs9iDDXxu4NGibh1KuWapqRnVCMJajTEoagIKR9EYM2c6jGoPrNeAxn U7IbtvTOnRgLBaHD6i8B67NapK6n6ag8JlkbSmeUiLaBigFZ26ioXiYKHvmmyKXdvmc3Sa zWFuH0zzOmxh1QfdPGq8Q26l3IDEx+d7lpe94v+5yWgFQlRTPi3G9vXjA4gBSeiRMgKBU1 r7ZuBLz/RpsVETxaCGD2/80DOusyMBBLee45c/otVGS2XdzRYCZUYtZNr4/LTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQV5f55FHz1F7D for ; Thu, 12 Nov 2026 18:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1227d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 18:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f3ec447a1c06 - main - lan867xphy: Add silicon rev C2 configuration List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3ec447a1c0697f024dcf12929552e4ee9a420e0 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 18:58:14 +0000 Message-Id: <6af60c46.1227d.2f013aa6@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ec447a1c0697f024dcf12929552e4ee9a420e0 commit f3ec447a1c0697f024dcf12929552e4ee9a420e0 Author: Ed Maste AuthorDate: 2026-10-14 20:12:04 +0000 Commit: Ed Maste CommitDate: 2026-11-12 18:58:01 +0000 lan867xphy: Add silicon rev C2 configuration Rev C2 requires special configuration for "optimal performance" per Microchip AN1699: LAN8670/1/2 Configuration Application Note. Add MMD (MDIO Manageable Device) read/write helpers and an indirect read function for Microchip's proprietary register access mechanism, and use them to implement the register writes documented in Microchip's application note. It appears rev C1 may warrant the same configuration, based on the Linux driver, but it is not mentioned in the application note and I have not included it here. Reviewed by: kbowling Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61268 --- sys/dev/mii/lan867xphy.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 3 deletions(-) diff --git a/sys/dev/mii/lan867xphy.c b/sys/dev/mii/lan867xphy.c index cb86314fb1e8..10b9f341d507 100644 --- a/sys/dev/mii/lan867xphy.c +++ b/sys/dev/mii/lan867xphy.c @@ -10,10 +10,10 @@ * This driver is sufficient for basic connectivity with CSMA/CD. * * TODO: - * - Revision-specific configuration for C2 and D0 silicon + * - Revision-specific configuration for D0 silicon * - PHY-Level Collision Avoidance (PLCA) configuration * - Sleep mode (C2, D0 and later) - * - Topology discovry (D0 and later) + * - Topology discovery (D0 and later) * - Signal Quality Indicator (SQI) (C2, D0 and later) * - Cable fault diagnostics (C2 and later) * - Harness Defect Detection (D0 and later) @@ -29,10 +29,138 @@ #include #include +#include #include #include "miidevs.h" #include "miibus_if.h" +/* Indirect configuration parameter access (MMD 0x1F). */ +#define LAN867X_REG_CFGPARAM_ADDR 0x00d8 +#define LAN867X_REG_CFGPARAM_DATA 0x00d9 +#define LAN867X_REG_CFGPARAM_CTRL 0x00da +#define LAN867X_CFGPARAM_CTRL_READ 0x0002 + +/* Reset-complete status. */ +#define LAN867X_REG_STS2 0x0019 +#define LAN867X_STS2_RESETC 0x0800 + +#define LAN867X_MMD_VEND2 0x1f /* vendor-specific MMD 2 */ + +/* Silicon revisions. */ +#define LAN867X_REV_C2 5 + +struct lan867x_cfg_fixup { + uint16_t address; + uint16_t value; +}; + +/* + * MMD (MDIO Manageable Device) read/write helpers. + */ +static int +lan867xphy_mmd_read(struct mii_softc *sc, int devad, int reg) +{ + PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_ADDRESS | + (devad & MMDACR_DADDRMASK)); + PHY_WRITE(sc, MII_MMDAADR, reg); + PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_DATANPI | + (devad & MMDACR_DADDRMASK)); + return (PHY_READ(sc, MII_MMDAADR)); +} + +static void +lan867xphy_mmd_write(struct mii_softc *sc, int devad, int reg, int val) +{ + PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_ADDRESS | + (devad & MMDACR_DADDRMASK)); + PHY_WRITE(sc, MII_MMDAADR, reg); + PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_DATANPI | + (devad & MMDACR_DADDRMASK)); + PHY_WRITE(sc, MII_MMDAADR, val); +} + +/* + * Microchip Indirect Read - proprietary access mechanism via Vendor specific 2 + * MMD 0x1F. + */ +static uint8_t +lan867xphy_indirect_read(struct mii_softc *sc, uint8_t addr, uint8_t mask) +{ + lan867xphy_mmd_write(sc, LAN867X_MMD_VEND2, LAN867X_REG_CFGPARAM_ADDR, + addr); + lan867xphy_mmd_write(sc, LAN867X_MMD_VEND2, LAN867X_REG_CFGPARAM_CTRL, + LAN867X_CFGPARAM_CTRL_READ); + return (lan867xphy_mmd_read(sc, LAN867X_MMD_VEND2, + LAN867X_REG_CFGPARAM_DATA) & mask); +} + +/* + * Hardware revision C2 configuration parameters. + * + * From Microchip AN1699 LAN8670/1/2 Configuration Application Note + * (Revision G, October 2025). + * + * Registers 0x0084 (cfgparam1) and 0x008a (cfgparam2) require computed values, + * and are written between two blocks of constants. + */ +static const struct lan867x_cfg_fixup lan867x_cfgdata_revc_part1[] = { + { 0x00d0, 0x3f31 }, + { 0x00e0, 0xc000 }, +}; + +static const struct lan867x_cfg_fixup lan867x_cfgdata_revc_part2[] = { + { 0x00e9, 0x9e50 }, + { 0x00f5, 0x1cf8 }, + { 0x00f4, 0xc020 }, + { 0x00f8, 0xb900 }, + { 0x00f9, 0x4e53 }, + { 0x0081, 0x0080 }, + { 0x0091, 0x9660 }, +}; + +static void +lan867xphy_config(struct mii_softc *sc, const struct lan867x_cfg_fixup *fixup, + size_t len) +{ + size_t i; + + for (i = 0; i < len; i++) { + lan867xphy_mmd_write(sc, LAN867X_MMD_VEND2, fixup[i].address, + fixup[i].value); + } +} + +static void +lan867xphy_config_revc(struct mii_softc *sc) +{ + uint16_t cfgparam1, cfgparam2; + uint8_t value1, value2; + int8_t offset1, offset2; + + value1 = lan867xphy_indirect_read(sc, 0x04, 0x1f); + if ((value1 & 0x10) != 0) + offset1 = (int8_t)(value1 - 0x20); + else + offset1 = (int8_t)value1; + + value2 = lan867xphy_indirect_read(sc, 0x08, 0x1f); + if ((value2 & 0x10) != 0) + offset2 = (int8_t)(value2 - 0x20); + else + offset2 = (int8_t)value2; + + cfgparam1 = (uint16_t)(((9 + offset1) & 0x3f) << 10) | + (uint16_t)(((14 + offset1) & 0x3f) << 4) | 0x03; + cfgparam2 = (uint16_t)(((40 + offset2) & 0x3f) << 10); + + lan867xphy_config(sc, lan867x_cfgdata_revc_part1, + nitems(lan867x_cfgdata_revc_part1)); + lan867xphy_mmd_write(sc, LAN867X_MMD_VEND2, 0x0084, cfgparam1); + lan867xphy_mmd_write(sc, LAN867X_MMD_VEND2, 0x008a, cfgparam2); + lan867xphy_config(sc, lan867x_cfgdata_revc_part2, + nitems(lan867x_cfgdata_revc_part2)); +} + static int lan867x_probe(device_t); static int lan867x_attach(device_t); @@ -45,10 +173,44 @@ static const struct mii_phydesc lan867xphys[] = { MII_PHY_END }; +static bool +lan867xphy_wait_reset(struct mii_softc *sc) +{ + size_t i; + int sts2; + + for (i = 0; i < 100; i++) { + sts2 = lan867xphy_mmd_read(sc, LAN867X_MMD_VEND2, + LAN867X_REG_STS2); + if ((sts2 & LAN867X_STS2_RESETC) != 0) + return (true); + DELAY(10); + } + device_printf(sc->mii_dev, "reset did not complete (STS2 0x%04x)\n", + sts2); + return (false); +} + +static void +lan867xphy_reset(struct mii_softc *sc) +{ + mii_phy_reset(sc); + if (!lan867xphy_wait_reset(sc)) + return; + + switch (sc->mii_mpd_rev) { + case LAN867X_REV_C2: + lan867xphy_config_revc(sc); + break; + } + + /* XXX apply PLCA settings */ +} + static const struct mii_phy_funcs lan867xphy_funcs = { lan867xphy_service, lan867xphy_status, - mii_phy_reset, + lan867xphy_reset, }; static int @@ -83,6 +245,14 @@ lan867x_attach(device_t dev) mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE, &lan867xphy_funcs, 0); + switch (sc->mii_mpd_rev) { + case LAN867X_REV_C2: + break; + default: + device_printf(dev, + "no revision-specific configuration for rev %d\n", + sc->mii_mpd_rev); + } PHY_RESET(sc); /* PHY supports 10BASE-T1S only, no negotiation. */