From nobody Fri Aug 4 01:23:41 2023 X-Original-To: dev-commits-src-branches@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 4RH7Js4zgfzZXtk; Fri, 4 Aug 2023 01:23:41 +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 4RH7Js3xwPz4Yvm; Fri, 4 Aug 2023 01:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112221; 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=m3AbihwkdHSieusktWlNE0qD8XoQkZLPLJJ6W55Jp4k=; b=pPKbb5NfFhGXATpgehzS2kyN87B+LlHbTbTsmAYNni6BWZT8hqhMcuZal95dPVRuP3aYdV HhYOxISQo9oMzEjwc7W9nyG0lSVZo4vXDqxWs30GD7A+5g4ZZI1Bqdr78mTKCQANyAQipY sjczJ3YtPAOCGdEQrdOWMgJq5A7qDmV3P6bZdDbiBp2W8nV3YX3avn35TWeVGhLdQiU8Md 4zTyVF4/fLPCrPnonb78BxsbntxvfSzgPfRHeVyzR4eg8EcsMZX9gKaq1Kh9no+Ld7SRnW COX02DAODDgt0ihJWxxciol1LvNRK7F8nUqCMbTXH8sjQzdj+yfj5xc0n0+4Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112221; 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=m3AbihwkdHSieusktWlNE0qD8XoQkZLPLJJ6W55Jp4k=; b=EEinCziGhB4r9crW6+Xow5YhEer6AWom9Nzctgjcv+XKAmOWNCANO9F8HGrwFjK5JvHHGn LWVtkxW8fOWtBlQUH1DTIUz7XeX+/SdxUfG27CmblbL/xcehiufMPzqSr4nCaztnYprCR/ pxCLNGT/+5Le0sKbKXpKy3ixoB5FNpzpwVZZhG3m+e9Btz3Iqu5zAtH2raOnhNcQ9EQzDG LAtEw3ufBEFgdexv+V1owuQ3eywBQe/cikeiQF0T4+mPG579lE48dSfgEXqK8nuRjGMhiM niu3ICPQC8A+M1Jfap9HqotQdnfCfklOpxBAn57U1Mr2uS2fcCE7/ZjFDHZ8og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112221; a=rsa-sha256; cv=none; b=vUJkUlRpKGj8dEJbGmzUxPClUB4abP5GEFTYPQhnKksl9UJg4x5ckKeAK/tVL1RdcUPgcy AzEq8Rn4W/mg/KsAkafztpEiMvEuf0XZpdkKEdxnllhlBhBOb77hM5VU0ZyINhW3gRJRXl +bAwp82Is9Ja8R8IEDXalTwMHgxpNTCveMnFgfmwrGBeWwqm6anj4XiCap6BmheDFM8vj+ +ed4rz9VGq4009rJA1mQX8BkQXwZU8T6z9sHGo3NdpuQUZXo1T24YT52XrbJbrKnbKKsWV l1qTkS0yBpxv5rCNHcVy8Xb8rpLgXOLgFLCYvFvJta1cgO6zUyNR9rSBwCp4Kw== 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 4RH7Js2scmzjxp; Fri, 4 Aug 2023 01:23:41 +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 3741Nfql021323; Fri, 4 Aug 2023 01:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741Nf9a021322; Fri, 4 Aug 2023 01:23:41 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:41 GMT Message-Id: <202308040123.3741Nf9a021322@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: a24e9d851227 - stable/13 - e1000: HWCSUM excemption fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: a24e9d851227bd7e403befa77392e963859451bb Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a24e9d851227bd7e403befa77392e963859451bb commit a24e9d851227bd7e403befa77392e963859451bb Author: Kevin Bowling AuthorDate: 2023-07-29 01:14:29 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:22:59 +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. (cherry picked from commit 38588749af45d738e6f548f15beb415c46ba8658) --- 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 6ceab6be2b8a..ad1780e03fc5 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -951,9 +951,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;