From 1842eb039f8ac970b4f480da66f2058d39707665 Mon Sep 17 00:00:00 2001 From: Navdeep Parhar Date: Mon, 17 Jun 2024 09:26:35 -0700 Subject: [PATCH] Fixes to D45428. --- sys/dev/cxgbe/common/t4_hw.c | 7 ++++--- sys/dev/cxgbe/t4_iov.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c index 3d22673d34c1..07940a44f66e 100644 --- a/sys/dev/cxgbe/common/t4_hw.c +++ b/sys/dev/cxgbe/common/t4_hw.c @@ -11377,7 +11377,7 @@ int t4_configure_ringbb(struct adapter *adap) * @vlan: The vlanid to be set * */ -int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf, +int t4_set_vlan_acl(struct adapter *adap, unsigned int pf, unsigned int vf, u16 vlan) { struct fw_acl_vlan_cmd vlan_cmd; @@ -11389,9 +11389,10 @@ int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf, F_FW_CMD_REQUEST | F_FW_CMD_WRITE | F_FW_CMD_EXEC | - V_FW_ACL_VLAN_CMD_PFN(adap->pf) | + V_FW_ACL_VLAN_CMD_PFN(pf) | V_FW_ACL_VLAN_CMD_VFN(vf)); - vlan_cmd.en_to_len16 = cpu_to_be32(enable | FW_LEN16(vlan_cmd)); + vlan_cmd.en_to_len16 = cpu_to_be32(enable | FW_LEN16(vlan_cmd) | + V_FW_ACL_VLAN_CMD_PMASK(1 << pf)); /* Drop all packets that donot match vlan id */ vlan_cmd.dropnovlan_fm = (enable ? (F_FW_ACL_VLAN_CMD_DROPNOVLAN | diff --git a/sys/dev/cxgbe/t4_iov.c b/sys/dev/cxgbe/t4_iov.c index 594f90cd74e5..eef41d6398df 100644 --- a/sys/dev/cxgbe/t4_iov.c +++ b/sys/dev/cxgbe/t4_iov.c @@ -375,9 +375,9 @@ t4iov_add_vf(device_t dev, uint16_t vfnum, const struct nvlist *config) vlan = DOT1Q_VID_NULL; if (begin_synchronized_op(adap, NULL, SLEEP_OK | INTR_OK, - "t4vfma") != 0) + "t4vfvl") != 0) return (ENXIO); - rc = t4_set_vlan_acl(adap, adap->mbox, vfnum + 1, vlan); + rc = t4_set_vlan_acl(adap, sc->pf, vfnum + 1, vlan); end_synchronized_op(adap, 0); if (rc != 0) { device_printf(dev, -- 2.45.2