From nobody Sun Feb 16 00:26:00 2025 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 4YwRQw6vq4z5nb5b; Sun, 16 Feb 2025 00:26:00 +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 4YwRQw4XM1z3bBg; Sun, 16 Feb 2025 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665560; 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=SrjXeYsb48Gu8y0yP7HhkJPDQNdxSikJsGt+jXdyA7E=; b=gQ9RLldJZdp0CsfzCONq+NExI1tw8wS6RBeMGWzBtU8bUUmyYJz0Q6SBP1UQYBRano4cgE XReIVPNimZ5CRBObgFrlcs20qI3Hhzfe9+UsmXRx/zI8IVRvm6dGheq0wnFPHNeeLM7qId W2qxg5531CZndiEeQdsN7sx14Ok0WW2q4xgjJSqVaS2nr5lwYLkcH+9OD2K9S6k36R6dz6 MxYMiRcmPur7vo68kTFkRjBTcQT/e1RIwdT/+ADaQFJ/CreAN5fx8LrjEQxGWf7CqH14HH +Rh3OJdYeCvzzOsZx6BaGkaQj+mVie3bkXNubM5LCPUt5et5I28ZwyIcCvO8sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665560; a=rsa-sha256; cv=none; b=EHGansYCW8ixM9BEyvWOVuMIxZse6aC2dLI/DHQlniq9SWLnP/6SRCIjn8Y+RhQNr3hwHl BlH+5XkQWNFYSJSOqIWCYQDVN/hR2IIPqKt+c+qsinAK5PDJ6eYbpi4xq2nW5Vud+Z52bW SZJHD8jizX5i026VVSd+ODeyCdIDU4Zv4sKyRlLNLHVI7nGV08bE3syzfslzzGVad8k9Y3 w4pA6DlsA81djP2kmkmSVnYp40ZNRQXlsLcno5D7PnZfdm3tqXTU4s966ArCBHUzjbY0Xu tHtXfoj26g4YzohJWm+Wb1alFFEyE6h/o9mJy4ONkXWAUkCKURKBWf3D3e+AUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665560; 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=SrjXeYsb48Gu8y0yP7HhkJPDQNdxSikJsGt+jXdyA7E=; b=GYh9OhYH6Pr0c3Ugcs45b2La/jaM443xA4EgPMthFRM5BtAYD0jmxqhUJH/M7gkzUWxhsu OVo0E/YWbVdUYVPMTU6jzX3B1y13kE5sPf4TZOInrMqKlYSa8LdnL53wt/woDpcXHljeWJ PPMiDy2HrMH4FY2ddCIJKQV6MiPIIM1XLQ9SroA6oMYrIKJZ9lnDHHOTaiXOPVoXF6ECCN ea9wn39yVexnqrImPM/opw1Yw2SvYL/Y8y+f5GUwMbUsvLV8w7tLiiZwQwZCNQX15r87p8 HM87xpPaYF2zbddNuIuXR1zSRGmNHLdGBZXfIvFOwVJj1JXSp65g+mqcjlDjaw== 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 4YwRQw3K9xz85C; Sun, 16 Feb 2025 00:26:00 +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 51G0Q0xC016288; Sun, 16 Feb 2025 00:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0Q0an016285; Sun, 16 Feb 2025 00:26:00 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:26:00 GMT Message-Id: <202502160026.51G0Q0an016285@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: ecbef369b33a - stable/14 - e1000: Fix vlan PCP/DEI on lem(4) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: ecbef369b33af759995d9f3f49e38ddda823c7c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ecbef369b33af759995d9f3f49e38ddda823c7c6 commit ecbef369b33af759995d9f3f49e38ddda823c7c6 Author: Aurelien Cazuc AuthorDate: 2025-02-13 18:08:42 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:25: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 Sponsored by: Stormshield (author) Differential Revision: https://reviews.freebsd.org/D48987 (cherry picked from commit 4b29599fbbe33b75b7b58cfc5deea7a881e9a10e) --- 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; }