From nobody Thu Feb 13 18:22:38 2025 X-Original-To: dev-commits-src-main@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 4Yv3Sb0WDyz5n5n2; Thu, 13 Feb 2025 18:22:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv3SZ2Nmnz3Ffp; Thu, 13 Feb 2025 18:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739470958; 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=2GOBvzDFLxGSGnGXIqau53K2Nc7jTDXtmx5Fxh5WpaE=; b=KXnArxCrBaZ9o7u5JOD1XpSnXlbX1Mv6WT62oXagTbDJXsOfZcymxt008Gcx/r9LBMUP+S OEsX0FUcsNeKQ9Ve8Vw1858xMi5vRSJstyQ6nY9QswAhvjLaM/WR7NJEf/fefw74gFf0SW PZZfFARMslCzyPeVCe6JZ3gGlUSH8BJdBCjukzySNEcie582OVeQ7TqR6y2N8JWWxtgR5p bLgBJH3Z25t4lQGyMz5QkbAaVHNA8oLcD3TjspRmrQLb9gs9nANbmwJz67jgzwdVNP2LFY bJnqxlc/LLz8WmFp2T+udhhQz0DpuzrelfOSdlT/g6YOvKAkmOLLV6NaCoXSNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739470958; 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=2GOBvzDFLxGSGnGXIqau53K2Nc7jTDXtmx5Fxh5WpaE=; b=lYsfDbJVFV/1VGLlNxnHy5kvBkCVbhsnn2+29rJ2+8Wrmc1UpyYyYWw5hd3QXOKTTUwhd8 E9vsAU5ioGY/nt3Xn8s+/RCH/6/qrfQKZL25IXw9l09nHrU/r+razbrZ8S+1r9I4dfmHHu 95dbYzDPPO/HglPCSLk72I6Lyon2OSbFkHmlmmQCYtb0V4yKcvR7L+/wEd1cYu5kMPbfbz tqbGn+JmERgvMw59bMYKzQNiyguiGVM4dH1QPYlLYA32as3wXKOWXGpYrX/3dMRstjShHo DGmRe3v2U66gAqejNqLDchCbiVuUyAViIQwJ3X5GGi39uF1Pns81RwSIniqljg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739470958; a=rsa-sha256; cv=none; b=DjQEJbUI3ewGbE17nx5ahpl1EjSpwAVFV0AvqkIWc7wjRTkofFTaDCmk5XOlX15fj8RVNn 3VwjH9Cw8OPjRENy77nD3JN1qWG4MXfzJLLFqr3jraSsG/rTejkbjmo674nhKwRB9KJIyc xT2Xso5TnsWgNytydAXecu4yx+1Fyop/Wdi+MRTUF4xIpQ4tztk39HBWeoWOy2cDwpTfK7 i3xkalvwAoQDrgqr+Cny2y870DDkxdT0jk4mZ3j1lFi/kESpUuW1sjk+x7EcG2ZI9zkfc3 bb9R8auL5fPuMMPzXYYjuRn5QFdif9M/i46cJSl0HEwXjlJvHgzensBQbKUo5A== 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 4Yv3SZ1c0yzwPW; Thu, 13 Feb 2025 18:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DIMcmO028319; Thu, 13 Feb 2025 18:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DIMc21028316; Thu, 13 Feb 2025 18:22:38 GMT (envelope-from git) Date: Thu, 13 Feb 2025 18:22:38 GMT Message-Id: <202502131822.51DIMc21028316@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: 4b29599fbbe3 - main - e1000: Fix vlan PCP/DEI on lem(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4b29599fbbe33b75b7b58cfc5deea7a881e9a10e Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4b29599fbbe33b75b7b58cfc5deea7a881e9a10e commit 4b29599fbbe33b75b7b58cfc5deea7a881e9a10e Author: Aurelien Cazuc AuthorDate: 2025-02-13 18:08:42 +0000 Commit: Kevin Bowling CommitDate: 2025-02-13 18:20:26 +0000 e1000: Fix vlan PCP/DEI on lem(4) The vlan PCP and CFI/DEI were discarded when receiving vlan tagged packets on lem(4) interfaces with vlanhwtag. According to the 82540 SDM[1] (pg. 24), vlan tag is in the standard format, so there's no reason to discard PCP/DEI. [1]: http://iommu.com/datasheets/ethernet/controllers-nics/intel/e1000/pci-pci-x-family-gbe-controllers-software-dev-manual.pdf MFC after: 3 days Sponsored by: Stormshield (author) Differential Revision: https://reviews.freebsd.org/D48987 --- sys/dev/e1000/e1000_defines.h | 1 - sys/dev/e1000/em_txrx.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h index 92f676932636..f1b1008764a1 100644 --- a/sys/dev/e1000/e1000_defines.h +++ b/sys/dev/e1000/e1000_defines.h @@ -130,7 +130,6 @@ #define E1000_RXD_ERR_TCPE 0x20 /* TCP/UDP Checksum Error */ #define E1000_RXD_ERR_IPE 0x40 /* IP Checksum Error */ #define E1000_RXD_ERR_RXE 0x80 /* Rx Data Error */ -#define E1000_RXD_SPC_VLAN_MASK 0x0FFF /* VLAN ID is in lower 12 bits */ #define E1000_RXDEXT_STATERR_TST 0x00000100 /* Time Stamp taken */ #define E1000_RXDEXT_STATERR_LB 0x00040000 diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index edbe0f8ab546..ced8d0f41d14 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -710,8 +710,7 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && status & E1000_RXD_STAT_VP) { - ri->iri_vtag = - le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK); + ri->iri_vtag = le16toh(rxd->special); ri->iri_flags |= M_VLANTAG; }