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 F3F25C7EE45 for ; Mon, 12 Jun 2023 11:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234726AbjFLLiQ (ORCPT ); Mon, 12 Jun 2023 07:38:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235764AbjFLLhy (ORCPT ); Mon, 12 Jun 2023 07:37:54 -0400 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:32c8:5054:ff:fe00:142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 063F77D94; Mon, 12 Jun 2023 04:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=TV21Jmzs5HQxIuTayrf/mU1uRUNmyAiPllP7jU37Xqc=; b=ymw/V7OeZAEdwfvrsdF0h7hem3 P2MsH19HdcpAUn5jgAqvtrHcr1v+prQ6HGwnZwNY5HGIVTVMqR8bJpG8QL+R6BsExpfurAJoFyzgO mTOQryoWtvarDKOfsLxbMNlY4uYZLfspASeOE9nXQEDK8Dfo1lMqnEB3HZL8Sowmp65K7AVBv/EzY aasIUJmN6gAT0nfrFXjq4ZYcQTn5A69DWGB9x9Ukm4IF6hFiazutEUzl5rSluwnVo1UP1EfNzIIz1 ibt+BUxG04j1w8PNhucatldK7t5a+HV4nsd0n4ZVyMTW2R7omrRh8b3EhZFgs+t11VfcRezgoQ0R8 4NRkg+oA==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:36050) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q8faY-0005e2-JP; Mon, 12 Jun 2023 12:19:58 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1q8faS-0004v7-27; Mon, 12 Jun 2023 12:19:52 +0100 Date: Mon, 12 Jun 2023 12:19:52 +0100 From: "Russell King (Oracle)" To: Daniel Golle Cc: netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, AngeloGioacchino Del Regno , Matthias Brugger , Lorenzo Bianconi , Mark Lee , Sean Wang , John Crispin , Felix Fietkau , Conor Dooley , Krzysztof Kozlowski , Rob Herring , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Sam Shih Subject: Re: [PATCH net-next 5/8] net: ethernet: mtk_eth_soc: add MTK_NETSYS_V3 capability bit Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: Russell King (Oracle) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jun 11, 2023 at 01:38:23AM +0100, Daniel Golle wrote: > @@ -1333,8 +1354,13 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, > mtk_tx_set_dma_desc(dev, itxd, &txd_info); > > itx_buf->flags |= MTK_TX_FLAGS_SINGLE0; > - itx_buf->flags |= (!mac->id) ? MTK_TX_FLAGS_FPORT0 : > - MTK_TX_FLAGS_FPORT1; > + if (mac->id == MTK_GMAC1_ID) > + itx_buf->flags |= MTK_TX_FLAGS_FPORT0; > + else if (mac->id == MTK_GMAC2_ID) > + itx_buf->flags |= MTK_TX_FLAGS_FPORT1; > + else > + itx_buf->flags |= MTK_TX_FLAGS_FPORT2; There appears to be two places that this code structure appears, and this is in the path for packet transmission. I wonder if it would be more efficient to instead do: itx_buf->flags |= MTK_TX_FLAGS_SINGLE0 | mac->tx_flags; with mac->tx_flags appropriately initialised? > @@ -2170,7 +2214,9 @@ static int mtk_poll_tx_qdma(struct mtk_eth *eth, int budget, > tx_buf = mtk_desc_to_tx_buf(ring, desc, > eth->soc->txrx.txd_size); > if (tx_buf->flags & MTK_TX_FLAGS_FPORT1) > - mac = 1; > + mac = MTK_GMAC2_ID; > + else if (tx_buf->flags & MTK_TX_FLAGS_FPORT2) > + mac = MTK_GMAC3_ID; This has me wondering whether the flags are used for hardware or just for the driver's purposes. If it's the latter, can we instead store the MAC index in tx_buf, rather than having to decode a bitfield? I suspect these are just for the driver given that the addition of MTK_TX_FLAGS_FPORT2 changes all subsequent bit numbers in this struct member. > > if (!tx_buf->data) > break; > @@ -3783,7 +3829,26 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset) > mtk_w32(eth, eth->soc->txrx.rx_irq_done_mask, reg_map->qdma.int_grp + 4); > mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP); > > - if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) { > + if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V3)) { > + /* PSE should not drop port1, port8 and port9 packets */ > + mtk_w32(eth, 0x00000302, PSE_DROP_CFG); > + > + /* GDM and CDM Threshold */ > + mtk_w32(eth, 0x00000707, MTK_CDMW0_THRES); > + mtk_w32(eth, 0x00000077, MTK_CDMW1_THRES); > + > + /* Disable GDM1 RX CRC stripping */ > + val = mtk_r32(eth, MTK_GDMA_FWD_CFG(0)); > + val &= ~MTK_GDMA_STRP_CRC; > + mtk_w32(eth, val, MTK_GDMA_FWD_CFG(0)); mtk_m32() ? Thanks! -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!