From nobody Thu Aug 10 14:43:29 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 4RM8mx4DrZz4mMpx; Thu, 10 Aug 2023 14:43:29 +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 4RM8mx3Vm0z3b4S; Thu, 10 Aug 2023 14:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691678609; 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=cG10hjpFQu8dYRiMpk2IWaB2WGb2cdzTCQ2DBc6Nf6M=; b=VgxH6fgeM2qAjTCTlTGAHIpRSQfPz+O7FQOHyUaUaEN+i+SNMi87dXQ3uWy23six07bzgw /R59qjFDzxbM2nKXhOWdrzcYuIg3MUp1i+9NnHGw0wwLs5MpWZj1dEnZsPuL3NuRkU2tSw tV2rCVwSpYi747O7PLEKSS4iJJ1FzcB8viV+Ri0AwePRMY2MbcVEcpxqZ9Z90Z0nd7h+RF 1xbSWzmC9MXkkIL8J6b5bPzfPrYYuxAabsA5PgMl2chbOTyK5rsiKlM2M42qTPzAZNN5QF JOTjeDz7dVhb3dX9p+34P+nJqos1A/3C2S9qEhgPp2xNAz6sesoEoZ1/PRvNCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691678609; 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=cG10hjpFQu8dYRiMpk2IWaB2WGb2cdzTCQ2DBc6Nf6M=; b=l5GBP8l2uJC1pRPk8xlWMe16JrEE6tb+gkREn9DqXAv0Ksm5Ifr8woCpE9R1rwxF8tAzqN lKxb5C34/xgU3DQyJx13c7QJN5690wn3HMcctjSwF5AB3Sr8NSGwjGVvde1h+y6E3ElYrc cLq4fWsRe99erGqwHZf0F/j9eSnuxsJ/tjWvAazdujFXQJzKTml24WrkRcY5HuwCsKTd21 UyUUdeRZ+ugJ3DWTnOHt+813gc4Q3bHrYKi6s7vps1S+tEDCV6ADJ00uM7lHCFjbDJ5oHv KdTgvLum+LErXDLazhPpgvnHEcZLCC8JYZKGVVkJ3vy/leWyDIqgF9xT4FSTFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691678609; a=rsa-sha256; cv=none; b=QNRLReL4gtX2Sg/jJkQuOAdorKBOo09//M3CXnpOf3hahGJsBpmS5WVX4zy49hdzEVF40a GvAMESUM8VonyMJocW1U8lLkva052TdR612q97jhYlZjUCRFTPosvKCWoTFiF7zGN+a1d9 etdGAQVhnAAnzXnalgOJl3Q5lKgOJENZwfwtFJLCmoxwQ5h2Ir+YQIyDNkb1LDfOw4l6aE TW0tAZM1jmt6FQkwEA6566NQIMN1K9e79wzb6JOGm8QCzYurYOEEm1Ufg1YMUrlgeLvrIe chjfmeXUId7KZJO96ajb3AfwCM1ZBHTplHl6Fa5MWsqI4rkH/ctuEHnoXbWPnA== 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 4RM8mx2Z1Mz11vd; Thu, 10 Aug 2023 14:43:29 +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 37AEhTfX059161; Thu, 10 Aug 2023 14:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AEhTeF059158; Thu, 10 Aug 2023 14:43:29 GMT (envelope-from git) Date: Thu, 10 Aug 2023 14:43:29 GMT Message-Id: <202308101443.37AEhTeF059158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 0eb8cd1de268 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52 commit 0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52 Author: Kevin Bowling AuthorDate: 2023-08-10 14:41:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 14:43:16 +0000 igc: sync srrctl buffer sizing with e1000 Approved by: grehan MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31493 --- 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 1ede99eee4ae..70f1aa2d2239 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1985,6 +1985,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 (if_vlantrunkinuse(ifp)) 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.