Hello,
On Wed, Nov 17, 2021 at 11:50:50PM +0100, Marek Behún wrote:
> From: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
>
> Select the host interface configuration according to the capabilities of
> the host.
>
> This allows the kernel to:
> - support SFP modules with 88X33X0 or 88E21X0 inside them
> - switch interface modes when the PHY is used with the mvpp2 MAC
> (e.g. on MacchiatoBIN)
>
> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
> [ rebase, updated, also added support for 88E21X0 ]
> Signed-off-by: Marek Behún <kabel@xxxxxxxxxx>
> ---
> drivers/net/phy/marvell10g.c | 120 +++++++++++++++++++++++++++++++++--
> 1 file changed, 115 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
> index 0cb9b4ef09c7..94bea1bade6f 100644
> --- a/drivers/net/phy/marvell10g.c
> +++ b/drivers/net/phy/marvell10g.c
> @@ -96,6 +96,11 @@ enum {
> MV_PCS_PORT_INFO_NPORTS_MASK = 0x0380,
> MV_PCS_PORT_INFO_NPORTS_SHIFT = 7,
>
> + /* SerDes reinitialization 88E21X0 */
> + MV_AN_21X0_SERDES_CTRL2 = 0x800f,
> + MV_AN_21X0_SERDES_CTRL2_AUTO_INIT_DIS = BIT(13),
> + MV_AN_21X0_SERDES_CTRL2_RUN_INIT = BIT(15),
> +
> /* These registers appear at 0x800X and 0xa00X - the 0xa00X control
> * registers appear to set themselves to the 0x800X when AN is
> * restarted, but status registers appear readable from either.
> @@ -140,6 +145,8 @@ struct mv3310_chip {
> bool (*has_downshift)(struct phy_device *phydev);
> void (*init_supported_interfaces)(unsigned long *mask);
> int (*get_mactype)(struct phy_device *phydev);
> + int (*set_mactype)(struct phy_device *phydev, int mactype);
> + int (*select_mactype)(unsigned long *interfaces);
> int (*init_interface)(struct phy_device *phydev, int mactype);
>
> #ifdef CONFIG_HWMON
> @@ -593,6 +600,49 @@ static int mv2110_get_mactype(struct phy_device *phydev)
> return mactype & MV_PMA_21X0_PORT_CTRL_MACTYPE_MASK;
> }
>
> +static int mv2110_set_mactype(struct phy_device *phydev, int mactype)
> +{
> + int err, val;
> +
> + mactype &= MV_PMA_21X0_PORT_CTRL_MACTYPE_MASK;
> + err = phy_modify_mmd(phydev, MDIO_MMD_PMAPMD, MV_PMA_21X0_PORT_CTRL,
> + MV_PMA_21X0_PORT_CTRL_SWRST |
> + MV_PMA_21X0_PORT_CTRL_MACTYPE_MASK,
> + MV_PMA_21X0_PORT_CTRL_SWRST | mactype);
> + if (err)
> + return err;
> +
> + err = phy_set_bits_mmd(phydev, MDIO_MMD_AN, MV_AN_21X0_SERDES_CTRL2,
> + MV_AN_21X0_SERDES_CTRL2_AUTO_INIT_DIS |
> + MV_AN_21X0_SERDES_CTRL2_RUN_INIT);
> + if (err)
> + return err;
> +
> + err = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_AN,
> + MV_AN_21X0_SERDES_CTRL2, val,
> + !(val &
> + MV_AN_21X0_SERDES_CTRL2_RUN_INIT),
> + 5000, 100000, true);
> + if (err)
> + return err;
> +
> + return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, MV_AN_21X0_SERDES_CTRL2,
> + MV_AN_21X0_SERDES_CTRL2_AUTO_INIT_DIS);
> +}
> +
> +static int mv2110_select_mactype(unsigned long *interfaces)
> +{
> + if (test_bit(PHY_INTERFACE_MODE_USXGMII, interfaces))
> + return MV_PMA_21X0_PORT_CTRL_MACTYPE_USXGMII;
> + else if (test_bit(PHY_INTERFACE_MODE_SGMII, interfaces) &&
> + !test_bit(PHY_INTERFACE_MODE_10GBASER, interfaces))
> + return MV_PMA_21X0_PORT_CTRL_MACTYPE_5GBASER;
> + else if (test_bit(PHY_INTERFACE_MODE_10GBASER, interfaces))
> + return MV_PMA_21X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH;
> + else
> + return -1;
> +}
> +
> static int mv3310_get_mactype(struct phy_device *phydev)
> {
> int mactype;
> @@ -604,6 +654,46 @@ static int mv3310_get_mactype(struct phy_device *phydev)
> return mactype & MV_V2_33X0_PORT_CTRL_MACTYPE_MASK;
> }
>
> +static int mv3310_set_mactype(struct phy_device *phydev, int mactype)
> +{
> + int ret;
> +
> + mactype &= MV_V2_33X0_PORT_CTRL_MACTYPE_MASK;
> + ret = phy_modify_mmd_changed(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,
> + MV_V2_33X0_PORT_CTRL_MACTYPE_MASK,
> + mactype);
> + if (ret <= 0)
> + return ret;
> +
> + return phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,
> + MV_V2_33X0_PORT_CTRL_SWRST);
> +}
> +
> +static int mv3310_select_mactype(unsigned long *interfaces)
> +{
> + if (test_bit(PHY_INTERFACE_MODE_USXGMII, interfaces))
> + return MV_V2_33X0_PORT_CTRL_MACTYPE_USXGMII;
> + else if (test_bit(PHY_INTERFACE_MODE_SGMII, interfaces) &&
> + test_bit(PHY_INTERFACE_MODE_10GBASER, interfaces))
> + return MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER;
> + else if (test_bit(PHY_INTERFACE_MODE_SGMII, interfaces) &&
> + test_bit(PHY_INTERFACE_MODE_RXAUI, interfaces))
> + return MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI;
> + else if (test_bit(PHY_INTERFACE_MODE_SGMII, interfaces) &&
> + test_bit(PHY_INTERFACE_MODE_XAUI, interfaces))
> + return MV_V2_3310_PORT_CTRL_MACTYPE_XAUI;
> + else if (test_bit(PHY_INTERFACE_MODE_10GBASER, interfaces))
> + return MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH;
> + else if (test_bit(PHY_INTERFACE_MODE_RXAUI, interfaces))
> + return MV_V2_33X0_PORT_CTRL_MACTYPE_RXAUI_RATE_MATCH;
> + else if (test_bit(PHY_INTERFACE_MODE_XAUI, interfaces))
> + return MV_V2_3310_PORT_CTRL_MACTYPE_XAUI_RATE_MATCH;
> + else if (test_bit(PHY_INTERFACE_MODE_SGMII, interfaces))
> + return MV_V2_33X0_PORT_CTRL_MACTYPE_10GBASER;
> + else
> + return -1;
> +}
> +
I would like to understand this heuristic better. Both its purpose and
its implementation.
It says:
(a) If the intersection between interface modes supported by the MAC and
the PHY contains USXGMII, then use USXGMII as a MACTYPE
(b) Otherwise, if the intersection contains both 10GBaseR and SGMII, then
use 10GBaseR as MACTYPE
(...)
(c) Otherwise, if the intersection contains just 10GBaseR (no SGMII), then
use 10GBaseR with rate matching as MACTYPE
(...)
(d) Otherwise, if the intersection contains just SGMII (no 10GBaseR), then
use 10GBaseR as MACTYPE (no rate matching).
First of all, what is MACTYPE exactly? And what is the purpose of
changing it? What would happen if this configuration remained fixed, as
it were?
I see there is no MACTYPE definition for SGMII. Why is that? How does
the PHY choose to use SGMII?
Why is item (d) correct - use 10GBaseR as MACTYPE if the intersection
only supports SGMII?
A breakdown per link speed might be helpful in understanding the
configurations being performed here.
> static int mv2110_init_interface(struct phy_device *phydev, int mactype)
> {
> struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev);
> @@ -674,10 +764,16 @@ static int mv3310_config_init(struct phy_device *phydev)
> {
> struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev);
> const struct mv3310_chip *chip = to_mv3310_chip(phydev);
> + DECLARE_PHY_INTERFACE_MASK(interfaces);
> int err, mactype;
>
> - /* Check that the PHY interface type is compatible */
> - if (!test_bit(phydev->interface, priv->supported_interfaces))
> + /* In case host didn't provide supported interfaces */
> + __set_bit(phydev->interface, phydev->host_interfaces);
Shouldn't phylib populate phydev->host_interfaces with
phydev->interface, rather than requiring PHY drivers to do it?
> +
> + /* Check that there is at least one compatible PHY interface type */
> + phy_interface_and(interfaces, phydev->host_interfaces,
> + priv->supported_interfaces);
> + if (phy_interface_empty(interfaces))
> return -ENODEV;
>
> phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
> @@ -687,9 +783,15 @@ static int mv3310_config_init(struct phy_device *phydev)
> if (err)
> return err;
>
> - mactype = chip->get_mactype(phydev);
> - if (mactype < 0)
> - return mactype;
> + mactype = chip->select_mactype(interfaces);
> + if (mactype < 0) {
> + mactype = chip->get_mactype(phydev);
> + } else {
> + phydev_info(phydev, "Changing MACTYPE to %i\n", mactype);
> + err = chip->set_mactype(phydev, mactype);
> + if (err)
> + return err;
> + }
>
> err = chip->init_interface(phydev, mactype);
> if (err) {
> @@ -1049,6 +1151,8 @@ static const struct mv3310_chip mv3310_type = {
> .has_downshift = mv3310_has_downshift,
> .init_supported_interfaces = mv3310_init_supported_interfaces,
> .get_mactype = mv3310_get_mactype,
> + .set_mactype = mv3310_set_mactype,
> + .select_mactype = mv3310_select_mactype,
> .init_interface = mv3310_init_interface,
>
> #ifdef CONFIG_HWMON
> @@ -1060,6 +1164,8 @@ static const struct mv3310_chip mv3340_type = {
> .has_downshift = mv3310_has_downshift,
> .init_supported_interfaces = mv3340_init_supported_interfaces,
> .get_mactype = mv3310_get_mactype,
> + .set_mactype = mv3310_set_mactype,
> + .select_mactype = mv3310_select_mactype,
> .init_interface = mv3340_init_interface,
>
> #ifdef CONFIG_HWMON
> @@ -1070,6 +1176,8 @@ static const struct mv3310_chip mv3340_type = {
> static const struct mv3310_chip mv2110_type = {
> .init_supported_interfaces = mv2110_init_supported_interfaces,
> .get_mactype = mv2110_get_mactype,
> + .set_mactype = mv2110_set_mactype,
> + .select_mactype = mv2110_select_mactype,
> .init_interface = mv2110_init_interface,
>
> #ifdef CONFIG_HWMON
> @@ -1080,6 +1188,8 @@ static const struct mv3310_chip mv2110_type = {
> static const struct mv3310_chip mv2111_type = {
> .init_supported_interfaces = mv2111_init_supported_interfaces,
> .get_mactype = mv2110_get_mactype,
> + .set_mactype = mv2110_set_mactype,
> + .select_mactype = mv2110_select_mactype,
> .init_interface = mv2110_init_interface,
>
> #ifdef CONFIG_HWMON
> --
> 2.32.0
>
