Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58945e1b authored by Manish Chopra's avatar Manish Chopra Committed by David S. Miller
Browse files

qlcnic: Add PVID support for 84xx adapters 



o 84xx adapters support VLAN stripping for PVID. Packets don't have
  VLAN tag inserted in case of PVID. So packet should follow non vlan path.

o Use capability bit to set PVID mode.

Signed-off-by: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15ca140f

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ enum qlcnic_83xx_states { 
#define QLC_83XX_MAX_MC_COUNT			38

#define QLC_83XX_MAX_UC_COUNT			4096



#define QLC_83XX_PVID_STRIP_CAPABILITY		BIT_22

#define QLC_83XX_GET_FUNC_MODE_FROM_NPAR_INFO(val)	(val & 0x80000000)

#define QLC_83XX_GET_LRO_CAPABILITY(val)		(val & 0x20)

#define QLC_83XX_GET_LSO_CAPABILITY(val)		(val & 0x40)

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c

+13 −7
Original line number Diff line number Diff line
@@ -398,10 +398,14 @@ int qlcnic_sriov_get_vf_vport_info(struct qlcnic_adapter *adapter, 
}



static int qlcnic_sriov_set_pvid_mode(struct qlcnic_adapter *adapter,

				      struct qlcnic_cmd_args *cmd)

				      struct qlcnic_cmd_args *cmd, u32 cap)

{

	if (cap & QLC_83XX_PVID_STRIP_CAPABILITY) {

		adapter->rx_pvid = 0;

	} else {

		adapter->rx_pvid = (cmd->rsp.arg[1] >> 16) & 0xffff;

		adapter->flags &= ~QLCNIC_TAGGING_ENABLED;

	}

	return 0;

}
@@ -432,12 +436,14 @@ static int qlcnic_sriov_set_guest_vlan_mode(struct qlcnic_adapter *adapter, 
	return 0;

}



static int qlcnic_sriov_get_vf_acl(struct qlcnic_adapter *adapter)

static int qlcnic_sriov_get_vf_acl(struct qlcnic_adapter *adapter,

				   struct qlcnic_info *info)

{

	struct qlcnic_sriov *sriov = adapter->ahw->sriov;

	struct qlcnic_cmd_args cmd;

	int ret;

	int ret, cap;



	cap = info->capabilities;

	ret = qlcnic_sriov_alloc_bc_mbx_args(&cmd, QLCNIC_BC_CMD_GET_ACL);

	if (ret)

		return ret;
@@ -453,7 +459,7 @@ static int qlcnic_sriov_get_vf_acl(struct qlcnic_adapter *adapter) 
			ret = qlcnic_sriov_set_guest_vlan_mode(adapter, &cmd);

			break;

		case QLC_PVID_MODE:

			ret = qlcnic_sriov_set_pvid_mode(adapter, &cmd);

			ret = qlcnic_sriov_set_pvid_mode(adapter, &cmd, cap);

			break;

		}

	}
@@ -476,7 +482,7 @@ static int qlcnic_sriov_vf_init_driver(struct qlcnic_adapter *adapter) 
	if (err)

		return -EIO;



	err = qlcnic_sriov_get_vf_acl(adapter);

	err = qlcnic_sriov_get_vf_acl(adapter, &nic_info);

	if (err)

		return err;