From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A509FC433F5 for ; Fri, 29 Oct 2021 05:23:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9028A61151 for ; Fri, 29 Oct 2021 05:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231852AbhJ2FZ5 (ORCPT ); Fri, 29 Oct 2021 01:25:57 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:55736 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231804AbhJ2FZ4 (ORCPT ); Fri, 29 Oct 2021 01:25:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1635485008; x=1667021008; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1ltyOgddCdZhqYp19CwyO7Sqj06fQAR3j7ip63jqwsA=; b=UekFaAK4a89c5Jed0ucHfzdrBaXbbCloxo/y0q8+g0g0T4O1SUBeneUu gcFFzPuIQRXHHXw7z3oDs7EIW5LtdugKY4t/ittwWK/FUtPef1VS8Zcmf xamp1H27WzaNf85PWMKZdjc1ViVGnhQydePXehL/CZ8ni6VxhFtD+Fgqp q7Cnm6ZX4SUbq6qvyHKOoUH0aul33MydwbsrDAf24h6V69fc0F3R89tBF bOqLyBD1V2jbseRQd1kHudkd3TTVDeG8PtnJC66xVSuqL5YtRluVFCBCD ZXqvKz/jFrKYo8efF9mNHcTFYegMGpAaU2tOnNY9Ir3TpFqmgXFbGh83x g==; IronPort-SDR: h9RK6956jo4h29H2TFmHW1ewCt9g9hu0+5hKoQ7vA26VerZXT0RGQKNoRETq11XsjfvgQ+aQQo RXqqrzEEdHlW694P/6r8iHMo8UpJNbjjSTuaPiGmoxWgOcWmCr1njsAJNX8uZ95IB8QS3e9YG6 G9s8ylndnevODQ6cafX7I9BTeETrC0XFUWFotHmDeuIQ7+IarXbko8LRZ1ZRxSSGO/prvjowIZ 0T0YWrFY9Nhc8DV0M+6KZ0t1q6CM2LNm2MugqoYrsL2gvVqzj8AWOaJKlUR6SoI3hxSasze58V Iw2J8aAjMguRwK1l+iJBoq53 X-IronPort-AV: E=Sophos;i="5.87,191,1631602800"; d="scan'208";a="134753617" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Oct 2021 22:23:27 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 28 Oct 2021 22:23:27 -0700 Received: from CHE-LT-I21427LX.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 28 Oct 2021 22:23:17 -0700 From: Prasanna Vengateshan To: , , , CC: , , , , , , , , , Subject: [PATCH v6 net-next 02/10] net: dsa: move mib->cnt_ptr reset code to ksz_common.c Date: Fri, 29 Oct 2021 10:52:48 +0530 Message-ID: <20211029052256.144739-3-prasanna.vengateshan@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211029052256.144739-1-prasanna.vengateshan@microchip.com> References: <20211029052256.144739-1-prasanna.vengateshan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Vladimir Oltean --- 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 43fc3087aeb3..4a31492190f8 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -447,8 +447,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 854e25f43fa7..35b430d531de 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -289,9 +289,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 7c2968a639eb..37d9400bfe98 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -103,8 +103,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.27.0