Skip to content

L
linux
Commit 2cb6d63b authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files
Options

net: phy: marvell10g: table driven mactype decode 

Replace the code-based mactype decode with a table driven approach.
This will allow us to fill in the possible_interfaces cleanly.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1r6VHq-00DDLT-In@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 243ad8df
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 77 deletions
drivers/net/phy/marvell10g.c
View file @ 2cb6d63b
...@@ -141,13 +141,21 @@ enum { ...@@ -141,13 +141,21 @@ enum {
MV_V2_TEMP_UNKNOWN = 0x9600, /* unknown function */ MV_V2_TEMP_UNKNOWN = 0x9600, /* unknown function */
}; };
struct mv3310_mactype {
bool valid;
bool fixed_interface;
phy_interface_t interface_10g;
};
struct mv3310_chip { struct mv3310_chip {
bool (*has_downshift)(struct phy_device *phydev); bool (*has_downshift)(struct phy_device *phydev);
void (*init_supported_interfaces)(unsigned long *mask); void (*init_supported_interfaces)(unsigned long *mask);
int (*get_mactype)(struct phy_device *phydev); int (*get_mactype)(struct phy_device *phydev);
int (*set_mactype)(struct phy_device *phydev, int mactype); int (*set_mactype)(struct phy_device *phydev, int mactype);
int (*select_mactype)(unsigned long *interfaces); int (*select_mactype)(unsigned long *interfaces);
int (*init_interface)(struct phy_device *phydev, int mactype);
const struct mv3310_mactype *mactypes;
size_t n_mactypes;
#ifdef CONFIG_HWMON #ifdef CONFIG_HWMON
int (*hwmon_read_temp_reg)(struct phy_device *phydev); int (*hwmon_read_temp_reg)(struct phy_device *phydev);
...@@ -156,11 +164,10 @@ struct mv3310_chip { ...@@ -156,11 +164,10 @@ struct mv3310_chip {
struct mv3310_priv { struct mv3310_priv {
DECLARE_BITMAP(supported_interfaces, PHY_INTERFACE_MODE_MAX); DECLARE_BITMAP(supported_interfaces, PHY_INTERFACE_MODE_MAX);
const struct mv3310_mactype *mactype;
u32 firmware_ver; u32 firmware_ver;
bool has_downshift; bool has_downshift;
bool rate_match;
phy_interface_t const_interface;
struct device *hwmon_dev; struct device *hwmon_dev;
char *hwmon_name; char *hwmon_name;
...@@ -702,71 +709,99 @@ static int mv3310_select_mactype(unsigned long *interfaces) ...@@ -702,71 +709,99 @@ static int mv3310_select_mactype(unsigned long *interfaces)
return -1; return -1;
} }
static int mv2110_init_interface(struct phy_device *phydev, int mactype) static const struct mv3310_mactype mv2110_mactypes[] = {
{ [MV_PMA_21X0_PORT_CTRL_MACTYPE_USXGMII] = {
struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev); .valid = true,
.fixed_interface = true,
priv->rate_match = false; .interface_10g = PHY_INTERFACE_MODE_USXGMII,
},
if (mactype == MV_PMA_21X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH) [MV_PMA_21X0_PORT_CTRL_MACTYPE_5GBASER] = {
priv->rate_match = true; .valid = true,
.interface_10g = PHY_INTERFACE_MODE_NA,
if (mactype == MV_PMA_21X0_PORT_CTRL_MACTYPE_USXGMII) },
priv->const_interface = PHY_INTERFACE_MODE_USXGMII; [MV_PMA_21X0_PORT_CTRL_MACTYPE_5GBASER_NO_SGMII_AN] = {
else if (mactype == MV_PMA_21X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH) .valid = true,
priv->const_interface = PHY_INTERFACE_MODE_10GBASER; .interface_10g = PHY_INTERFACE_MODE_NA,
else if (mactype == MV_PMA_21X0_PORT_CTRL_MACTYPE_5GBASER || },
mactype == MV_PMA_21X0_PORT_CTRL_MACTYPE_5GBASER_NO_SGMII_AN) [MV_PMA_21X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH] = {
priv->const_interface = PHY_INTERFACE_MODE_NA; .valid = true,
else .fixed_interface = true,
return -EINVAL; .interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
return 0; };
}
static int mv3310_init_interface(struct phy_device *phydev, int mactype)
{
struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev);
priv->rate_match = false;
if (mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH ||
mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI_RATE_MATCH ||
mactype == MV_V2_3310_PORT_CTRL_MACTYPE_XAUI_RATE_MATCH)
priv->rate_match = true;
if (mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_USXGMII)
priv->const_interface = PHY_INTERFACE_MODE_USXGMII;
else if (mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH ||
mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_NO_SGMII_AN ||
mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER)
priv->const_interface = PHY_INTERFACE_MODE_10GBASER;
else if (mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI_RATE_MATCH ||
mactype == MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI)
priv->const_interface = PHY_INTERFACE_MODE_RXAUI;
else if (mactype == MV_V2_3310_PORT_CTRL_MACTYPE_XAUI_RATE_MATCH ||
mactype == MV_V2_3310_PORT_CTRL_MACTYPE_XAUI)
priv->const_interface = PHY_INTERFACE_MODE_XAUI;
else
return -EINVAL;
return 0;
}
static int mv3340_init_interface(struct phy_device *phydev, int mactype)
{
struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev);
int err = 0;
priv->rate_match = false;
if (mactype == MV_V2_3340_PORT_CTRL_MACTYPE_RXAUI_NO_SGMII_AN) static const struct mv3310_mactype mv3310_mactypes[] = {
priv->const_interface = PHY_INTERFACE_MODE_RXAUI; [MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI] = {
else .valid = true,
err = mv3310_init_interface(phydev, mactype); .interface_10g = PHY_INTERFACE_MODE_RXAUI,
},
[MV_V2_3310_PORT_CTRL_MACTYPE_XAUI_RATE_MATCH] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_XAUI,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI_RATE_MATCH] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_RXAUI,
},
[MV_V2_3310_PORT_CTRL_MACTYPE_XAUI] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_XAUI,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_NO_SGMII_AN] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_USXGMII] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_USXGMII,
},
};
return err; static const struct mv3310_mactype mv3340_mactypes[] = {
} [MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_RXAUI,
},
[MV_V2_3340_PORT_CTRL_MACTYPE_RXAUI_NO_SGMII_AN] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_RXAUI,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI_RATE_MATCH] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_RXAUI,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_NO_SGMII_AN] = {
.valid = true,
.interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_10GBASER,
},
[MV_V2_33X0_PORT_CTRL_MACTYPE_USXGMII] = {
.valid = true,
.fixed_interface = true,
.interface_10g = PHY_INTERFACE_MODE_USXGMII,
},
};
static int mv3310_config_init(struct phy_device *phydev) static int mv3310_config_init(struct phy_device *phydev)
{ {
...@@ -803,12 +838,13 @@ static int mv3310_config_init(struct phy_device *phydev) ...@@ -803,12 +838,13 @@ static int mv3310_config_init(struct phy_device *phydev)
if (mactype < 0) if (mactype < 0)
return mactype; return mactype;
err = chip->init_interface(phydev, mactype); if (mactype >= chip->n_mactypes || !chip->mactypes[mactype].valid) {
if (err) {
phydev_err(phydev, "MACTYPE configuration invalid\n"); phydev_err(phydev, "MACTYPE configuration invalid\n");
return err; return -EINVAL;
} }
priv->mactype = &chip->mactypes[mactype];
/* Enable EDPD mode - saving 600mW */ /* Enable EDPD mode - saving 600mW */
err = mv3310_set_edpd(phydev, ETHTOOL_PHY_EDPD_DFLT_TX_MSECS); err = mv3310_set_edpd(phydev, ETHTOOL_PHY_EDPD_DFLT_TX_MSECS);
if (err) if (err)
...@@ -935,9 +971,8 @@ static void mv3310_update_interface(struct phy_device *phydev) ...@@ -935,9 +971,8 @@ static void mv3310_update_interface(struct phy_device *phydev)
* *
* In USXGMII mode the PHY interface mode is also fixed. * In USXGMII mode the PHY interface mode is also fixed.
*/ */
if (priv->rate_match || if (priv->mactype->fixed_interface) {
priv->const_interface == PHY_INTERFACE_MODE_USXGMII) { phydev->interface = priv->mactype->interface_10g;
phydev->interface = priv->const_interface;
return; return;
} }
...@@ -949,7 +984,7 @@ static void mv3310_update_interface(struct phy_device *phydev) ...@@ -949,7 +984,7 @@ static void mv3310_update_interface(struct phy_device *phydev)
*/ */
switch (phydev->speed) { switch (phydev->speed) {
case SPEED_10000: case SPEED_10000:
phydev->interface = priv->const_interface; phydev->interface = priv->mactype->interface_10g;
break; break;
case SPEED_5000: case SPEED_5000:
phydev->interface = PHY_INTERFACE_MODE_5GBASER; phydev->interface = PHY_INTERFACE_MODE_5GBASER;
...@@ -1163,7 +1198,9 @@ static const struct mv3310_chip mv3310_type = { ...@@ -1163,7 +1198,9 @@ static const struct mv3310_chip mv3310_type = {
.get_mactype = mv3310_get_mactype, .get_mactype = mv3310_get_mactype,
.set_mactype = mv3310_set_mactype, .set_mactype = mv3310_set_mactype,
.select_mactype = mv3310_select_mactype, .select_mactype = mv3310_select_mactype,
.init_interface = mv3310_init_interface,
.mactypes = mv3310_mactypes,
.n_mactypes = ARRAY_SIZE(mv3310_mactypes),
#ifdef CONFIG_HWMON #ifdef CONFIG_HWMON
.hwmon_read_temp_reg = mv3310_hwmon_read_temp_reg, .hwmon_read_temp_reg = mv3310_hwmon_read_temp_reg,
...@@ -1176,7 +1213,9 @@ static const struct mv3310_chip mv3340_type = { ...@@ -1176,7 +1213,9 @@ static const struct mv3310_chip mv3340_type = {
.get_mactype = mv3310_get_mactype, .get_mactype = mv3310_get_mactype,
.set_mactype = mv3310_set_mactype, .set_mactype = mv3310_set_mactype,
.select_mactype = mv3310_select_mactype, .select_mactype = mv3310_select_mactype,
.init_interface = mv3340_init_interface,
.mactypes = mv3340_mactypes,
.n_mactypes = ARRAY_SIZE(mv3340_mactypes),
#ifdef CONFIG_HWMON #ifdef CONFIG_HWMON
.hwmon_read_temp_reg = mv3310_hwmon_read_temp_reg, .hwmon_read_temp_reg = mv3310_hwmon_read_temp_reg,
...@@ -1188,7 +1227,9 @@ static const struct mv3310_chip mv2110_type = { ...@@ -1188,7 +1227,9 @@ static const struct mv3310_chip mv2110_type = {
.get_mactype = mv2110_get_mactype, .get_mactype = mv2110_get_mactype,
.set_mactype = mv2110_set_mactype, .set_mactype = mv2110_set_mactype,
.select_mactype = mv2110_select_mactype, .select_mactype = mv2110_select_mactype,
.init_interface = mv2110_init_interface,
.mactypes = mv2110_mactypes,
.n_mactypes = ARRAY_SIZE(mv2110_mactypes),
#ifdef CONFIG_HWMON #ifdef CONFIG_HWMON
.hwmon_read_temp_reg = mv2110_hwmon_read_temp_reg, .hwmon_read_temp_reg = mv2110_hwmon_read_temp_reg,
...@@ -1200,7 +1241,9 @@ static const struct mv3310_chip mv2111_type = { ...@@ -1200,7 +1241,9 @@ static const struct mv3310_chip mv2111_type = {
.get_mactype = mv2110_get_mactype, .get_mactype = mv2110_get_mactype,
.set_mactype = mv2110_set_mactype, .set_mactype = mv2110_set_mactype,
.select_mactype = mv2110_select_mactype, .select_mactype = mv2110_select_mactype,
.init_interface = mv2110_init_interface,
.mactypes = mv2110_mactypes,
.n_mactypes = ARRAY_SIZE(mv2110_mactypes),
#ifdef CONFIG_HWMON #ifdef CONFIG_HWMON
.hwmon_read_temp_reg = mv2110_hwmon_read_temp_reg, .hwmon_read_temp_reg = mv2110_hwmon_read_temp_reg,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7