Commit 72e2e2f5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-net-add-negotiation-of-in-band-capabilities-remainder' 

Russell King says:

====================
net: net: add negotiation of in-band capabilities (remainder)

Here are the last three patches which were not included in the non-RFC
posting, but were in the RFC posting. These add the .pcs_inband()
method to the Lynx, MTK Lynx and XPCS drivers.
====================

Link: https://patch.msgid.link/Z1F1b8eh8s8T627j@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3ca459ea 484d0170

drivers/net/pcs/pcs-lynx.c

+22 −0
Original line number Diff line number Diff line
@@ -35,6 +35,27 @@ enum sgmii_speed { 
#define phylink_pcs_to_lynx(pl_pcs) container_of((pl_pcs), struct lynx_pcs, pcs)

#define lynx_to_phylink_pcs(lynx) (&(lynx)->pcs)



static unsigned int lynx_pcs_inband_caps(struct phylink_pcs *pcs,

					 phy_interface_t interface)

{

	switch (interface) {

	case PHY_INTERFACE_MODE_1000BASEX:

	case PHY_INTERFACE_MODE_SGMII:

	case PHY_INTERFACE_MODE_QSGMII:

		return LINK_INBAND_DISABLE | LINK_INBAND_ENABLE;



	case PHY_INTERFACE_MODE_10GBASER:

	case PHY_INTERFACE_MODE_2500BASEX:

		return LINK_INBAND_DISABLE;



	case PHY_INTERFACE_MODE_USXGMII:

		return LINK_INBAND_ENABLE;



	default:

		return 0;

	}

}



static void lynx_pcs_get_state_usxgmii(struct mdio_device *pcs,

				       struct phylink_link_state *state)

{
@@ -306,6 +327,7 @@ static void lynx_pcs_link_up(struct phylink_pcs *pcs, unsigned int neg_mode, 
}



static const struct phylink_pcs_ops lynx_pcs_phylink_ops = {

	.pcs_inband_caps = lynx_pcs_inband_caps,

	.pcs_get_state = lynx_pcs_get_state,

	.pcs_config = lynx_pcs_config,

	.pcs_an_restart = lynx_pcs_an_restart,

drivers/net/pcs/pcs-mtk-lynxi.c

+16 −0
Original line number Diff line number Diff line
@@ -88,6 +88,21 @@ static struct mtk_pcs_lynxi *pcs_to_mtk_pcs_lynxi(struct phylink_pcs *pcs) 
	return container_of(pcs, struct mtk_pcs_lynxi, pcs);

}



static unsigned int mtk_pcs_lynxi_inband_caps(struct phylink_pcs *pcs,

					      phy_interface_t interface)

{

	switch (interface) {

	case PHY_INTERFACE_MODE_1000BASEX:

	case PHY_INTERFACE_MODE_2500BASEX:

	case PHY_INTERFACE_MODE_SGMII:

	case PHY_INTERFACE_MODE_QSGMII:

		return LINK_INBAND_DISABLE | LINK_INBAND_ENABLE;



	default:

		return 0;

	}

}



static void mtk_pcs_lynxi_get_state(struct phylink_pcs *pcs,

				    struct phylink_link_state *state)

{
@@ -241,6 +256,7 @@ static void mtk_pcs_lynxi_disable(struct phylink_pcs *pcs) 
}



static const struct phylink_pcs_ops mtk_pcs_lynxi_ops = {

	.pcs_inband_caps = mtk_pcs_lynxi_inband_caps,

	.pcs_get_state = mtk_pcs_lynxi_get_state,

	.pcs_config = mtk_pcs_lynxi_config,

	.pcs_an_restart = mtk_pcs_lynxi_restart_an,

drivers/net/pcs/pcs-xpcs.c

+28 −0
Original line number Diff line number Diff line
@@ -567,6 +567,33 @@ static int xpcs_validate(struct phylink_pcs *pcs, unsigned long *supported, 
	return 0;

}



static unsigned int xpcs_inband_caps(struct phylink_pcs *pcs,

				     phy_interface_t interface)

{

	struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);

	const struct dw_xpcs_compat *compat;



	compat = xpcs_find_compat(xpcs, interface);

	if (!compat)

		return 0;



	switch (compat->an_mode) {

	case DW_AN_C73:

		return LINK_INBAND_ENABLE;



	case DW_AN_C37_SGMII:

	case DW_AN_C37_1000BASEX:

		return LINK_INBAND_DISABLE | LINK_INBAND_ENABLE;



	case DW_10GBASER:

	case DW_2500BASEX:

		return LINK_INBAND_DISABLE;



	default:

		return 0;

	}

}



void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces)

{

	const struct dw_xpcs_compat *compat;
@@ -1306,6 +1333,7 @@ static const struct dw_xpcs_desc xpcs_desc_list[] = { 


static const struct phylink_pcs_ops xpcs_phylink_ops = {

	.pcs_validate = xpcs_validate,

	.pcs_inband_caps = xpcs_inband_caps,

	.pcs_pre_config = xpcs_pre_config,

	.pcs_config = xpcs_config,

	.pcs_get_state = xpcs_get_state,