From nobody Sat Jul 29 01:18:05 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 4RCRTT2ZyTz4pHlr; Sat, 29 Jul 2023 01:18: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 4RCRT94r79z4Qgn; Sat, 29 Jul 2023 01:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690593485; 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=i7iobruiXnoMbrgj0XRCcPhdmX0CApjOS+j9NRSxbxo=; b=dgXCEN2hmsMDE5BK9/6frYyY7tiOuPre/c1If74dFpgnfh1RLB4xydElm6WvsQihQzPjl5 qQFqwKQeU+JtrOVodnVaivXdf99IoWLhy/ztpxrkgZixZsngYKVY5Lb4Ack/fkbSpXIbZS 9kOUakpwX7j9jrjQ80QsaguvaINDEXpmA4mvljGw9XhieIW0tjvAka58KaMocpuJCBTIzh XtW0KyTzVZ5GcNQg732+vOAnORwyIKirR5RL/31KGAIZKlj8dDXaHz5dNEG+vXZxYfYOn1 nMtFK2aPAY66vpgI2ARgRaMF6a1+Y7lIeZRII+0vcZcohrFsPjoNefDXOdsSuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690593485; 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=i7iobruiXnoMbrgj0XRCcPhdmX0CApjOS+j9NRSxbxo=; b=f64c7olOpPYfUwkj2IcnPeelLuCjLXVCr2t+6/42+Ke+hvvq4KvboT0TrGIwLUB3deJaU0 CD1CPVxr28AJ0KtKvuuAowv8snCDTSSeYk+T2FbH+u7G0nAWrCiO+GLQYZvX1695UW5l13 tEq8zC193ht26OHfGSlbFMVQezKE7ZaE40yr+MgFce6xlR26n8nl2ZbjEo6rLRnzdoHTvR mSRB1fweCqPBzhDFcxhBP5ULb0oKiR7Qh//b+4P9IM5nyBTtpzTgKGWgSwK45emOjvJSiz STdmAfGdCyS3Hk9VYFkS3za2revOv4q0OHwyyJQPQnH+N3gEO/94lCiLG7SIpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690593485; a=rsa-sha256; cv=none; b=J9MFwAMKmseQa/svp7czazYLjjrdBO1iqczpNIRQaQfhsp5cPrb226miuQSweG+vBWplZT I20n7qvvF42UpSQOTvt+doFDON/Y94w3IpMnZDd/b1w3w+4kEwAg3dv70MU6ROTxdq5fPJ lfE7l45daf79oEloQKNA/7S0Gz0MxxFsHUsefv36fTEKmJn+DPxTjPafltAORTR0SzLVZX IhWmwFKRYA3ROZGGscrKpi71n5Ji1epYiEgwCjt/QatrjSmIjQJB4EyjHplUR9w7d0HmzW ik6vVIaPGc5gHqgg/3i4jzMXahxyAZ8RbHVouzcOPQ9HWN55hVbRrulpDtHaKw== 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 4RCRT93SRSz1CGq; Sat, 29 Jul 2023 01:18:05 +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 36T1I5UO070918; Sat, 29 Jul 2023 01:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36T1I5lM070917; Sat, 29 Jul 2023 01:18:05 GMT (envelope-from git) Date: Sat, 29 Jul 2023 01:18:05 GMT Message-Id: <202307290118.36T1I5lM070917@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: 38588749af45 - main - e1000: HWCSUM excemption fixes 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: 38588749af45d738e6f548f15beb415c46ba8658 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=38588749af45d738e6f548f15beb415c46ba8658 commit 38588749af45d738e6f548f15beb415c46ba8658 Author: Kevin Bowling AuthorDate: 2023-07-29 01:14:29 +0000 Commit: Kevin Bowling CommitDate: 2023-07-29 01:17:35 +0000 e1000: HWCSUM excemption fixes Also disable IPV6 checksum offload. Spell hw->mac.type < e1000_82543 as e1000_82542. Confusingly, chips like 82540 and 82541 come later and do not have these issues. There is no functional change here, as the enum was defined in such a way it worked correctly. But this reads literally. MFC after: 1 week --- sys/dev/e1000/if_em.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 32d8c3282e33..1f6100cff293 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -949,9 +949,10 @@ em_if_attach_pre(if_ctx_t ctx) CSUM_IP6_TCP | CSUM_IP6_UDP; /* "PCI/PCI-X SDM 4.0" page 33 (b) - FDX requirement on these chips */ - if (hw->mac.type < e1000_82543 || hw->mac.type == e1000_82547 || + if (hw->mac.type == e1000_82542 || hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) - scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); + scctx->isc_capenable &= ~(IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | + IFCAP_HWCSUM_IPV6); /* 82541ER doesn't do HW tagging */ if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) scctx->isc_capenable &= ~IFCAP_VLAN_HWTAGGING;