Commit 1a3ca250 authored by Sudarsana Reddy Kalluru's avatar Sudarsana Reddy Kalluru Committed by David S. Miller
Browse files

qed: Define new MF bit for no_vlan config 



The patch introduces a new Multi-Function bit for cases where firmware
shouldn't perform the insertion of vlan-0 tag. The new bit is defined to
abstract the implementation from the actual MF mode.

Signed-off-by: default avatarSudarsana Reddy Kalluru <skalluru@marvell.com>
Signed-off-by: default avatarAriel Elior <aelior@marvell.com>
Signed-off-by: default avatarMichal Kalderon <mkalderon@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a88381de

drivers/net/ethernet/qlogic/qed/qed.h

+3 −0
Original line number Diff line number Diff line
@@ -492,6 +492,9 @@ enum qed_mf_mode_bit { 


	/* Allow DSCP to TC mapping */

	QED_MF_DSCP_TO_TC_MAP,



	/* Do not insert a vlan tag with id 0 */

	QED_MF_DONT_ADD_VLAN0_TAG,

};



enum qed_ufp_mode {

drivers/net/ethernet/qlogic/qed/qed_dcbx.c

+1 −3
Original line number Diff line number Diff line
@@ -204,9 +204,7 @@ qed_dcbx_set_params(struct qed_dcbx_results *p_data, 
	else

		p_data->arr[type].update = DONT_UPDATE_DCB_DSCP;



	/* Do not add vlan tag 0 when DCB is enabled and port in UFP/OV mode */

	if ((test_bit(QED_MF_8021Q_TAGGING, &p_hwfn->cdev->mf_bits) ||

	     test_bit(QED_MF_8021AD_TAGGING, &p_hwfn->cdev->mf_bits)))

	if (test_bit(QED_MF_DONT_ADD_VLAN0_TAG, &p_hwfn->cdev->mf_bits))

		p_data->arr[type].dont_add_vlan0 = true;



	/* QM reconf data */

drivers/net/ethernet/qlogic/qed/qed_dev.c

+4 −2
Original line number Diff line number Diff line
@@ -3157,12 +3157,14 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
			cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) |

					BIT(QED_MF_LLH_PROTO_CLSS) |

					BIT(QED_MF_UFP_SPECIFIC) |

					BIT(QED_MF_8021Q_TAGGING);

					BIT(QED_MF_8021Q_TAGGING) |

					BIT(QED_MF_DONT_ADD_VLAN0_TAG);

			break;

		case NVM_CFG1_GLOB_MF_MODE_BD:

			cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) |

					BIT(QED_MF_LLH_PROTO_CLSS) |

					BIT(QED_MF_8021AD_TAGGING);

					BIT(QED_MF_8021AD_TAGGING) |

					BIT(QED_MF_DONT_ADD_VLAN0_TAG);

			break;

		case NVM_CFG1_GLOB_MF_MODE_NPAR1_0:

			cdev->mf_bits = BIT(QED_MF_LLH_MAC_CLSS) |

CRA Git | Maintained and supported by SUSTech CRA and CCSE