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 X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64F34C2B9F0 for ; Wed, 5 May 2021 16:46:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41CCB61402 for ; Wed, 5 May 2021 16:46:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235810AbhEEQrJ (ORCPT ); Wed, 5 May 2021 12:47:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:39944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235246AbhEEQlZ (ORCPT ); Wed, 5 May 2021 12:41:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C72816162C; Wed, 5 May 2021 16:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232473; bh=kEnxKvRvXtsSjAMGQKobqwfi53MrIc8FrAhY6aWVDy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4uhSiNC+GznCk73llR6yihMjGkXNUOLEkOW2ir8q11AlTC6zN7wGcOhsKPU0jhF6 UTMhrYnKVEsVAzHe9fPtOnGExrjV7CtfAnaLcd1twT8tx+OPtgSKr27/QZ/Oc/4rCf zjDzu2+lK1GLo4H9+5vGSUQk4gbNxVrCmGpFClHTG3f4LoNSbxriA43z+4V8aBQ7vR CTxramiUY7GVW1SBax5ogwqZf9td2nncN1I7KLWekoQarD9W3SRk6YMU+GarcGfPNM siQGujq0GBYzpaXlOD+iQfJVQTIo9/0jVGRtJnw6OM3wj5tWy38Qil1M65kSyZG0dm 7HFt4/f3OzO2Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jonathan McDowell , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.11 014/104] net: stmmac: Set FIFO sizes for ipq806x Date: Wed, 5 May 2021 12:32:43 -0400 Message-Id: <20210505163413.3461611-14-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163413.3461611-1-sashal@kernel.org> References: <20210505163413.3461611-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan McDowell [ Upstream commit e127906b68b49ddb3ecba39ffa36a329c48197d3 ] Commit eaf4fac47807 ("net: stmmac: Do not accept invalid MTU values") started using the TX FIFO size to verify what counts as a valid MTU request for the stmmac driver. This is unset for the ipq806x variant. Looking at older patches for this it seems the RX + TXs buffers can be up to 8k, so set appropriately. (I sent this as an RFC patch in June last year, but received no replies. I've been running with this on my hardware (a MikroTik RB3011) since then with larger MTUs to support both the internal qca8k switch and VLANs with no problems. Without the patch it's impossible to set the larger MTU required to support this.) Signed-off-by: Jonathan McDowell Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c index bf3250e0e59c..749585fe6fc9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c @@ -352,6 +352,8 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = gmac; plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed; plat_dat->multicast_filter_bins = 0; + plat_dat->tx_fifo_size = 8192; + plat_dat->rx_fifo_size = 8192; err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (err) -- 2.30.2 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 X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9883C43461 for ; Wed, 5 May 2021 16:41:19 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75EF761C1F for ; Wed, 5 May 2021 16:41:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75EF761C1F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=m2WlDPxal2NjfjLwQ7NzdnYB0MARJPpCPpRF5iOA8Xc=; b=idD0GD8GjMzBbHfHCDoNivCCl FWJtjKEJ6oxsGh4iclZ4MFgUnT/s76twX6/71q4gB3e+k0PjcyHHhWRjUgz8dpei6QmePvP6xomqe N7frPqD8/KsbsoZU6aVG1OG3gKmuwtvk6KIgMMcRLpCdy1M8+Pb2VR1mBnErq1hSxqWrmUaFXY8oI 7lhLGcFvmN9yPzU2QVYl0JmqGzkO9qDlDyBR1X8KJjuSwRPKPXkE4QDJP5g+XtC5/H94nQxpSK78J gGSVdbSddxzRCoHu+ReB0bCDhhlk3KHQe2WfQQfkjMoQSwq4bm18aFuiqdkwZ/uiSIoIPQ5U86YlL /vUL01gWg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leKYf-001hOR-N6; Wed, 05 May 2021 16:39:33 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leKTs-001fAw-U2 for linux-arm-kernel@desiato.infradead.org; Wed, 05 May 2021 16:34:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=BkVLaVN9TrFNTXqbioK21JNARIub4ejWNzCCtaQ8SWs=; b=TSFaq+aDiTI+YS8g+rs5hI7UYL qPHTc6YKgChgoJkAflIltBmYPxaxRF4sJmwTF1DbVRYfc4hRfJfBeZmuTqvgZoGdYmSnsdHlEnhdW 4zwyCXUVI5o/WRuoV+j1sK8jJdK+mhlHmCWCuNxT9bvVPIAU+MYESeK4weFme+sEyEoZRk1CrcHoA 9Aw/XShsWT16/J/Rirkx3TJl0F2T9Qqus3cU4Psf0WA620ZIT86g/5zH+2B1yTmn84ApZGiyL2UZN lGNhewrjUCGOEa6aNZ5Us0Pi4YHUPEqcqCC8mejziIDCi4sc11jgBZYn95nQqgMYHUdQwByjJGMkk qKa0t1QA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leKTq-004wq9-AN for linux-arm-kernel@lists.infradead.org; Wed, 05 May 2021 16:34:35 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id C72816162C; Wed, 5 May 2021 16:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232473; bh=kEnxKvRvXtsSjAMGQKobqwfi53MrIc8FrAhY6aWVDy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4uhSiNC+GznCk73llR6yihMjGkXNUOLEkOW2ir8q11AlTC6zN7wGcOhsKPU0jhF6 UTMhrYnKVEsVAzHe9fPtOnGExrjV7CtfAnaLcd1twT8tx+OPtgSKr27/QZ/Oc/4rCf zjDzu2+lK1GLo4H9+5vGSUQk4gbNxVrCmGpFClHTG3f4LoNSbxriA43z+4V8aBQ7vR CTxramiUY7GVW1SBax5ogwqZf9td2nncN1I7KLWekoQarD9W3SRk6YMU+GarcGfPNM siQGujq0GBYzpaXlOD+iQfJVQTIo9/0jVGRtJnw6OM3wj5tWy38Qil1M65kSyZG0dm 7HFt4/f3OzO2Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jonathan McDowell , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.11 014/104] net: stmmac: Set FIFO sizes for ipq806x Date: Wed, 5 May 2021 12:32:43 -0400 Message-Id: <20210505163413.3461611-14-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163413.3461611-1-sashal@kernel.org> References: <20210505163413.3461611-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210505_093434_400448_D0938FC9 X-CRM114-Status: GOOD ( 12.73 ) 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 From: Jonathan McDowell [ Upstream commit e127906b68b49ddb3ecba39ffa36a329c48197d3 ] Commit eaf4fac47807 ("net: stmmac: Do not accept invalid MTU values") started using the TX FIFO size to verify what counts as a valid MTU request for the stmmac driver. This is unset for the ipq806x variant. Looking at older patches for this it seems the RX + TXs buffers can be up to 8k, so set appropriately. (I sent this as an RFC patch in June last year, but received no replies. I've been running with this on my hardware (a MikroTik RB3011) since then with larger MTUs to support both the internal qca8k switch and VLANs with no problems. Without the patch it's impossible to set the larger MTU required to support this.) Signed-off-by: Jonathan McDowell Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c index bf3250e0e59c..749585fe6fc9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c @@ -352,6 +352,8 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = gmac; plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed; plat_dat->multicast_filter_bins = 0; + plat_dat->tx_fifo_size = 8192; + plat_dat->rx_fifo_size = 8192; err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (err) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel