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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44441C4332F for ; Mon, 7 Nov 2022 23:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=APyKS118pGwOfxA46HFQKwOyQaMSTTLa7GWwsE6U21Q=; b=Z+QLL+jHlc7riE qxfIDsUSp5PAHTwZMEI8/b09kb3v6NVuhGpLAgH4JKnwPF3OxuIer+FFbaJWFJZ81SDfKndcNKb2D sqegK4O6F/NPSKIC5E7aSm7/ot2VGoZ6Z4knIkTKQZsMS8FCro6mocK+yXFTDXXb+j6oDmK1CRRQj Alx9q2QBWcVaOox8EVDsIzARsY7Dg0UZenbA92vH8/0oRyTKS5ZJ5ZpJrqLgPzz6kT6t9M0peYoPq rZNDw/nPS577RkBFaE/BL8Q93hC/omH2P2ErvaxgH108Ya3mKBtDv8KIMAPzIHVOpFds3l7XQxQKY ELABS7vFpDBw3EeaeSzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1osBbZ-001DA9-WE; Mon, 07 Nov 2022 23:32:38 +0000 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1osBbW-001D9c-QX; Mon, 07 Nov 2022 23:32:36 +0000 Received: by mail-ej1-x630.google.com with SMTP id kt23so34254344ejc.7; Mon, 07 Nov 2022 15:32:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=AiLgtkiudUKJTTaGdp3zbpBeZPoePBEReextvb186MI=; b=F+912x1YVqzNVZ+r84T1IgOx22zFb0Z/IwAZyy2OHa10ek3R514Rs1677cR+EL1q/j wxE8uaHgW2Gvd9YiIKC+dGk06TxagVz2h9sl4lcEY5fvbb0/3uclQxHoerZzRrHdmawJ MgcZxqpr6suK1wdHyXEPCbmC+cUFPWE/HQSYZGE47XHq8TGetzN+6taEgUL/3mGcx1HM G8Kb8loOisf/avTiK/Fq0InBmKXa/o3ivcd2GD6jjJI3RIU8UzDbxnW5J/P+BMsXNrKe qNqamSeiF5MYKL9siv68G90teksoa5S2qHssaQPBMPJ8334Q+Oxldq0XWAlczy/GBe4I bhNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=AiLgtkiudUKJTTaGdp3zbpBeZPoePBEReextvb186MI=; b=vBbjj41gU+htU1F0qBXiTHXtNj/6qfeK+0olFGQ7ByoRbx/GqNycmfmr74PsLBUm+3 kJP3nl2UiWaYGi5sGyxnhwCpTEGSiYTXuzZNaSB0MLwviwXpxtwpAbk2JjB0cg7GV2Hk 0xnYiwDnjqOXv3w+AuOUhkf7wxtyL0y5bRfMkqDc1W7UCPuI7YSRWUbgK9FRqkJhxNXN rfqbbXp4lfmue6qQDkMnwS5m7TBFubuTQ2w7G1GT8l0fg4Zuijul3Br5CuP+4dExNECj 87A/O7rq/QZPIt5MfcTZdk/SFUX7lH8hAxMzgD9fJhYu9I+IFoxLBtFwIcISeYwbzaDR qtNA== X-Gm-Message-State: ANoB5pmR+Ck0GPS0SWYcthGVKtCtK+ge8eJE9HyQvG23rE3ll4cBUviI vvKq3F6DVtRqTnrXG1eoOmk= X-Google-Smtp-Source: AA0mqf75QT137g7/iddXAYo402OLTzYbFPikl7JfQ39bSP0WrlaHdQL7Tt0Qql8fqtDDCA22f1f+Ug== X-Received: by 2002:a17:907:971e:b0:78d:e7ed:7585 with SMTP id jg30-20020a170907971e00b0078de7ed7585mr1937992ejc.258.1667863952532; Mon, 07 Nov 2022 15:32:32 -0800 (PST) Received: from skbuf ([188.27.184.197]) by smtp.gmail.com with ESMTPSA id o19-20020a170906769300b00722e50dab2csm3970132ejm.109.2022.11.07.15.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 15:32:31 -0800 (PST) Date: Tue, 8 Nov 2022 01:32:29 +0200 From: Vladimir Oltean To: Felix Fietkau Cc: netdev@vger.kernel.org, John Crispin , Sean Wang , Mark Lee , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , Russell King , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 11/14] net: ethernet: mtk_eth_soc: fix VLAN rx hardware acceleration Message-ID: <20221107233229.qzwuex4nwm44xbe4@skbuf> References: <20221107185452.90711-1-nbd@nbd.name> <20221107185452.90711-11-nbd@nbd.name> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221107185452.90711-11-nbd@nbd.name> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221107_153234_903964_05AC02D9 X-CRM114-Status: GOOD ( 31.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 07, 2022 at 07:54:49PM +0100, Felix Fietkau wrote: > - enable VLAN untagging for PDMA rx > - make it possible to disable the feature via ethtool > - pass VLAN tag to the DSA driver > - untag special tag on PDMA only if no non-DSA devices are in use > - disable special tag untagging on 7986 for now, since it's not working yet What is the downside of not enabling VLAN RX offloading, is it a performance or a functional need to have it? > > Signed-off-by: Felix Fietkau > --- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 36 +++++++++++++-------- > drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ > 2 files changed, 25 insertions(+), 14 deletions(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index ab31dda2cd66..3b8995a483aa 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -2015,16 +2015,9 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, > htons(RX_DMA_VPID(trxd.rxd4)), > RX_DMA_VID(trxd.rxd4)); > } else if (trxd.rxd2 & RX_DMA_VTAG) { > - __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), > + __vlan_hwaccel_put_tag(skb, htons(RX_DMA_VPID(trxd.rxd3)), Why make this change? The network stack doesn't like it when you feed it non-standard VLAN protocols, as you've noticed. > RX_DMA_VID(trxd.rxd3)); > } > - > - /* If the device is attached to a dsa switch, the special > - * tag inserted in VLAN field by hw switch can * be offloaded > - * by RX HW VLAN offload. Clear vlan info. What is the format of this special tag, what does it contain? The same thing as what mtk_tag_rcv() parses? > - */ > - if (netdev_uses_dsa(netdev)) > - __vlan_hwaccel_clear_tag(skb); If the DSA switch information is present in the VLAN hwaccel, and the VLAN hwaccel is cleared, and that up until this change, NETIF_F_HW_VLAN_CTAG_RX was not configurable, it means that every mtk_soc_data with MTK_HW_FEATURES would be broken as a DSA master? > } > > skb_record_rx_queue(skb, 0); > @@ -2847,15 +2840,17 @@ static netdev_features_t mtk_fix_features(struct net_device *dev, > > static int mtk_set_features(struct net_device *dev, netdev_features_t features) > { > - int err = 0; > - > - if (!((dev->features ^ features) & NETIF_F_LRO)) > - return 0; > + struct mtk_mac *mac = netdev_priv(dev); > + struct mtk_eth *eth = mac->hw; > + netdev_features_t diff = dev->features ^ features; > > - if (!(features & NETIF_F_LRO)) > + if ((diff & NETIF_F_LRO) && !(features & NETIF_F_LRO)) > mtk_hwlro_netdev_disable(dev); > > - return err; > + /* Set RX VLAN offloading */ > + mtk_w32(eth, !!(features & NETIF_F_HW_VLAN_CTAG_RX), MTK_CDMP_EG_CTRL); Nit: do this only if (diff & NETIF_F_HW_VLAN_CTAG_RX). > + > + return 0; > } > > /* wait for DMA to finish whatever it is doing before we start using it again */ > @@ -3176,6 +3171,15 @@ static int mtk_open(struct net_device *dev) > else > refcount_inc(ð->dma_refcnt); > > + /* Hardware special tag parsing needs to be disabled if at least > + * one MAC does not use DSA. > + */ Don't understand why, sorry. > + if (!netdev_uses_dsa(dev)) { > + u32 val = mtk_r32(eth, MTK_CDMP_IG_CTRL); > + val &= ~MTK_CDMP_STAG_EN; > + mtk_w32(eth, val, MTK_CDMP_IG_CTRL); > + } > + > phylink_start(mac->phylink); > netif_tx_start_all_queues(dev); > > @@ -3469,6 +3473,10 @@ static int mtk_hw_init(struct mtk_eth *eth) > */ > val = mtk_r32(eth, MTK_CDMQ_IG_CTRL); > mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL); > + if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) { > + val = mtk_r32(eth, MTK_CDMP_IG_CTRL); > + mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL); > + } > > /* Enable RX VLan Offloading */ > mtk_w32(eth, 1, MTK_CDMP_EG_CTRL); > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h > index e09b2483c70c..26b2323185ef 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h > @@ -93,6 +93,9 @@ > #define MTK_CDMQ_IG_CTRL 0x1400 > #define MTK_CDMQ_STAG_EN BIT(0) > > +/* CDMQ Exgress Control Register */ > +#define MTK_CDMQ_EG_CTRL 0x1404 > + > /* CDMP Ingress Control Register */ > #define MTK_CDMP_IG_CTRL 0x400 > #define MTK_CDMP_STAG_EN BIT(0) > -- > 2.38.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel