Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp2857307rwi; Tue, 1 Nov 2022 12:38:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7U3xHtrPZjvCzdn3WqgK25freWAvZtEf/lW8LKZ4kfHboIkk022WrsHgjoh3wAFoSW6/Cs X-Received: by 2002:a63:5a08:0:b0:43c:9fcc:cc54 with SMTP id o8-20020a635a08000000b0043c9fcccc54mr18442541pgb.229.1667331515601; Tue, 01 Nov 2022 12:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667331515; cv=none; d=google.com; s=arc-20160816; b=OrYAXpJqrwFERWxiqf+6F+KzbFMch9Av70ZVtjIFDX9NGSn7x9HwjQDBJaAMU1MfYB SSjjNs6ddcf9rbrjl+IIiwD86Aot8Hsmn3g2b9OaJNuY6z1ebiW/qvdzpc62IKEKzOhR mxAwI/tQtAFiBrZfAIw4g4XA1TwHLEgVPqEEHU2D2G7knXmzBvPYpfun80FQcd2GMFUF vE1WURI2hla6IEvXCOZncjDTUtJXims+kT2wvwDa1ttAZ4snzjaHn8RCGgg+E8hQcYFA GFxc/tjeO2/Fre5JDGzDoBVGuPjPbGLIQQJ1IUON0ihI4SeaMMFXyw8ZYV8u/FU5p62s aHfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:to:content-language:subject:user-agent:mime-version:date :message-id:dkim-signature:dkim-signature; bh=GO+0fQzL0TXTBgTGPDcOcZXiKSP0e9QpVCNU04gY5qQ=; b=J6tP5MPcyWCRpkoPtoEtEG/hD135yio5v/86infM3sttycHqJb9Egx9lCmytq3vaIq +x60ElU167LHuPYGJ4yz22mq6yfB54UKvRXFv+Ko/lDX9yLwrLChXjxERLnWrim6IgCy mOsoo7i6/nP9to/RSnLJgHkqglYEFUx4OJI1RwrLxBZMoCuPtElhxRXbd8KPfaWWIDcg nGfyUVHNQmulHb181dUdJblzISSWiKdj3txINSngpEF9JLit9I+aBD4aFa2hKf1q4gl4 E65Z1rbMPjsCJY+HwP8mbhslj4mb/LVXV/fm1j7KLtXDMY6+yQs84cpzKrdRvc91TzrE tIGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=jW6WmVRf; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d189-20020a621dc6000000b00545837b0127si12136320pfd.196.2022.11.01.12.38.22; Tue, 01 Nov 2022 12:38:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=jW6WmVRf; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230418AbiKATRv (ORCPT + 97 others); Tue, 1 Nov 2022 15:17:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230414AbiKATRp (ORCPT ); Tue, 1 Nov 2022 15:17:45 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAA0F167F6; Tue, 1 Nov 2022 12:17:42 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 615522267F; Tue, 1 Nov 2022 19:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1667330261; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GO+0fQzL0TXTBgTGPDcOcZXiKSP0e9QpVCNU04gY5qQ=; b=jW6WmVRfyjl1pNav1LETz+u5zWKQ5+Km6pgV33Gt6itibYXeo7p1YWX/OvR9j0r34AhIDs BOVxI3kKC4y4WlTQkE3IJKdbCz5+oHt8tjyjidIiVuV112MVb3BXrZFyuJ5KrmD2A5GoFR WcdmehNAbzU5260ClW3w4CQRCINqQxI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1667330261; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GO+0fQzL0TXTBgTGPDcOcZXiKSP0e9QpVCNU04gY5qQ=; b=4BwVO1Hk+ykqkQ0/FehJ0s1O4b9eDE6Sx1YOoIZHTiAJnn071oceuHM0eMPn6UYi6qTgCz PWa/c/KbtNXksBCw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C70A013AAF; Tue, 1 Nov 2022 19:17:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QgfbK9NwYWMpSAAAMHmgww (envelope-from ); Tue, 01 Nov 2022 19:17:39 +0000 Message-ID: <94b34088-d0be-9f16-5d9c-69dfeb22cc36@suse.de> Date: Tue, 1 Nov 2022 22:17:38 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH] net: ethernet: mediatek: ppe: add support for flow accounting Content-Language: en-US To: Daniel Golle , Felix Fietkau , John Crispin , Sean Wang , Mark Lee , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org References: From: Denis Kirjanov In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/1/22 22:12, Daniel Golle wrote: > The PPE units found in MT7622 and newer support packet and byte > accounting of hw-offloaded flows. Add support for reading those > counters as found in MediaTek's SDK[1]. > > [1]: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/bc6a6a375c800dc2b80e1a325a2c732d1737df92 > Signed-off-by: Daniel Golle > --- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +- > drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + > drivers/net/ethernet/mediatek/mtk_ppe.c | 122 +++++++++++++++++- > drivers/net/ethernet/mediatek/mtk_ppe.h | 23 +++- > .../net/ethernet/mediatek/mtk_ppe_debugfs.c | 9 +- > .../net/ethernet/mediatek/mtk_ppe_offload.c | 7 + > drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 14 ++ > 7 files changed, 178 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index 789268b15106ec..5fcd66fca7a089 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -4140,7 +4140,9 @@ static int mtk_probe(struct platform_device *pdev) > u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400; > > eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr, > - eth->soc->offload_version, i); > + eth->soc->offload_version, i, > + eth->soc->has_accounting); > + > if (!eth->ppe[i]) { > err = -ENOMEM; > goto err_free_dev; > @@ -4221,6 +4223,7 @@ static const struct mtk_soc_data mt2701_data = { > .hw_features = MTK_HW_FEATURES, > .required_clks = MT7623_CLKS_BITMAP, > .required_pctl = true, > + .has_accounting = false, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma), > .rxd_size = sizeof(struct mtk_rx_dma), > @@ -4239,6 +4242,7 @@ static const struct mtk_soc_data mt7621_data = { > .required_pctl = false, > .offload_version = 2, > .hash_offset = 2, > + .has_accounting = false, > .foe_entry_size = sizeof(struct mtk_foe_entry) - 16, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma), > @@ -4259,6 +4263,7 @@ static const struct mtk_soc_data mt7622_data = { > .required_pctl = false, > .offload_version = 2, > .hash_offset = 2, > + .has_accounting = true, > .foe_entry_size = sizeof(struct mtk_foe_entry) - 16, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma), > @@ -4278,6 +4283,7 @@ static const struct mtk_soc_data mt7623_data = { > .required_pctl = true, > .offload_version = 2, > .hash_offset = 2, > + .has_accounting = false, > .foe_entry_size = sizeof(struct mtk_foe_entry) - 16, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma), > @@ -4296,6 +4302,7 @@ static const struct mtk_soc_data mt7629_data = { > .hw_features = MTK_HW_FEATURES, > .required_clks = MT7629_CLKS_BITMAP, > .required_pctl = false, > + .has_accounting = true, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma), > .rxd_size = sizeof(struct mtk_rx_dma), > @@ -4315,6 +4322,7 @@ static const struct mtk_soc_data mt7986_data = { > .required_pctl = false, > .hash_offset = 4, > .foe_entry_size = sizeof(struct mtk_foe_entry), > + .has_accounting = true, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma_v2), > .rxd_size = sizeof(struct mtk_rx_dma_v2), > @@ -4331,6 +4339,7 @@ static const struct mtk_soc_data rt5350_data = { > .hw_features = MTK_HW_FEATURES_MT7628, > .required_clks = MT7628_CLKS_BITMAP, > .required_pctl = false, > + .has_accounting = false, > .txrx = { > .txd_size = sizeof(struct mtk_tx_dma), > .rxd_size = sizeof(struct mtk_rx_dma), > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h > index 589f27ddc40163..6c2a0a1826c3c7 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h > @@ -993,6 +993,7 @@ struct mtk_soc_data { > u8 hash_offset; > u16 foe_entry_size; > netdev_features_t hw_features; > + bool has_accounting; > struct { > u32 txd_size; > u32 rxd_size; > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c > index 2d8ca99f2467ff..bc4660da28451b 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe.c > +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c > @@ -74,6 +74,46 @@ static int mtk_ppe_wait_busy(struct mtk_ppe *ppe) > return ret; > } > > +static int mtk_ppe_mib_wait_busy(struct mtk_ppe *ppe) > +{ > + int ret; > + u32 val; > + > + ret = readl_poll_timeout(ppe->base + MTK_PPE_MIB_SER_CR, val, > + !(val & MTK_PPE_MIB_SER_CR_ST), > + 20, MTK_PPE_WAIT_TIMEOUT_US); > + > + if (ret) > + dev_err(ppe->dev, "MIB table busy"); > + > + return ret; > +} > + > +int mtk_mib_entry_read(struct mtk_ppe *ppe, u16 index, u64 *bytes, u64 *packets) > +{ > + u32 val, cnt_r0, cnt_r1, cnt_r2; > + u32 byte_cnt_low, byte_cnt_high, pkt_cnt_low, pkt_cnt_high; > + > + val = FIELD_PREP(MTK_PPE_MIB_SER_CR_ADDR, index) | MTK_PPE_MIB_SER_CR_ST; > + ppe_w32(ppe, MTK_PPE_MIB_SER_CR, val); > + > + if (mtk_ppe_mib_wait_busy(ppe)) > + return -ETIMEDOUT; > + > + cnt_r0 = readl(ppe->base + MTK_PPE_MIB_SER_R0); > + cnt_r1 = readl(ppe->base + MTK_PPE_MIB_SER_R1); > + cnt_r2 = readl(ppe->base + MTK_PPE_MIB_SER_R2); > + > + byte_cnt_low = FIELD_GET(MTK_PPE_MIB_SER_R0_BYTE_CNT_LOW, cnt_r0); > + byte_cnt_high = FIELD_GET(MTK_PPE_MIB_SER_R1_BYTE_CNT_HIGH, cnt_r1); > + pkt_cnt_low = FIELD_GET(MTK_PPE_MIB_SER_R1_PKT_CNT_LOW, cnt_r1); > + pkt_cnt_high = FIELD_GET(MTK_PPE_MIB_SER_R2_PKT_CNT_HIGH, cnt_r2); > + *bytes = ((u64)byte_cnt_high << 32) | byte_cnt_low; > + *packets = (pkt_cnt_high << 16) | pkt_cnt_low; > + > + return 0; > +} > + > static void mtk_ppe_cache_clear(struct mtk_ppe *ppe) > { > ppe_set(ppe, MTK_PPE_CACHE_CTL, MTK_PPE_CACHE_CTL_CLEAR); > @@ -438,6 +478,13 @@ __mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry) > hwe->ib1 &= ~MTK_FOE_IB1_STATE; > hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID); > dma_wmb(); > + if (ppe->accounting) { > + struct mtk_foe_accounting *acct; > + > + acct = ppe->acct_table + entry->hash * sizeof(*acct); > + acct->packets = 0; > + acct->bytes = 0; > + } > } > entry->hash = 0xffff; > > @@ -545,6 +592,16 @@ __mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_foe_entry *entry, > wmb(); > hwe->ib1 = entry->ib1; > > + if (ppe->accounting) { > + int type; > + > + type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); > + if (type >= MTK_PPE_PKT_TYPE_IPV4_DSLITE) > + hwe->ipv6.ib2 |= MTK_FOE_IB2_MIB_CNT; > + else > + hwe->ipv4.ib2 |= MTK_FOE_IB2_MIB_CNT; > + } > + > dma_wmb(); > > mtk_ppe_cache_clear(ppe); > @@ -654,11 +711,8 @@ void __mtk_ppe_check_skb(struct mtk_ppe *ppe, struct sk_buff *skb, u16 hash) > continue; > } > > - if (found || !mtk_flow_entry_match(ppe->eth, entry, hwe)) { > - if (entry->hash != 0xffff) > - entry->hash = 0xffff; > + if (found || !mtk_flow_entry_match(ppe->eth, entry, hwe)) > continue; > - } > > entry->hash = hash; > __mtk_foe_entry_commit(ppe, &entry->data, hash); > @@ -710,14 +764,42 @@ int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry) > return __mtk_foe_entry_idle_time(ppe, entry->data.ib1); > } > > +struct mtk_foe_accounting *mtk_foe_entry_get_mib(struct mtk_ppe *ppe, u32 index, > + struct mtk_foe_accounting *diff) > +{ > + struct mtk_foe_accounting *acct; > + int size = sizeof(struct mtk_foe_accounting); > + u64 bytes, packets; > + > + if (!ppe->accounting) > + return NULL; > + > + if (mtk_mib_entry_read(ppe, index, &bytes, &packets)) > + return NULL; > + > + acct = ppe->acct_table + index * size; > + > + acct->bytes += bytes; > + acct->packets += packets; > + > + if (diff) { > + diff->bytes = bytes; > + diff->packets = packets; > + } > + > + return acct; > +} > + > struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, > - int version, int index) > + int version, int index, bool accounting) > { > const struct mtk_soc_data *soc = eth->soc; > struct device *dev = eth->dev; > struct mtk_ppe *ppe; > u32 foe_flow_size; > void *foe; > + struct mtk_mib_entry *mib; > + struct mtk_foe_accounting *acct; > > ppe = devm_kzalloc(dev, sizeof(*ppe), GFP_KERNEL); > if (!ppe) > @@ -732,6 +814,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, > ppe->eth = eth; > ppe->dev = dev; > ppe->version = version; > + ppe->accounting = accounting; > > foe = dmam_alloc_coherent(ppe->dev, > MTK_PPE_ENTRIES * soc->foe_entry_size, > @@ -747,6 +830,25 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, > if (!ppe->foe_flow) > return NULL; > > + if (accounting) { > + mib = dmam_alloc_coherent(ppe->dev, MTK_PPE_ENTRIES * sizeof(*mib), > + &ppe->mib_phys, GFP_KERNEL); check the return value > + if (!foe) > + return NULL; > + > + memset(mib, 0, MTK_PPE_ENTRIES * sizeof(*mib)); > + > + ppe->mib_table = mib; > + > + acct = devm_kzalloc(dev, MTK_PPE_ENTRIES * sizeof(*acct), > + GFP_KERNEL); > + > + if (!acct) > + return NULL; > + > + ppe->acct_table = acct; > + } > + > mtk_ppe_debugfs_init(ppe, index); > > return ppe; > @@ -861,6 +963,16 @@ void mtk_ppe_start(struct mtk_ppe *ppe) > ppe_w32(ppe, MTK_PPE_DEFAULT_CPU_PORT1, 0xcb777); > ppe_w32(ppe, MTK_PPE_SBW_CTRL, 0x7f); > } > + > + if (ppe->accounting && ppe->mib_phys) { > + ppe_w32(ppe, MTK_PPE_MIB_TB_BASE, ppe->mib_phys); > + ppe_m32(ppe, MTK_PPE_MIB_CFG, MTK_PPE_MIB_CFG_EN, > + MTK_PPE_MIB_CFG_EN); > + ppe_m32(ppe, MTK_PPE_MIB_CFG, MTK_PPE_MIB_CFG_RD_CLR, > + MTK_PPE_MIB_CFG_RD_CLR); > + ppe_m32(ppe, MTK_PPE_MIB_CACHE_CTL, MTK_PPE_MIB_CACHE_CTL_EN, > + MTK_PPE_MIB_CFG_RD_CLR); > + } > } > > int mtk_ppe_stop(struct mtk_ppe *ppe) > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h > index 0b7a67a958e4ca..b77509a2b0fa30 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe.h > +++ b/drivers/net/ethernet/mediatek/mtk_ppe.h > @@ -57,6 +57,7 @@ enum { > #define MTK_FOE_IB2_MULTICAST BIT(8) > > #define MTK_FOE_IB2_WDMA_QID2 GENMASK(13, 12) > +#define MTK_FOE_IB2_MIB_CNT BIT(15) > #define MTK_FOE_IB2_WDMA_DEVIDX BIT(16) > #define MTK_FOE_IB2_WDMA_WINFO BIT(17) > > @@ -284,16 +285,34 @@ struct mtk_flow_entry { > unsigned long cookie; > }; > > +struct mtk_mib_entry { > + u32 byt_cnt_l; > + u16 byt_cnt_h; > + u32 pkt_cnt_l; > + u8 pkt_cnt_h; > + u8 _rsv0; > + u32 _rsv1; > +} __packed; > + > +struct mtk_foe_accounting { > + u64 bytes; > + u64 packets; > +}; > + > struct mtk_ppe { > struct mtk_eth *eth; > struct device *dev; > void __iomem *base; > int version; > char dirname[5]; > + bool accounting; > > void *foe_table; > dma_addr_t foe_phys; > > + struct mtk_mib_entry *mib_table; > + dma_addr_t mib_phys; > + > u16 foe_check_time[MTK_PPE_ENTRIES]; > struct hlist_head *foe_flow; > > @@ -303,7 +322,7 @@ struct mtk_ppe { > }; > > struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, > - int version, int index); > + int version, int index, bool accounting); > void mtk_ppe_start(struct mtk_ppe *ppe); > int mtk_ppe_stop(struct mtk_ppe *ppe); > > @@ -354,5 +373,7 @@ int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); > void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); > int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); > int mtk_ppe_debugfs_init(struct mtk_ppe *ppe, int index); > +struct mtk_foe_accounting *mtk_foe_entry_get_mib(struct mtk_ppe *ppe, u32 index, > + struct mtk_foe_accounting *diff); > > #endif > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c > index 391b071bcff38d..39775740340b9e 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c > +++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c > @@ -82,6 +82,7 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) > struct mtk_foe_entry *entry = mtk_foe_get_entry(ppe, i); > struct mtk_foe_mac_info *l2; > struct mtk_flow_addr_info ai = {}; > + struct mtk_foe_accounting *acct; > unsigned char h_source[ETH_ALEN]; > unsigned char h_dest[ETH_ALEN]; > int type, state; > @@ -95,6 +96,8 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) > if (bind && state != MTK_FOE_STATE_BIND) > continue; > > + acct = mtk_foe_entry_get_mib(ppe, i, NULL); > + > type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); > seq_printf(m, "%05x %s %7s", i, > mtk_foe_entry_state_str(state), > @@ -153,9 +156,11 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) > *((__be16 *)&h_dest[4]) = htons(l2->dest_mac_lo); > > seq_printf(m, " eth=%pM->%pM etype=%04x" > - " vlan=%d,%d ib1=%08x ib2=%08x\n", > + " vlan=%d,%d ib1=%08x ib2=%08x" > + " packets=%lld bytes=%lld\n", > h_source, h_dest, ntohs(l2->etype), > - l2->vlan1, l2->vlan2, entry->ib1, ib2); > + l2->vlan1, l2->vlan2, entry->ib1, ib2, > + acct->packets, acct->bytes); > } > > return 0; > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c > index 28bbd1df3e3059..42b5f279cfa5bb 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c > +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c > @@ -491,6 +491,7 @@ static int > mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f) > { > struct mtk_flow_entry *entry; > + struct mtk_foe_accounting diff; > u32 idle; > > entry = rhashtable_lookup(ð->flow_table, &f->cookie, > @@ -501,6 +502,12 @@ mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f) > idle = mtk_foe_entry_idle_time(eth->ppe[entry->ppe_index], entry); > f->stats.lastused = jiffies - idle * HZ; > > + if (entry->hash != 0xFFFF) { > + mtk_foe_entry_get_mib(eth->ppe[entry->ppe_index], entry->hash, &diff); > + f->stats.pkts += diff.packets; > + f->stats.bytes += diff.bytes; > + } > + > return 0; > } > > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_regs.h b/drivers/net/ethernet/mediatek/mtk_ppe_regs.h > index 59596d823d8b8a..be804571b825e7 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe_regs.h > +++ b/drivers/net/ethernet/mediatek/mtk_ppe_regs.h > @@ -143,6 +143,20 @@ enum { > > #define MTK_PPE_MIB_TB_BASE 0x338 > > +#define MTK_PPE_MIB_SER_CR 0x33C > +#define MTK_PPE_MIB_SER_CR_ST BIT(16) > +#define MTK_PPE_MIB_SER_CR_ADDR GENMASK(13, 0) > + > +#define MTK_PPE_MIB_SER_R0 0x340 > +#define MTK_PPE_MIB_SER_R0_BYTE_CNT_LOW GENMASK(31, 0) > + > +#define MTK_PPE_MIB_SER_R1 0x344 > +#define MTK_PPE_MIB_SER_R1_PKT_CNT_LOW GENMASK(31, 16) > +#define MTK_PPE_MIB_SER_R1_BYTE_CNT_HIGH GENMASK(15, 0) > + > +#define MTK_PPE_MIB_SER_R2 0x348 > +#define MTK_PPE_MIB_SER_R2_PKT_CNT_HIGH GENMASK(23, 0) > + > #define MTK_PPE_MIB_CACHE_CTL 0x350 > #define MTK_PPE_MIB_CACHE_CTL_EN BIT(0) > #define MTK_PPE_MIB_CACHE_CTL_FLUSH BIT(2)