From nobody Thu Aug 6 07:38:49 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 4hFzfy1FNNz6p2Lk for ; Thu, 06 Aug 2026 07:38:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFzfx3x8hz3DVq for ; Thu, 06 Aug 2026 07:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786001929; 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=56DMj0E14/ZnWU8qMaXcNPEMGlIOczQCWNebnsn9Z4Y=; b=A1pTQBFQEAFG2v3lOE6i7iR/Ekl2sRjyruKxZR+OtAL7dYK42iLj8fYVBWyyTZCpugrVg0 XqSHTRtFRTtE3BnQnuzLvCt/r6xyy6KvC2paBsxR91wgi5wWRUzLRDPsbD1n7Y9IBt0XPo 4iLjqx8M1cwMfTNHlEURE63Hv0q6/dz5tkKDx/93Y4yZ6BbfIwYdlkURKFnNbiPWsXtmLI i9o6q4PC8F7jUuUMnuIglrEiLCwVKttVuuqLaj+N66f2caP80zzlQOka6BxGDcj60AxkzU CHk4FTUbM2kIqv5HlXN+WUe+UQ1BQ8zyb8d2oG+Y4IBmHpo2ihXP/aNXEf5n3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786001929; a=rsa-sha256; cv=none; b=VUtOT8zPYjw4M3CLoX/2e9v3YjVB3Td86O+vxSLMALXZ+9qX/vSjhOQprtxVnJdeUZbdB4 PiqbRJTD5Jv8Qjyvc/MDogAcAX9tPGmLBYKCX3eLNUHuuUP44Gm7QSc5O23x2BEql3HqkC qzHJcVGz/lfw/l0bLPJ99jXFeVx5bhixTxhBJcwNJX3t66wADOYJr2YYCHr/1gXAnyeKOH oz2ryhP3tHLXaVp1XuUcZeR6+421rQ02Fr7JTI2dYnITsMFxfm/v2CPkXFJ8Vo9uuq805v w2tyjBzhIx4qmboVxWyX4gvAvLpVF5XeIUCLWS5dFbInhLF63+vaBPxsv9lK8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786001929; 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=56DMj0E14/ZnWU8qMaXcNPEMGlIOczQCWNebnsn9Z4Y=; b=gz23+AJRFn0jh3w4d3z1JrjYluafdtv1gyq8GcWlihWIfceqr3rRYoCPH19t8PIIQ9ppz4 CwbHbnzKiOg95A5jWbaighWA2Pl+1d0qroiZO5R42T36nqddMVD28g6AxevDcsblNrkI20 5nGIFmGMFyAR7BKCBDmT5XwEfQ2fJF/zQAJiFGANM7AESPEfNjNIB9WEpV/30iKW7auDOB JkO2HJI4Of+aCWjKKeN8WrWeXsn6AU8D+nzaP0Zivtoa6+tqPlbK4raqFLj9jDdpEmqvWD UD4g+ATCWJJw7y6FL6okNuEHm73Ix8udbDXZJ7ARuW2wraNJiASEPj8xbIkurQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFzfx2jwLz19fJ for ; Thu, 06 Aug 2026 07:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38485 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 07:38:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 908706b949b1 - stable/15 - igb: Reprogram descriptor queues while disabled 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 908706b949b10844e636013a2d10ccea46c290df Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 07:38:49 +0000 Message-Id: <6a743a09.38485.47ca23d2@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=908706b949b10844e636013a2d10ccea46c290df commit 908706b949b10844e636013a2d10ccea46c290df Author: Kevin Bowling AuthorDate: 2026-07-30 04:37:08 +0000 Commit: Kevin Bowling CommitDate: 2026-08-06 07:37:22 +0000 igb: Reprogram descriptor queues while disabled Disable each igb-class transmit and receive queue and flush before changing its descriptor-ring registers. Restore the head and tail indices that Intel documents as surviving a VF reset. Use the igb queue-enable control instead of programming legacy TXDCTL granularity, low-water, and reserved bits that do not belong to the 82575 and later. Sponsored by: BBOX.io (cherry picked from commit f879d1cd7df3c5afa69428cc2b07e1675d7776c9) --- sys/dev/e1000/if_em.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index e7fc65ab711e..37a118a45848 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3697,7 +3697,14 @@ em_initialize_transmit_unit(if_ctx_t ctx) /* Clear checksum offload context. */ offp = (caddr_t)&txr->csum_flags; endp = (caddr_t)(txr + 1); - bzero(offp, endp - offp); + memset(offp, 0, endp - offp); + + if (hw->mac.type >= igb_mac_min) { + txdctl = E1000_READ_REG(hw, E1000_TXDCTL(i)); + E1000_WRITE_REG(hw, E1000_TXDCTL(i), + txdctl & ~E1000_TXDCTL_QUEUE_ENABLE); + E1000_WRITE_FLUSH(hw); + } /* Base and Len of TX Ring */ E1000_WRITE_REG(hw, E1000_TDLEN(i), @@ -3716,9 +3723,12 @@ em_initialize_transmit_unit(if_ctx_t ctx) txdctl |= 0x1f; /* PTHRESH */ txdctl |= 1 << 8; /* HTHRESH */ txdctl |= 1 << 16;/* WTHRESH */ - txdctl |= 1 << 22; /* Reserved bit 22 must always be 1 */ - txdctl |= E1000_TXDCTL_GRAN; - txdctl |= 1 << 25; /* LWTHRESH */ + if (hw->mac.type < igb_mac_min) { + txdctl |= 1 << 22; /* Reserved bit must always be 1 */ + txdctl |= E1000_TXDCTL_GRAN; + txdctl |= 1 << 25; /* LWTHRESH */ + } else + txdctl |= E1000_TXDCTL_QUEUE_ENABLE; E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); } @@ -4026,6 +4036,11 @@ em_initialize_receive_unit(if_ctx_t ctx) srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF; #endif + rxdctl = E1000_READ_REG(hw, E1000_RXDCTL(i)); + E1000_WRITE_REG(hw, E1000_RXDCTL(i), + rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE); + E1000_WRITE_FLUSH(hw); + E1000_WRITE_REG(hw, E1000_RDLEN(i), scctx->isc_nrxd[0] * sizeof(struct e1000_rx_desc)); @@ -4033,9 +4048,10 @@ em_initialize_receive_unit(if_ctx_t ctx) (uint32_t)(bus_addr >> 32)); E1000_WRITE_REG(hw, E1000_RDBAL(i), (uint32_t)bus_addr); + E1000_WRITE_REG(hw, E1000_RDH(i), 0); + E1000_WRITE_REG(hw, E1000_RDT(i), 0); E1000_WRITE_REG(hw, E1000_SRRCTL(i), srrctl); /* Enable this Queue */ - rxdctl = E1000_READ_REG(hw, E1000_RXDCTL(i)); rxdctl |= E1000_RXDCTL_QUEUE_ENABLE; rxdctl &= 0xFFF00000; rxdctl |= IGB_RX_PTHRESH;