Commit 7da3f901 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: mtk_eth_soc: correct 802.3z speed setting 



Phylink does not guarantee that state->speed will be set correctly in
the mac_config() call, so it's a bug that the driver makes use of it.
Moreover, it is making use of it in a function that is only ever called
for 1000BASE-X and 2500BASE-X which operate at a fixed speed which
happens to be the same setting irrespective of the interface mode. We
can simply remove the switch statement and just set the SGMII interface
speed.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bc5e93e0

drivers/net/ethernet/mediatek/mtk_sgmii.c

+5 −13
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *r, u32 ana_rgc3) 
	return 0;

}



/* For SGMII interface mode */

int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id)

{

	unsigned int val;
@@ -60,6 +61,9 @@ int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id) 
	return 0;

}



/* For 1000BASE-X and 2500BASE-X interface modes, which operate at a

 * fixed speed.

 */

int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,

			       const struct phylink_link_state *state)

{
@@ -82,19 +86,7 @@ int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id, 
	/* SGMII force mode setting */

	regmap_read(ss->regmap[id], SGMSYS_SGMII_MODE, &val);

	val &= ~SGMII_IF_MODE_MASK;



	switch (state->speed) {

	case SPEED_10:

		val |= SGMII_SPEED_10;

		break;

	case SPEED_100:

		val |= SGMII_SPEED_100;

		break;

	case SPEED_2500:

	case SPEED_1000:

	val |= SGMII_SPEED_1000;

		break;

	}



	if (state->duplex == DUPLEX_FULL)

		val |= SGMII_DUPLEX_FULL;