Commit da203dfa authored by Vasundhara Volam's avatar Vasundhara Volam Committed by David S. Miller
Browse files

Revert "devlink: Add a generic wake_on_lan port parameter" 



This reverts commit b639583f.

As per discussion with Jakub Kicinski and Michal Kubecek,
this will be better addressed by soon-too-come ethtool netlink
API with additional indication that given configuration request
is supposed to be persisted.

Also, remove the parameter support from bnxt_en driver.

Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Michael Chan <michael.chan@broadcom.com>
Cc: Michal Kubecek <mkubecek@suse.cz>
Suggested-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e9c51b3

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+1 −18
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ static const struct bnxt_dl_nvm_param nvm_params[] = { 
	 NVM_OFF_MSIX_VEC_PER_PF_MIN, BNXT_NVM_SHARED_CFG, 7},

	{BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK, NVM_OFF_DIS_GRE_VER_CHECK,

	 BNXT_NVM_SHARED_CFG, 1},



	{DEVLINK_PARAM_GENERIC_ID_WOL, NVM_OFF_WOL, BNXT_NVM_PORT_CFG, 1},

};



static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
@@ -72,8 +70,7 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg, 
	bytesize = roundup(nvm_param.num_bits, BITS_PER_BYTE) / BITS_PER_BYTE;

	switch (bytesize) {

	case 1:

		if (nvm_param.num_bits == 1 &&

		    nvm_param.id != DEVLINK_PARAM_GENERIC_ID_WOL)

		if (nvm_param.num_bits == 1)

			buf = &val->vbool;

		else

			buf = &val->vu8;
@@ -167,17 +164,6 @@ static int bnxt_dl_msix_validate(struct devlink *dl, u32 id, 
	return 0;

}



static int bnxt_dl_wol_validate(struct devlink *dl, u32 id,

				union devlink_param_value val,

				struct netlink_ext_ack *extack)

{

	if (val.vu8 && val.vu8 != DEVLINK_PARAM_WAKE_MAGIC) {

		NL_SET_ERR_MSG_MOD(extack, "WOL type is not supported");

		return -EINVAL;

	}

	return 0;

}



static const struct devlink_param bnxt_dl_params[] = {

	DEVLINK_PARAM_GENERIC(ENABLE_SRIOV,

			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),
@@ -203,9 +189,6 @@ static const struct devlink_param bnxt_dl_params[] = { 
};



static const struct devlink_param bnxt_dl_port_params[] = {

	DEVLINK_PARAM_GENERIC(WOL, BIT(DEVLINK_PARAM_CMODE_PERMANENT),

			      bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,

			      bnxt_dl_wol_validate),

};



int bnxt_dl_register(struct bnxt *bp)

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl) 


#define NVM_OFF_MSIX_VEC_PER_PF_MAX	108

#define NVM_OFF_MSIX_VEC_PER_PF_MIN	114

#define NVM_OFF_WOL			152

#define NVM_OFF_IGNORE_ARI		164

#define NVM_OFF_DIS_GRE_VER_CHECK	171

#define NVM_OFF_ENABLE_SRIOV		401

include/net/devlink.h

+0 −8
Original line number Diff line number Diff line
@@ -370,17 +370,12 @@ enum devlink_param_generic_id { 
	DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,

	DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,

	DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,

	DEVLINK_PARAM_GENERIC_ID_WOL,



	/* add new param generic ids above here*/

	__DEVLINK_PARAM_GENERIC_ID_MAX,

	DEVLINK_PARAM_GENERIC_ID_MAX = __DEVLINK_PARAM_GENERIC_ID_MAX - 1,

};



enum devlink_param_wol_types {

	DEVLINK_PARAM_WAKE_MAGIC = (1 << 0),

};



#define DEVLINK_PARAM_GENERIC_INT_ERR_RESET_NAME "internal_error_reset"

#define DEVLINK_PARAM_GENERIC_INT_ERR_RESET_TYPE DEVLINK_PARAM_TYPE_BOOL
@@ -405,9 +400,6 @@ enum devlink_param_wol_types { 
#define DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME "fw_load_policy"

#define DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE DEVLINK_PARAM_TYPE_U8



#define DEVLINK_PARAM_GENERIC_WOL_NAME "wake_on_lan"

#define DEVLINK_PARAM_GENERIC_WOL_TYPE DEVLINK_PARAM_TYPE_U8



#define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate)	\

{									\

	.id = DEVLINK_PARAM_GENERIC_ID_##_id,				\

net/core/devlink.c

+0 −5
Original line number Diff line number Diff line
@@ -2701,11 +2701,6 @@ static const struct devlink_param devlink_param_generic[] = { 
		.name = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME,

		.type = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE,

	},

	{

		.id = DEVLINK_PARAM_GENERIC_ID_WOL,

		.name = DEVLINK_PARAM_GENERIC_WOL_NAME,

		.type = DEVLINK_PARAM_GENERIC_WOL_TYPE,

	},

};



static int devlink_param_generic_verify(const struct devlink_param *param)

CRA Git | Maintained and supported by SUSTech CRA and CCSE