From nobody Thu Apr 21 08:32:05 2022 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 406E21997B9F; Thu, 21 Apr 2022 08:32:08 +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 4KkW462fF3z4mvX; Thu, 21 Apr 2022 08:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650529927; 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=jI4PZJDBEybCrJo8t6WdMqneKIeN+pXP5jOqMqtuUxI=; b=qCIt7WIA8PTV4bPejFpvd189GhvVTA2jvrrE4B41fOZFg7uMOycPoLtGuGVY8OBQgw4deq Qm6CFp4Hun5dX8B1fG+fis2i9C3FCLoSwOtXwEKKSr7V2RPFbVVvhCwnlAAKMfsrmZg6xp Dog9JClXvHmorPw0Iy8vOgKSTw4BjmckbkXKDzaVGa8ybaGx3MLbrIuwuVBfuLlaZsPiTW 9cSkgqaWXHiJHi/GtGO5CyKhXjTsA9cnUh76D4P4FRkyDk72+tYNNPjUCxh2Yf+Ysz7fe+ 2T5X1U6gm9X/qwZAXNGY/E4RMV8PFYM3WUn9yPzD0dEO8I58uy1su9HaDYr2zQ== 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 AAB932540C; Thu, 21 Apr 2022 08:32:05 +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 23L8W5Ea081819; Thu, 21 Apr 2022 08:32:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23L8W5qW081818; Thu, 21 Apr 2022 08:32:05 GMT (envelope-from git) Date: Thu, 21 Apr 2022 08:32:05 GMT Message-Id: <202204210832.23L8W5qW081818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 0c6a2fa33e36 - main - if_bnxt: Allow bnxt interfaces to use vlans 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0c6a2fa33e36ac0b5d51cbae39a9c5564ad61788 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650529927; 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=jI4PZJDBEybCrJo8t6WdMqneKIeN+pXP5jOqMqtuUxI=; b=UucUbahCnMWZCTgSgE4Qr2L1mQKn8HpcCYlAhy7oRKJCYRzkvUXMr9BhQkSSdWhrcX4XGc ikjSglo87YBCHLMgNwCfJ/fCQjQUVmHol52r4ybaOj2OLmk6hctLiLArlLNG5W1GdKo6ab KxsHiRPgURxthCqORCjv55frUsyp3ertRiBG7m1Ro+Yx2j6XHG3FLK243RFO8HZEzbuBTF 6Ww/pk2CeqOS1ptqveDX8Za1xSvhIJf7VAeb+m3jqvrPv8zcdZ8+Ww3NrNiCO229Ae/Obp 1LdFzDL3fxU68HV4iHT02SsJsO6h0lbfeyI64qO4ERM2f1Wz35ODA+ZWMPXSWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650529927; a=rsa-sha256; cv=none; b=mqiLHlSqSAUIrGC18OQBxuqBNngYkpsTxaqwD1xFXhMMUJUt4VGfNUkEaGH7Q5HN0WzPvM 1Dxrbvm6rnVhQctC1683gwuftoeiAA3UXkj/exsWfUoLNJ0WnCe/9bT9ILQgZTkIGvLhBq ZxBpRHkodgWiiXvDTpsf/HH0ZMWHlTdXvhWsUnsAivIxF9LaaBAoIzY91RwGIUDYzorBBR oTHLuDVHwIcwVzTWnH7oKu2oBHQuEGK+n5GGu7NyXE1XOTs6UmGUC0iIDYCxJXRSY6cl2w HDS5xr5wlzU/cF6oPe4FysBjfSXcxj0Q9HgHhA7RrPCYblZprecgrcIOYKK7Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=0c6a2fa33e36ac0b5d51cbae39a9c5564ad61788 commit 0c6a2fa33e36ac0b5d51cbae39a9c5564ad61788 Author: Misho AuthorDate: 2022-04-21 08:24:04 +0000 Commit: Tom Jones CommitDate: 2022-04-21 08:31:51 +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. PR: 236983 Tested by: pi Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34824 --- 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);