From nobody Wed Apr 27 13:16:23 2022 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 4CDBC1AB1998; Wed, 27 Apr 2022 13:16:23 +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 4KpK5M1hpkz4lHg; Wed, 27 Apr 2022 13:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651065383; 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=Mi9QvjWFb6H36PPYij16ly4F6mui74nRtVEP/0Mt+Pg=; b=eFMJuQn8AUHKasg1bBP2GIxM20CUyYAcYc73sXgUnNc5yRorFR6iTSMXWFaiee7n06Zc3Y zubl1xed6/Ji7MPjM1VttkndgEpG19l368vqRVqZbEu7B3Z/iGpEXK3/dQsQr1/Lkq+lOp volBWIJLPPCAMQ2poQRhGAgMoPIqJ1mQQEh9Ibh1yB5cNiJmvezGMyRC2ctT5Uo3bKh2Id 08Yk2ntMgJFpzqhyOx1o9SoTPucEU/yNj8BIIos3UwLJzr3MC2T+9yJt2hnthsRkv/mRUo 9lE2L1SNmyYu0d0ZrGIdloYW87PFgZnnF8z6QCsTojMW6HWeCYoF30uYwzaWjw== 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 1B33224743; Wed, 27 Apr 2022 13:16:23 +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 23RDGN5S044161; Wed, 27 Apr 2022 13:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RDGNkm044160; Wed, 27 Apr 2022 13:16:23 GMT (envelope-from git) Date: Wed, 27 Apr 2022 13:16:23 GMT Message-Id: <202204271316.23RDGNkm044160@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: e54505277c39 - stable/13 - if_bnxt: Allow bnxt interfaces to use vlans 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e54505277c39cad32f999fd72033f6fa9594b130 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651065383; 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=Mi9QvjWFb6H36PPYij16ly4F6mui74nRtVEP/0Mt+Pg=; b=NkGDZufyZohmEE6n+EfV4N4zgx6dNFFE9JYRoEHnHwjvuT+XaTmf7RiGBD72kqM4pqetwh +E5DAW9dIkpAvNVp32OE2AVtMKoUkcPDchgmusUbuqHquiJ6BbqW3kXKrLzUTSK4bXuXIx gce0LwmaxLk7ydCYgx5V7vSoaF/EMCPjVj+psLlCtrUd/obxN9E+ccn0eVoDQ8/pql2UMU v3ExrQf5n++oiVwBSotxMx00tBzq0VjIeuS0eAUl6chrJ9QtfW+EhO9YQnmVKCv2StUw0F 12F60yPVDtZ7y7ZjZO0NojWrmj6buFTS9NT4sb9xgv/P3hWU2/n8PKPnucAfkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651065383; a=rsa-sha256; cv=none; b=L5mluA/j7/XkhykAuyYGCIqdwTB2ebE0kgR3dv9ClAvEsaBLt5C1ALqz+GvPQ4lt7siXtn 5gJL+5PI+lKuYGLZaDhKxXie8baSPWo5vID1Kwx9tRvOYkE16GhcwndY1UPyA0+yIzZPBL 0PaeNqHTEd8pILltp769IFOh4q2mfsee8zT75KakULQ7yqldV1fe3F8xCUc/yA5CGRTvmF MEuzXNKiakR46BOGvUOM/y01tmtAXvpRM9tyTFP41ujkGPXYMLkNpPGW7+JuWsIgHtoNBx JVEEqSEPSMpMSpKTGMDAdw/hJTWFa73nFurNkpC/AudVAzTMrPj8cRIT+JgD4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=e54505277c39cad32f999fd72033f6fa9594b130 commit e54505277c39cad32f999fd72033f6fa9594b130 Author: Misho AuthorDate: 2022-04-21 08:24:04 +0000 Commit: Tom Jones CommitDate: 2022-04-27 13:14:40 +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 (cherry picked from commit 0c6a2fa33e36ac0b5d51cbae39a9c5564ad61788) --- 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);