Commit 655cbb1d authored by Vadim Pasternak's avatar Vadim Pasternak Committed by Jakub Kicinski
Browse files

mlxsw: reg: Extend MCION register with new slot number field 



Extend MCION (Management Cable IO and Notifications Register) with new
field specifying the slot number. The purpose of this field is to
support access to MCION register for query cage transceiver on modular
system.

For non-modular systems the 'module' number uniquely identifies the
transceiver location. For modular systems the transceivers are
identified by two indexes:
- 'slot_index', specifying the slot number, where line card is located;
- 'module', specifying cage transceiver within the line card.

Signed-off-by: default avatarVadim Pasternak <vadimp@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 89dd6fcd

drivers/net/ethernet/mellanox/mlxsw/core_env.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ mlxsw_env_get_module_power_mode(struct mlxsw_core *mlxsw_core, u8 module, 


	params->policy = mlxsw_env->module_info[module].power_mode_policy;



	mlxsw_reg_mcion_pack(mcion_pl, module);

	mlxsw_reg_mcion_pack(mcion_pl, 0, module);

	err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mcion), mcion_pl);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "Failed to retrieve module's power mode");

drivers/net/ethernet/mellanox/mlxsw/reg.h

+8 −1
Original line number Diff line number Diff line
@@ -10521,6 +10521,12 @@ MLXSW_REG_DEFINE(mcion, MLXSW_REG_MCION_ID, MLXSW_REG_MCION_LEN); 
 */

MLXSW_ITEM32(reg, mcion, module, 0x00, 16, 8);



/* reg_mcion_slot_index

 * Slot index.

 * Access: Index

 */

MLXSW_ITEM32(reg, mcion, slot_index, 0x00, 12, 4);



enum {

	MLXSW_REG_MCION_MODULE_STATUS_BITS_PRESENT_MASK = BIT(0),

	MLXSW_REG_MCION_MODULE_STATUS_BITS_LOW_POWER_MASK = BIT(8),
@@ -10532,9 +10538,10 @@ enum { 
 */

MLXSW_ITEM32(reg, mcion, module_status_bits, 0x04, 0, 16);



static inline void mlxsw_reg_mcion_pack(char *payload, u8 module)

static inline void mlxsw_reg_mcion_pack(char *payload, u8 slot_index, u8 module)

{

	MLXSW_REG_ZERO(mcion, payload);

	mlxsw_reg_mcion_slot_index_set(payload, slot_index);

	mlxsw_reg_mcion_module_set(payload, module);

}