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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF6CBC433FE for ; Mon, 3 Oct 2022 13:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbiJCNsI (ORCPT ); Mon, 3 Oct 2022 09:48:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbiJCNsH (ORCPT ); Mon, 3 Oct 2022 09:48:07 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44D2E2A973 for ; Mon, 3 Oct 2022 06:48:05 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1ofLnR-0004nb-3A; Mon, 03 Oct 2022 15:47:50 +0200 Date: Mon, 3 Oct 2022 14:47:42 +0100 From: Daniel Golle To: Matthieu Baerts Cc: Jakub Kicinski , linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, Lorenzo Bianconi , Sujuan Chen , Bo Jiao , Felix Fietkau , John Crispin , Sean Wang , Mark Lee , "David S. Miller" , Eric Dumazet , Paolo Abeni , Matthias Brugger , Chen Minqiang , Thomas =?iso-8859-1?Q?H=FChn?= Subject: Re: [PATCH v2] net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear: manual merge Message-ID: References: <20220928190939.3c43516f@kernel.org> <6cb6893b-4921-a068-4c30-1109795110bb@tessares.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6cb6893b-4921-a068-4c30-1109795110bb@tessares.net> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Oct 03, 2022 at 02:59:32PM +0200, Matthieu Baerts wrote: > Hello, > > On 30/09/2022 02:56, Daniel Golle wrote: > > Setting ib1 state to MTK_FOE_STATE_UNBIND in __mtk_foe_entry_clear > > routine as done by commit 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: > > fix typo in __mtk_foe_entry_clear") breaks flow offloading, at least > > on older MTK_NETSYS_V1 SoCs, OpenWrt users have confirmed the bug on > > MT7622 and MT7621 systems. > > Felix Fietkau suggested to use MTK_FOE_STATE_INVALID instead which > > works well on both, MTK_NETSYS_V1 and MTK_NETSYS_V2. > > > > Tested on MT7622 (Linksys E8450) and MT7986 (BananaPi BPI-R3). > > > > Suggested-by: Felix Fietkau > > Fixes: 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear") > > Fixes: 33fc42de33278b ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries") > > Signed-off-by: Daniel Golle > > --- > > v2: rebased on top of netdev/net.git;main > > FYI and as expected when reading this email thread, we got a small > conflict when merging -net in net-next in the MPTCP tree due to this > patch applied in -net: > > ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in > __mtk_foe_entry_clear") > > and this one from net-next: > > 9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to > mtk_eth_soc") > > The conflict has been resolved on our side[1] inspired by Daniel's v1. > The resolution we suggest is attached to this email. conflict resolution: Acked-by: Daniel Golle > > Cheers, > Matt > > [1] https://github.com/multipath-tcp/mptcp_net-next/commit/7af5fac658ba > -- > Tessares | Belgium | Hybrid Access Solutions > www.tessares.net > diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c > index 887f430734f7,148ea636ef97..ae00e572390d > --- a/drivers/net/ethernet/mediatek/mtk_ppe.c > +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c > @@@ -439,10 -410,9 +439,10 @@@ __mtk_foe_entry_clear(struct mtk_ppe *p > > hlist_del_init(&entry->list); > if (entry->hash != 0xffff) { > - ppe->foe_table[entry->hash].ib1 &= ~MTK_FOE_IB1_STATE; > - ppe->foe_table[entry->hash].ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, > - MTK_FOE_STATE_INVALID); > + struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, entry->hash); > + > + hwe->ib1 &= ~MTK_FOE_IB1_STATE; > - hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_UNBIND); > ++ hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID); > dma_wmb(); > } > entry->hash = 0xffff;