diff options
| author | Vadim Pasternak | 2016-11-16 15:20:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-11-17 05:29:04 +0100 |
| commit | c711e27a1851c5efe9eb43365d6a3ffaf6d5f37f (patch) | |
| tree | 5b4f744f6eacd60b20535055ec4c3012f941019f /drivers/net/ethernet/mellanox/mlxsw/core.c | |
| parent | net: netcp: replace IS_ERR_OR_NULL by IS_ERR (diff) | |
| download | kernel-qcow2-linux-c711e27a1851c5efe9eb43365d6a3ffaf6d5f37f.tar.gz kernel-qcow2-linux-c711e27a1851c5efe9eb43365d6a3ffaf6d5f37f.tar.xz kernel-qcow2-linux-c711e27a1851c5efe9eb43365d6a3ffaf6d5f37f.zip | |
mlxsw: Add bus capability flag
The mlxsw core infrastructure currently assumes that communication with
the ASIC is always possible using Ethernet management datagrams (EMADs),
but this is only possible when the PCI bus is used.
The bus capability flag is added to indicate EMAD support and make core
initialize EMAD communication only when it's set. Otherwise, register
access is done using command interface.
Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/core.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 600481771c04..4f7c478a595b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -598,6 +598,9 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) u64 tid; int err; + if (!(mlxsw_core->bus->features & MLXSW_BUS_F_TXRX)) + return 0; + /* Set the upper 32 bits of the transaction ID field to a random * number. This allows us to discard EMADs addressed to other * devices. @@ -634,6 +637,9 @@ static void mlxsw_emad_fini(struct mlxsw_core *mlxsw_core) { char hpkt_pl[MLXSW_REG_HPKT_LEN]; + if (!(mlxsw_core->bus->features & MLXSW_BUS_F_TXRX)) + return; + mlxsw_core->emad.use_emad = false; mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_DISCARD, MLXSW_TRAP_ID_ETHEMAD); |