From nobody Mon Apr 25 01:59:50 2022 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 47A8D199126C; Mon, 25 Apr 2022 01:59:51 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kmp9g1Vy9z3vQ0; Mon, 25 Apr 2022 01:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650851991; 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=L2RpmzauQVcw1MHgO+7oI1Pn77zk8a07q0cBmSvCz6E=; b=RtVcXUw7rlglEFFAqBMyj8RimqTgolNIclfG7QzAjx2YXfrapRphQNNQ8mgNOy1UzG8NEM bKkqrmEasoJvbVO/mbFmYti889HjyrIyWoAjj8Ux3mxVcHZEMv1oy7VTFMZLwOcsgqQx8y NluBDuFX2h2YBQwbhkMJxYEq3FFFOkvELXroWbu2OW+UlZoW/17gH1lth47gay1yYNvFGZ RAFajYFvbLiOg2o7FJVVLW3MMnfynz6RR9dWJAKY4/7+U1TFvLz/y/LzuynkyyDVXpMOfC V+28fQB8LdE1bbc233b9ZQCe223o2/2QSRJFbBaUdkc0oQpXudQzMxrK8E3b8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1309911E53; Mon, 25 Apr 2022 01:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23P1xoep021564; Mon, 25 Apr 2022 01:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23P1xoew021563; Mon, 25 Apr 2022 01:59:50 GMT (envelope-from git) Date: Mon, 25 Apr 2022 01:59:50 GMT Message-Id: <202204250159.23P1xoew021563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Lo Subject: git: 8f216d282c3d - main - Restore original MDC speed control register value after MAC reset, if it wasn't default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevlo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f216d282c3d874bd0f73f55a2801b9d15451213 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650851991; 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=L2RpmzauQVcw1MHgO+7oI1Pn77zk8a07q0cBmSvCz6E=; b=HnpWbfIiE/IOJYiP83+Gi50vdQ/5j4SYWBObFTXDkyDc0ZbKrMEAEq8hQsmYxRGyvu9q4+ Swrom1+E/XIZepmlayBI1sdlVNxLGWUT1BUBzI/nWBvt1gVMTzbrbWFwo3U6KJqeBSZgKK YsUVaCMzdMA5SLBPqNewH0KiFVk7Zi90tzxT4hLrSUzN1Gpw6xDJGjGbK33smFe0sUUQ2r hrkbT+smv9y1cSBH49+XTK/R2dzIa/iseX9dwswflC4VxPPM08D7+T7CjHxiY0b3L5EhiZ U7iVDNsw0tiaEC+8aTMgmS6FLDa+7LXkNy+JAD07Y9B7RJJkmJZbV+oHGg7mqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650851991; a=rsa-sha256; cv=none; b=omlRUJ/0J6nOHSsW/WsmLtDKCoMmiwsB90KremUr+wZFmC7fghLj/DBnw+xkFfVpuwbCQ4 yShgbvSOg8hBqawqlbffNYfn9qZmPx/dlcR9lLCBjHJRLQR2aaxZclXwRQwf0eeYx9vRDF JFJFQK6nmFKohgMBmon/ZCxkBSp+jbRXEIVK72uYy7wqqgOpHGwv7zGvUs5YE60DI5uITa 5VHIIZvEOZrm8LS9nQ6LYeaC7jzMBcVDLq/OMA6Y8OSTuZSa8opQ1oQC35DJY12p5FOCzl NBPDxLsvBK8oG22q94igYdYD3g6V9RkApQ5kjttmpE1k4W2wnuuvDE1v6Y6HGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevlo: URL: https://cgit.FreeBSD.org/src/commit/?id=8f216d282c3d874bd0f73f55a2801b9d15451213 commit 8f216d282c3d874bd0f73f55a2801b9d15451213 Author: Kevin Lo AuthorDate: 2022-04-25 01:56:20 +0000 Commit: Kevin Lo CommitDate: 2022-04-25 01:56:20 +0000 Restore original MDC speed control register value after MAC reset, if it wasn't default Since vte_reset changes register value to MDCSC_DEFAULT value, which may not be the original value, thus causing some phy registers read failures. Restoring VTE_MDCSC value to original after reset solves the link state flapping issue. Thanks to jhb ("the code looks ok") for his review. Reviewed by: jhb Obtained from: NetBSD via Andrius V Differential Revision: https://reviews.freebsd.org/D34956 --- sys/dev/vte/if_vte.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c index b6bf909037e1..98e5a14e1399 100644 --- a/sys/dev/vte/if_vte.c +++ b/sys/dev/vte/if_vte.c @@ -1605,9 +1605,10 @@ vte_tick(void *arg) static void vte_reset(struct vte_softc *sc) { - uint16_t mcr; + uint16_t mcr, mdcsc; int i; + mdcsc = CSR_READ_2(sc, VTE_MDCSC); mcr = CSR_READ_2(sc, VTE_MCR1); CSR_WRITE_2(sc, VTE_MCR1, mcr | MCR1_MAC_RESET); for (i = VTE_RESET_TIMEOUT; i > 0; i--) { @@ -1625,6 +1626,14 @@ vte_reset(struct vte_softc *sc) CSR_WRITE_2(sc, VTE_MACSM, 0x0002); CSR_WRITE_2(sc, VTE_MACSM, 0); DELAY(5000); + + /* + * On some SoCs (like Vortex86DX3) MDC speed control register value + * needs to be restored to original value instead of default one, + * otherwise some PHY registers may fail to be read. + */ + if (mdcsc != MDCSC_DEFAULT) + CSR_WRITE_2(sc, VTE_MDCSC, mdcsc); } static void