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

Commit 91bdc7a4 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Indicate support of multiple port types 



The device can support multiple port types, so don't return on first
match.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0213424a

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -1706,21 +1706,23 @@ static const struct mlxsw_sp_port_link_mode mlxsw_sp_port_link_mode[] = { 




static u32 mlxsw_sp_from_ptys_supported_port(u32 ptys_eth_proto)

static u32 mlxsw_sp_from_ptys_supported_port(u32 ptys_eth_proto)

{

{

	u32 modes = 0;



	if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR |

	if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR |

			      MLXSW_REG_PTYS_ETH_SPEED_10GBASE_SR |

			      MLXSW_REG_PTYS_ETH_SPEED_10GBASE_SR |

			      MLXSW_REG_PTYS_ETH_SPEED_40GBASE_CR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_40GBASE_CR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_40GBASE_SR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_40GBASE_SR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_100GBASE_SR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_100GBASE_SR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_SGMII))

			      MLXSW_REG_PTYS_ETH_SPEED_SGMII))

		return SUPPORTED_FIBRE;

		modes |= SUPPORTED_FIBRE;





	if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KR |

	if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KR |

			      MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KX4 |

			      MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KX4 |

			      MLXSW_REG_PTYS_ETH_SPEED_40GBASE_KR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_40GBASE_KR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_100GBASE_KR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_100GBASE_KR4 |

			      MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX))

			      MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX))

		return SUPPORTED_Backplane;

		modes |= SUPPORTED_Backplane;

	return 0;

	return modes;

}

}





static u32 mlxsw_sp_from_ptys_supported_link(u32 ptys_eth_proto)

static u32 mlxsw_sp_from_ptys_supported_link(u32 ptys_eth_proto)