From owner-svn-src-all@freebsd.org Thu Dec 3 16:55:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 532294AA960; Thu, 3 Dec 2020 16:55:00 +0000 (UTC) (envelope-from adrian@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cn2501tKTz4Tcq; Thu, 3 Dec 2020 16:55:00 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 336501C762; Thu, 3 Dec 2020 16:55:00 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B3Gt0Am002809; Thu, 3 Dec 2020 16:55:00 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B3Gsx7j002768; Thu, 3 Dec 2020 16:54:59 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <202012031654.0B3Gsx7j002768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 3 Dec 2020 16:54:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368305 - head/sys/dev/axgbe X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/dev/axgbe X-SVN-Commit-Revision: 368305 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2020 16:55:00 -0000 Author: adrian Date: Thu Dec 3 16:54:59 2020 New Revision: 368305 URL: https://svnweb.freebsd.org/changeset/base/368305 Log: [axgbe] Fix compiler warnings in gcc-6.3; perhaps fix a PHY issue * uninitialised variable use * Using AXGBE_SET_ADV() where it was intended; using AXGBE_ADV() seems wrong and also causes a compiler warning. Reviewed by: rpokala Differential Revision: https://reviews.freebsd.org/D26839 Modified: head/sys/dev/axgbe/xgbe-dev.c head/sys/dev/axgbe/xgbe-mdio.c head/sys/dev/axgbe/xgbe-phy-v2.c Modified: head/sys/dev/axgbe/xgbe-dev.c ============================================================================== --- head/sys/dev/axgbe/xgbe-dev.c Thu Dec 3 15:55:07 2020 (r368304) +++ head/sys/dev/axgbe/xgbe-dev.c Thu Dec 3 16:54:59 2020 (r368305) @@ -1337,7 +1337,7 @@ xgbe_dev_read(struct xgbe_channel *channel) struct xgbe_ring_data *rdata; struct xgbe_ring_desc *rdesc; struct xgbe_packet_data *packet = &ring->packet_data; - unsigned int err, etlt, l34t; + unsigned int err, etlt, l34t = 0; axgbe_printf(1, "-->xgbe_dev_read: cur = %d\n", ring->cur); Modified: head/sys/dev/axgbe/xgbe-mdio.c ============================================================================== --- head/sys/dev/axgbe/xgbe-mdio.c Thu Dec 3 15:55:07 2020 (r368304) +++ head/sys/dev/axgbe/xgbe-mdio.c Thu Dec 3 16:54:59 2020 (r368305) @@ -1186,7 +1186,7 @@ static int __xgbe_phy_config_aneg(struct xgbe_prv_data *pdata, bool set_mode) { int ret; - unsigned int reg; + unsigned int reg = 0; sx_xlock(&pdata->an_mutex); Modified: head/sys/dev/axgbe/xgbe-phy-v2.c ============================================================================== --- head/sys/dev/axgbe/xgbe-phy-v2.c Thu Dec 3 15:55:07 2020 (r368304) +++ head/sys/dev/axgbe/xgbe-phy-v2.c Thu Dec 3 16:54:59 2020 (r368305) @@ -2706,7 +2706,7 @@ xgbe_upd_link(struct xgbe_prv_data *pdata) static int xgbe_phy_read_status(struct xgbe_prv_data *pdata) { - int common_adv_gb; + int common_adv_gb = 0; int common_adv; int lpagb = 0; int adv, lpa; @@ -2741,9 +2741,9 @@ xgbe_phy_read_status(struct xgbe_prv_data *pdata) } if (pdata->phy.supported == SUPPORTED_1000baseT_Half) - XGBE_ADV(&pdata->phy, 1000baseT_Half); + XGBE_SET_ADV(&pdata->phy, 1000baseT_Half); else if (pdata->phy.supported == SUPPORTED_1000baseT_Full) - XGBE_ADV(&pdata->phy, 1000baseT_Full); + XGBE_SET_ADV(&pdata->phy, 1000baseT_Full); common_adv_gb = lpagb & adv << 2; } @@ -2753,7 +2753,7 @@ xgbe_phy_read_status(struct xgbe_prv_data *pdata) return (lpa); if (pdata->phy.supported == SUPPORTED_Autoneg) - XGBE_ADV(&pdata->phy, Autoneg); + XGBE_SET_ADV(&pdata->phy, Autoneg); adv = xgbe_phy_mii_read(pdata, pdata->mdio_addr, MII_ANAR); if (adv < 0)