From nobody Thu Aug 17 00:30:58 2023 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 4RR5X24DJYz4mQnb; Thu, 17 Aug 2023 00:30:58 +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 4RR5X23GgXz4Tdb; Thu, 17 Aug 2023 00:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232258; 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=TzEtOTz0ziNnCjzIdpzcT7xWQ6gm7+jX0X2owgWTuTg=; b=mYAdw6vAhwSGFJ4R+709wMIm+6cQDZO/aiogSIJuCeWbFAr8WGeG1me4wWJUy1xn3Nm1mo O8oozzo7iMmHlqby47zRbwBlDiiu2kxIGODDJCzNC6N6HyL1EUUJ88YEfKMXgb6NFsxpMZ 1I//dWNJt5nxVvFwmhSb3UOoolo/9VqZGT9ieHTKS8hhGHh49sb7JnCDIBLc4X6IQTvwyP LrHNUcJ5A3eJ1aNgZ1XvTjMBI5L8mSabPV2xLPj39i1VfTPNctDBhHi6Xpx1AaqpsncRgd ZRxEizMsnzgtvuK0tCQ/8mgcKIE6Vkj1HJZ+eg/pUVEmW0vz+ja/MHK9XJELag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232258; 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=TzEtOTz0ziNnCjzIdpzcT7xWQ6gm7+jX0X2owgWTuTg=; b=HnuHX0IrmnHJ4vMWaXCTfHya/sy2BIQKOIZhtYEAos7HNhrF5lole4tF7xzAiZcv+m32LX 8zbi8F85DZpkAH3+dDiTHq3VKefxmzZcs5hho6FKsmqrWwJH+kdNYunxTSGsavsYmJc12k t5HS/lBcJLB3E6SWsMzFIjkzAxvKv6ztOP63NQ8ZM0hbSieqTXwzeHv1cU0sEwyxkLyrGr egbqh11BfcTk7OsKN1zWFWwHf26QExVOjXMaVwRRkWyYtZ6OxeWv0QU/x9AWmKPE5yj6TQ XTexVxGOX4NxhwT6o7vBMioM3vKi9AjvmdRYHEmf5uKWvNgeTzezMhGXth9Dug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692232258; a=rsa-sha256; cv=none; b=I5sbvZgdpDepOt6yPdK2XtGbl4slFmRyySuegf6T5O2GeckwCAjqsAJwxbPz5dqUm/DFud 3+Twd0JffzS185Ih0e+U7Hu+c+RVYZU0twyl3ZaFqrrqnNKeh+6bnsFI7PWR0fUdd/UvHP N/V8bPiWxhwqxFhEFi3smJ6c07PK6ERpQPAIUc6NIo9Rg95EkX2P8kKf804p6rSaxPVIpG 10VkyoiFiwpu5hw36qlceIvaXy6Mr/2hI/GUnO2bqoH4nqyHLxyqUfiGbMc5u8c4ChQEUl YYGyP5oWs2To/OmrVtKbwvrfYAA+JNcW5gSuOlBRyHmi5IcBfWYJELbwZ9tDpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RR5X22LyVz1CNS; Thu, 17 Aug 2023 00:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H0Uw4v037327; Thu, 17 Aug 2023 00:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H0UwD0037324; Thu, 17 Aug 2023 00:30:58 GMT (envelope-from git) Date: Thu, 17 Aug 2023 00:30:58 GMT Message-Id: <202308170030.37H0UwD0037324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: f09f2763b67f - stable/13 - igc: sync srrctl buffer sizing with e1000 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f09f2763b67fcbf65d7cac5b114eab72308cde60 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f09f2763b67fcbf65d7cac5b114eab72308cde60 commit f09f2763b67fcbf65d7cac5b114eab72308cde60 Author: Kevin Bowling AuthorDate: 2023-08-10 14:41:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-17 00:30:32 +0000 igc: sync srrctl buffer sizing with e1000 Approved by: grehan Differential Revision: https://reviews.freebsd.org/D31493 (cherry picked from commit 0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52) --- sys/dev/igc/if_igc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 826a35e7e15e..49d4755d057c 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1986,6 +1986,7 @@ igc_initialize_transmit_unit(if_ctx_t ctx) * Enable receive unit. * **********************************************************************/ +#define BSIZEPKT_ROUNDUP ((1< ETHERMTU) { - /* Set maximum packet len */ - if (adapter->rx_mbuf_sz <= 4096) { - srrctl |= 4096 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_4096 | IGC_RCTL_BSEX; - } else if (adapter->rx_mbuf_sz > 4096) { - srrctl |= 8192 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_8192 | IGC_RCTL_BSEX; - } psize = scctx->isc_max_frame_size; /* are we on a vlan? */ if (ifp->if_vlantrunk != NULL) psize += VLAN_TAG_SIZE; IGC_WRITE_REG(&adapter->hw, IGC_RLPML, psize); - } else { - srrctl |= 2048 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_2048; } + /* Set maximum packet buffer len */ + srrctl |= (adapter->rx_mbuf_sz + BSIZEPKT_ROUNDUP) >> + IGC_SRRCTL_BSIZEPKT_SHIFT; + /* srrctl above overrides this but set the register to a sane value */ + rctl |= IGC_RCTL_SZ_2048; + /* * If TX flow control is disabled and there's >1 queue defined, * enable DROP.