mlxsw: spectrum: Query port connector type from firmware (1e2f66ec) · Commits · 戴 / test

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -4061,6 +4061,24 @@ MLXSW_ITEM32(reg, ptys, ib_link_width_oper, 0x28, 16, 16);
		*/
		MLXSW_ITEM32(reg, ptys, ib_proto_oper, 0x28, 0, 16);

		enum mlxsw_reg_ptys_connector_type {
		MLXSW_REG_PTYS_CONNECTOR_TYPE_UNKNOWN_OR_NO_CONNECTOR,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_NONE,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_TP,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_AUI,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_BNC,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_MII,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_FIBRE,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_DA,
		MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_OTHER,
		};

		/* reg_ptys_connector_type
		* Connector type indication.
		* Access: RO
		*/
		MLXSW_ITEM32(reg, ptys, connector_type, 0x2C, 0, 4);

		static inline void mlxsw_reg_ptys_eth_pack(char *payload, u8 local_port,
		u32 proto_admin, bool autoneg)
		{

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

+31 −23

Original line number	Diff line number	Diff line
		@@ -2525,28 +2525,6 @@ out:
		cmd->base.duplex = duplex;
		}

		static u8 mlxsw_sp_port_connector_port(u32 ptys_eth_proto)
		{
		if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_SR \|
		MLXSW_REG_PTYS_ETH_SPEED_40GBASE_SR4 \|
		MLXSW_REG_PTYS_ETH_SPEED_100GBASE_SR4 \|
		MLXSW_REG_PTYS_ETH_SPEED_SGMII))
		return PORT_FIBRE;

		if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR \|
		MLXSW_REG_PTYS_ETH_SPEED_40GBASE_CR4 \|
		MLXSW_REG_PTYS_ETH_SPEED_100GBASE_CR4))
		return PORT_DA;

		if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KR \|
		MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KX4 \|
		MLXSW_REG_PTYS_ETH_SPEED_40GBASE_KR4 \|
		MLXSW_REG_PTYS_ETH_SPEED_100GBASE_KR4))
		return PORT_NONE;

		return PORT_OTHER;
		}

		static u32
		mlxsw_sp_to_ptys_advert_link(const struct ethtool_link_ksettings *cmd)
		{
		@@ -2606,6 +2584,34 @@ static void mlxsw_sp_port_get_link_advertise(u32 eth_proto_admin, bool autoneg,
		mlxsw_sp_from_ptys_link(eth_proto_admin, cmd->link_modes.advertising);
		}

		static u8
		mlxsw_sp_port_connector_port(enum mlxsw_reg_ptys_connector_type connector_type)
		{
		switch (connector_type) {
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_UNKNOWN_OR_NO_CONNECTOR:
		return PORT_OTHER;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_NONE:
		return PORT_NONE;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_TP:
		return PORT_TP;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_AUI:
		return PORT_AUI;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_BNC:
		return PORT_BNC;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_MII:
		return PORT_MII;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_FIBRE:
		return PORT_FIBRE;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_DA:
		return PORT_DA;
		case MLXSW_REG_PTYS_CONNECTOR_TYPE_PORT_OTHER:
		return PORT_OTHER;
		default:
		WARN_ON_ONCE(1);
		return PORT_OTHER;
		}
		}

		static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev,
		struct ethtool_link_ksettings *cmd)
		{
		@@ -2613,6 +2619,7 @@ static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev,
		struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
		struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
		char ptys_pl[MLXSW_REG_PTYS_LEN];
		u8 connector_type;
		u8 autoneg_status;
		bool autoneg;
		int err;
		@@ -2632,7 +2639,8 @@ static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev,
		autoneg_status = mlxsw_reg_ptys_an_status_get(ptys_pl);

		cmd->base.autoneg = autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
		cmd->base.port = mlxsw_sp_port_connector_port(eth_proto_oper);
		connector_type = mlxsw_reg_ptys_connector_type_get(ptys_pl);
		cmd->base.port = mlxsw_sp_port_connector_port(connector_type);
		mlxsw_sp_from_ptys_speed_duplex(netif_carrier_ok(dev), eth_proto_oper,
		cmd);

Admin message