lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 54/95] net: dsa: mt7530: correct ds->num_ports
    Date
    From: DENG Qingfang <dqfext@gmail.com>

    commit 342afce10d6f61c443c95e244f812d4766f73f53 upstream.

    Setting ds->num_ports to DSA_MAX_PORTS made DSA core allocate unnecessary
    dsa_port's and call mt7530_port_disable for non-existent ports.

    Set it to MT7530_NUM_PORTS to fix that, and dsa_is_user_port check in
    port_enable/disable is no longer required.

    Cc: stable@vger.kernel.org
    Signed-off-by: DENG Qingfang <dqfext@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/dsa/mt7530.c | 8 +-------
    1 file changed, 1 insertion(+), 7 deletions(-)

    --- a/drivers/net/dsa/mt7530.c
    +++ b/drivers/net/dsa/mt7530.c
    @@ -981,9 +981,6 @@ mt7530_port_enable(struct dsa_switch *ds
    {
    struct mt7530_priv *priv = ds->priv;

    - if (!dsa_is_user_port(ds, port))
    - return 0;
    -
    mutex_lock(&priv->reg_mutex);

    /* Allow the user port gets connected to the cpu port and also
    @@ -1006,9 +1003,6 @@ mt7530_port_disable(struct dsa_switch *d
    {
    struct mt7530_priv *priv = ds->priv;

    - if (!dsa_is_user_port(ds, port))
    - return;
    -
    mutex_lock(&priv->reg_mutex);

    /* Clear up all port matrix which could be restored in the next
    @@ -2593,7 +2587,7 @@ mt7530_probe(struct mdio_device *mdiodev
    return -ENOMEM;

    priv->ds->dev = &mdiodev->dev;
    - priv->ds->num_ports = DSA_MAX_PORTS;
    + priv->ds->num_ports = MT7530_NUM_PORTS;

    /* Use medatek,mcm property to distinguish hardware type that would
    * casues a little bit differences on power-on sequence.

    \
     
     \ /
      Last update: 2021-10-25 21:41    [W:2.226 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site