From nobody Wed Apr 27 13:56:18 2022 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 5E7901996464; Wed, 27 Apr 2022 13:56:18 +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 4KpKzQ2FBHz3Fcy; Wed, 27 Apr 2022 13:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651067778; 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=fllOUDeg+ni8EcGcnK508TN4MZftNI269o/mfD9TZcg=; b=Q37IOoAaUEEMQ2h1ttiCJvGVy3AZ5w9J6nBkD1WXsxtPoOiUw12PblIO6rcfhvtTULhC1N IbmW86wDTJScxNN7VHxjL0Y4pl5DGd9g/pqxodzsFb5y4HQ0fRdRhru7cVw6AGK3dHj51F fC5UDfrcsswSK0VITnRrdBpTq3MRX9RmJLZBnsGystAs4HqJHXSrcRNYKtUNmq3V8s9Q2p 2Pa/3dtaDO4ntJF0AjmPkWEyjNsmmF7oH2qYbk8fktlGtRMuv4s5xPf88WAJ2Gk3nQmkVK SlmYOcwBWYYG3BTfOnnU7yWQXakOz1qj4BJp9AsDUMC1MHNfo/E4YUko/mf8BQ== 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 2B5F024A6E; Wed, 27 Apr 2022 13:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23RDuIOZ099530; Wed, 27 Apr 2022 13:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RDuI6x099529; Wed, 27 Apr 2022 13:56:18 GMT (envelope-from git) Date: Wed, 27 Apr 2022 13:56:18 GMT Message-Id: <202204271356.23RDuI6x099529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tom Jones Subject: git: 5acfa48bb258 - releng/13.1 - if_bnxt: Allow bnxt interfaces to use vlans 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 5acfa48bb2585adfb8ceeacb695c6e6cc660894d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651067778; 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=fllOUDeg+ni8EcGcnK508TN4MZftNI269o/mfD9TZcg=; b=PZKKO6vVhiXB1W2Hl6NuF2rZlsxeA0TSHxtfwqw45sDTAaUtKskM55d+XvERc1wpotdQkz Kqr75vyMD5GtU/NSqk/ogdKv59EfuKZlIdV6Gb1fGBjVx06ShD4zObH2uhOPqU7asttuoT v7xEA8ShuMgS7nHjRdHBAMfaGbpg60hXFZLNa8mijUQMqOa4WjxaNHJTdd56UPEL/M8N/w CvHJOCWGCowXAJOMjKs8+CMrNugqFRDVlTn9B/J9a0XebjLJxNFbJSpJgUmFqWhkfr5/Na H8bDAgNJSFzZkVyxczp/4SvKRMvAKKvG1coz8NJgY0tGPiHtthFAc0k4fIqoPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651067778; a=rsa-sha256; cv=none; b=CxWpqzHQ9YRPeBYkqspKm0vi6jJmPz0R/jUOxRIXqEtOlrqfFfAsyLf3gvNQtUnjXuet21 kNdDvrvkEBNo/9A7Up5VX42J6W4WAPtcce8b4mtcaURtEzLv+HE0xanFBg7pE2tpV/y4E2 xcFR6RWOK7PXk8ge6MIdAVohBKmv7S86ferRULfyF81jRLpXY2kkmr0XgVY3pgFRzcSBQ6 UDQFZ03CuWDeYEtBvi+++NdebctJyREwvL+6EqCNY71mEjHYhHcqzJVJLDtkPR3gjfZfMb a3w/pUVCD987EGkjhYNM8CG8mEcr8sCr6B/uYrGXhAZk8MBiBXAh6u6dmHMD6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=5acfa48bb2585adfb8ceeacb695c6e6cc660894d commit 5acfa48bb2585adfb8ceeacb695c6e6cc660894d Author: Misho AuthorDate: 2022-04-21 08:24:04 +0000 Commit: Tom Jones CommitDate: 2022-04-27 13:55:24 +0000 if_bnxt: Allow bnxt interfaces to use vlans When VLAN HW filter is disabled, the NIC does not pass any vlan tagged traffic. Setting these flags on the device allows vlan tagged traffic to pass. Approved by: re (gjb) PR: 236983 Tested by: pi Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34824 (cherry picked from commit 0c6a2fa33e36ac0b5d51cbae39a9c5564ad61788) (cherry picked from commit e54505277c39cad32f999fd72033f6fa9594b130) --- sys/dev/bnxt/if_bnxt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 52d989a88392..1805a1f24f93 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -586,7 +586,8 @@ bnxt_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, softc->vnic_info.def_ring_grp = (uint16_t)HWRM_NA_SIGNATURE; softc->vnic_info.cos_rule = (uint16_t)HWRM_NA_SIGNATURE; softc->vnic_info.lb_rule = (uint16_t)HWRM_NA_SIGNATURE; - softc->vnic_info.rx_mask = HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST; + softc->vnic_info.rx_mask = HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST | + HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ANYVLAN_NONVLAN; softc->vnic_info.mc_list_count = 0; softc->vnic_info.flags = BNXT_VNIC_FLAG_DEFAULT; rc = iflib_dma_alloc(ctx, BNXT_MAX_MC_ADDRS * ETHER_ADDR_LEN, @@ -1391,8 +1392,7 @@ bnxt_promisc_set(if_ctx_t ctx, int flags) HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ANYVLAN_NONVLAN; else softc->vnic_info.rx_mask &= - ~(HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS | - HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ANYVLAN_NONVLAN); + ~(HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS); rc = bnxt_hwrm_cfa_l2_set_rx_mask(softc, &softc->vnic_info);