lkml.org 
[lkml]   [2019]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 05/15] net: mvpp2: reconfiguring the port interface is PPv2.2 specific
    Date
    This patch adds a check on the PPv2 version in-use not to reconfigure
    the port mode when an interface is updated when using PPv2.1 as the
    functions called are PPv2.2 specific.

    Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
    ---
    drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    index 71a3fdb76b12..204cae75a05b 100644
    --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    @@ -4673,16 +4673,14 @@ static void mvpp2_mac_config(struct net_device *dev, unsigned int mode,

    /* Make sure the port is disabled when reconfiguring the mode */
    mvpp2_port_disable(port);
    - if (change_interface) {
    + if (port->priv->hw_version == MVPP22 && change_interface) {
    mvpp22_gop_mask_irq(port);

    - if (port->priv->hw_version == MVPP22) {
    - port->phy_interface = state->interface;
    + port->phy_interface = state->interface;

    - /* Reconfigure the serdes lanes */
    - phy_power_off(port->comphy);
    - mvpp22_mode_reconfigure(port);
    - }
    + /* Reconfigure the serdes lanes */
    + phy_power_off(port->comphy);
    + mvpp22_mode_reconfigure(port);
    }

    /* mac (re)configuration */
    @@ -4696,7 +4694,7 @@ static void mvpp2_mac_config(struct net_device *dev, unsigned int mode,
    if (port->priv->hw_version == MVPP21 && port->flags & MVPP2_F_LOOPBACK)
    mvpp2_port_loopback_set(port, state);

    - if (change_interface)
    + if (port->priv->hw_version == MVPP22 && change_interface)
    mvpp22_gop_unmask_irq(port);

    mvpp2_port_enable(port);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-03-01 11:55    [W:3.733 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site