From nobody Fri Oct 23 22:02:08 2026 X-Original-To: dev-commits-src-main@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 4jBH74672sz6wX9g for ; Fri, 23 Oct 2026 22:02:08 +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 4jBH745Y3Gz3CDC for ; Fri, 23 Oct 2026 22:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792792928; 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=l6U1IVeO8cG1SJ2ivAwqDG8/g1BnF5HEct1HozJC0RI=; b=G7brzQf1CEBNLAcInHTqOEOEP/5k5sKBGZR98IvZUsnojelV7IZ7QNofeb4BN2Km1EtSF1 4yFIVC7GCbnh3F5/2e7N6D9u637fWD/hTa47O9qTLly6+BfdRB24cDbVu5kgGc63P01LV+ eeEwPdmS8tWrOjVwfvMBTACfybunmNzB6QRmNDe7Xbio6eWkg3oR1RGzlYQbni/uX8vL8n UHkL2E2HerfJZ54C2OkOCV+IXX+kqujelsvbL8FwUTaFniTYLooe1BEnLbqYKVrBLNHCRH KEhXF42kiVgn9DGMpZgh1QnleqDuxJPsY5Wn7BB836oQcjRqIYJkIOwFyQLS/A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792792928; b=RE00YAKBS9uK604Ud812ENtE4iwZzxSRrmGXcTk39kKmS7EIoKn4PzzhwLJ7OOZ68i4+UR fU13yrdqy77uoz/ESXEwj/I+bMRDXEwnpqEz171TqeXl1v81NrySE1UStdOKNPcslqmk0G wm7cEtqVAFI9WbBMKJZ4AE5IuQUisWm1L7nxrr+6KQfSq4htyPBhE6jzT+m2fUJajwLUi5 o7QuwU/lPP4akMIRAPy5KGLSPaMxjDWzocFpD+IF0jA3yufAcAlAygKVMcmblu60X/d1Zs HrTJL+1p47HmhK8ijYMmXMtu87r55U/JTOXsrE1ZzwlOilIvCiLCshLjBL0vgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792792928; 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=l6U1IVeO8cG1SJ2ivAwqDG8/g1BnF5HEct1HozJC0RI=; b=NmsHHFTkMrXbmM1x7w+3Y3w9Kkw1Tz0hQNx0qdajCR+gVnttGuKSg0b6OFRQzrpDmcB+9p tvIsERBm8OhqNaJPLsxdM+qqIFBgWZR4CrkICnWMIDq2bLm8yxKKuWuyEmz1apVfJx0e1g Edwp4hvWjVfN/BgMahCJmzKb06bJFjVN1zV4cCj9q/QwjPpTah7KJ7uvWNCzT7uXaxouDB 7cxxM9h18tZntCVtjZcDvJx72tmaJeNt21D6Rl421G3xnqgEq//boFmG1zblbo7BUAwgBE BUBn6UzU6IkfoiPfnkRzIeCRCjS/qQ++PgJPl4/e4kyvTQ7eDXS8IERP5TG41g== 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 4jBH744vhbzprB for ; Fri, 23 Oct 2026 22:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f193 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 22:02:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 10ceddaa94d5 - main - smsc: Use read-modify-write to configure LEDs List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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: 10ceddaa94d5b234dde897a3eb90ca57700636d8 Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 22:02:08 +0000 Message-Id: <6adbd960.3f193.2621a7e9@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10ceddaa94d5b234dde897a3eb90ca57700636d8 commit 10ceddaa94d5b234dde897a3eb90ca57700636d8 Author: Ed Maste AuthorDate: 2026-10-16 17:52:04 +0000 Commit: Ed Maste CommitDate: 2026-10-23 22:01:59 +0000 smsc: Use read-modify-write to configure LEDs After reset the driver enables three LED outputs by writing 1s to the appropriate GPIO/LED configuration bits in the LED & GPIO configuration register LED_GPIO_CFG. The LED Select (LED_SEL) bit in LED_GPIO_CFG chooses between two LED modes: 0: Speed, Link+Activity, Full Duplex 1: Speed, Link, Activity If an EEPROM is present LED_SEL is initialized from bit 1 in the EEPROM's configuration flags value. If no EEPROM is present this bit defaults to zero. Previously we wrote to all bits in the register, clearing LED_SEL. A device with LED_SEL set by the EEPROM would thus not have correct LEDs. Now we read the current value of LED_GPIO_CFG and just set the three LED configuration bits, as Linux does in commit 52a2f0608366 ("net: usb: smsc95xx: fix changing LED_SEL bit value updated from EEPROM"). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60828 --- sys/dev/usb/net/if_smsc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 3144eb7e8917..f1e1c0d58961 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1429,7 +1429,9 @@ smsc_chip_init(struct smsc_softc *sc) (sc->sc_rev_id & SMSC_ID_REV_CHIP_REV_MASK)); /* GPIO/LED setup */ - reg_val = SMSC_LED_GPIO_CFG_SPD_LED | SMSC_LED_GPIO_CFG_LNK_LED | + if (smsc_read_reg(sc, SMSC_LED_GPIO_CFG, ®_val) < 0) + reg_val = 0; + reg_val |= SMSC_LED_GPIO_CFG_SPD_LED | SMSC_LED_GPIO_CFG_LNK_LED | SMSC_LED_GPIO_CFG_FDX_LED; smsc_write_reg(sc, SMSC_LED_GPIO_CFG, reg_val);