From nobody Tue Mar 29 23:00:03 2022 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 223E71A3520D; Tue, 29 Mar 2022 23:00:05 +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 4KSlQD1dfcz4Th0; Tue, 29 Mar 2022 23:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648594804; 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=AfmTkvKIScDPhmfUcRCzose+j9fiH7ky4oHMl2nQplw=; b=on34a61+BBqreNH547X7qZoiaGiNC0siuGV0fnVdtBjF0b4rSRZiL7vz3Qicy6LnVstd6O jBRHQ3KYifUGPYh+E+SijpoHSiS97/XnzDXpYhZi9ZjHshN44W5BIykkHUMi5TF0Eh/yuw Sj1u6IjyNOOCQKctjcSct1jRUC/95s8gGLqG15gOkeH3V7jjnQ8dmCUZMzfHXnyFszl2P3 9F4l0x4Nd8iKTaDVI0SLJyBE7SDMTQiWj955D4VlgmM/wnK6gqW1sybCISuxfthfZ0GBZb 2FkUN2bkyIA46Q+f/n0QhpTQMQSTVxON6bTwtFiAO/QNYgz0XTqZRPd5Kt0OKw== 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 ADC9B2788B; Tue, 29 Mar 2022 23:00:03 +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 22TN039t052996; Tue, 29 Mar 2022 23:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TN03NN052993; Tue, 29 Mar 2022 23:00:03 GMT (envelope-from git) Date: Tue, 29 Mar 2022 23:00:03 GMT Message-Id: <202203292300.22TN03NN052993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 992e326cd8cc - stable/13 - neta: split fixed and in-band link status configuration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 992e326cd8ccd6e1a8ec696db7902efd3021f7ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648594804; 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=AfmTkvKIScDPhmfUcRCzose+j9fiH7ky4oHMl2nQplw=; b=p+49LmlxytHsZNK2ENFgv5iZy3CqMIfmfQM9L2pGk2Vjf8CZrRSDsWCLrz8INVdHpkiNv/ qpNbQMDyQuXhUsBF3OGVS+M2bBGeuCr8GnoU85Y/g7lQuXX6T/uW6CB5/hmDgeOJpl9VdS Ttp61pBrbGWsXrJiQ8zgiteBGkTCgXKWTdGhIvFE8M0buOEmhd+4RRq/QUM3LLCfLvCwtH Lr9BT5ujZLHjkSk+3mK0wcl9iOumPpi7VCN9UDsUAeIztXNJ/kcOqcundSxxC/msbf2Bae oMuzqiw/TZNrzegFFZspv2tEcGmRt75yq1XLG2Cbo8IYa4BvKSUHizjFTvgL2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648594804; a=rsa-sha256; cv=none; b=tQfXu/ynFyNwuzesV01rexn+LjZLQGS1mmQvI4+dTzldg5QDZBVjTs9KxqF6wAu3oEtszj q+q3K7EwQmgIgMFPWWOIOOhbLgtADZzQdO+adeSY8jXeqrpIfmVuzxL/YV11boMHKtlETI dItEeRGdftlhVBM5Tm686paKty17UPIFhvdc05F+64qT8mVWTplkyKDIBn5kluaX5+9vWu l8f9sgnz+pk6nC0qwEPxElSC/RE5GCDyca7OS+bGiSTgcQ74H479ghspO6L42NAKQuqkO4 m47hnBPUGvoTf87BPp8xu+nnGvibdVoeerxaE2zkGinS0ZUT5ED4m/LTotv2Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=992e326cd8ccd6e1a8ec696db7902efd3021f7ae commit 992e326cd8ccd6e1a8ec696db7902efd3021f7ae Author: Sebastien Bini AuthorDate: 2022-03-22 15:44:09 +0000 Commit: Marcin Wojtas CommitDate: 2022-03-29 22:24:56 +0000 neta: split fixed and in-band link status configuration Fixed-link mode requires different handling than the in-band managed connection. Update interrupt, link-up/down and autonegotiation settings for the former. Reviewed by: mw MFC after: 1 week Obtained from: Stormshield Differential Revision: https://reviews.freebsd.org/D34394 (cherry picked from commit 231237bbb0e803f9047c235cd6b5878f70e6c5eb) --- sys/dev/neta/if_mvneta.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c index 8b9135419736..6035609976a6 100644 --- a/sys/dev/neta/if_mvneta.c +++ b/sys/dev/neta/if_mvneta.c @@ -1688,7 +1688,7 @@ mvneta_enable_intr(struct mvneta_softc *sc) reg |= MVNETA_PRXTXTI_PMISCICSUMMARY; MVNETA_WRITE(sc, MVNETA_PRXTXTIM, reg); - if (sc->use_inband_status) { + if (!sc->phy_attached || sc->use_inband_status) { /* Enable Port MISC Intr. (via RXTX_TH_Summary bit) */ MVNETA_WRITE(sc, MVNETA_PMIM, MVNETA_PMI_PHYSTATUSCHNG | MVNETA_PMI_LINKCHANGE | MVNETA_PMI_PSCSYNCCHANGE); @@ -1720,7 +1720,7 @@ mvneta_rxtxth_intr(void *arg) /* Ack maintance interrupt first */ if (__predict_false((ic & MVNETA_PRXTXTI_PMISCICSUMMARY) && - sc->use_inband_status)) { + (!sc->phy_attached || sc->use_inband_status))) { mvneta_sc_lock(sc); mvneta_misc_intr(sc); mvneta_sc_unlock(sc); @@ -2475,7 +2475,7 @@ mvneta_update_media(struct mvneta_softc *sc, int media) sc->autoneg = (IFM_SUBTYPE(media) == IFM_AUTO); - if (sc->use_inband_status) + if (!sc->phy_attached || sc->use_inband_status) mvneta_update_autoneg(sc, IFM_SUBTYPE(media) == IFM_AUTO); mvneta_update_eee(sc); @@ -2638,7 +2638,7 @@ mvneta_linkup(struct mvneta_softc *sc) KASSERT_SC_MTX(sc); - if (!sc->use_inband_status) { + if (!sc->phy_attached || !sc->use_inband_status) { reg = MVNETA_READ(sc, MVNETA_PANC); reg |= MVNETA_PANC_FORCELINKPASS; reg &= ~MVNETA_PANC_FORCELINKFAIL; @@ -2658,7 +2658,7 @@ mvneta_linkdown(struct mvneta_softc *sc) KASSERT_SC_MTX(sc); - if (!sc->use_inband_status) { + if (!sc->phy_attached || !sc->use_inband_status) { reg = MVNETA_READ(sc, MVNETA_PANC); reg &= ~MVNETA_PANC_FORCELINKPASS; reg |= MVNETA_PANC_FORCELINKFAIL;