lkml.org 
[lkml]   [2022]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 net-next 03/10] net: dsa: move mib->cnt_ptr reset code to ksz_common.c
    Date
    mib->cnt_ptr resetting is handled in multiple places as part of
    port_init_cnt(). Hence moved mib->cnt_ptr code to ksz common layer
    and removed from individual product files.

    Signed-off-by: Prasanna Vengateshan <prasanna.vengateshan@microchip.com>
    Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    ---
    drivers/net/dsa/microchip/ksz8795.c | 2 --
    drivers/net/dsa/microchip/ksz9477.c | 3 ---
    drivers/net/dsa/microchip/ksz_common.c | 8 +++++++-
    3 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
    index b2752978cb09..2da4e85e33b0 100644
    --- a/drivers/net/dsa/microchip/ksz8795.c
    +++ b/drivers/net/dsa/microchip/ksz8795.c
    @@ -468,8 +468,6 @@ static void ksz8_port_init_cnt(struct ksz_device *dev, int port)
    dropped, &mib->counters[mib->cnt_ptr]);
    ++mib->cnt_ptr;
    }
    - mib->cnt_ptr = 0;
    - memset(mib->counters, 0, dev->mib_cnt * sizeof(u64));
    }

    static void ksz8_r_table(struct ksz_device *dev, int table, u16 addr, u64 *data)
    diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
    index 8222c8a6c5ec..346ce840f871 100644
    --- a/drivers/net/dsa/microchip/ksz9477.c
    +++ b/drivers/net/dsa/microchip/ksz9477.c
    @@ -410,9 +410,6 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port)
    ksz_write8(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FLUSH);
    ksz_pwrite32(dev, port, REG_PORT_MIB_CTRL_STAT__4, 0);
    mutex_unlock(&mib->cnt_mutex);
    -
    - mib->cnt_ptr = 0;
    - memset(mib->counters, 0, dev->mib_cnt * sizeof(u64));
    }

    static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,
    diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
    index 8014b18d9391..36f8ed03f615 100644
    --- a/drivers/net/dsa/microchip/ksz_common.c
    +++ b/drivers/net/dsa/microchip/ksz_common.c
    @@ -146,8 +146,14 @@ void ksz_init_mib_timer(struct ksz_device *dev)

    INIT_DELAYED_WORK(&dev->mib_read, ksz_mib_read_work);

    - for (i = 0; i < dev->port_cnt; i++)
    + for (i = 0; i < dev->port_cnt; i++) {
    + struct ksz_port_mib *mib = &dev->ports[i].mib;
    +
    dev->dev_ops->port_init_cnt(dev, i);
    +
    + mib->cnt_ptr = 0;
    + memset(mib->counters, 0, dev->mib_cnt * sizeof(u64));
    + }
    }
    EXPORT_SYMBOL_GPL(ksz_init_mib_timer);

    --
    2.30.2
    \
     
     \ /
      Last update: 2022-03-22 20:56    [W:4.488 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site