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=-5.7 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 E6481C33CAF for ; Wed, 22 Jan 2020 13:30:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCFBE205F4 for ; Wed, 22 Jan 2020 13:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699851; bh=3NHg/j5Ylm3/V5vjjW3y4fiKoJeTEfYhg0I3kxwap98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AJZO2ZzGHhL9YCzTy2kF84ZxwkEInZlc3nFxdfXdETDxhiF23yPjdr1CBv27KTRIh gzTDGhARmBOYDr6SUM6Egz+hgLmWB1/dnrG9gPEsEZGprTMSX/49Bm1LSh6QmnS4hc WF8pGcOa94eV90UJkVfypk6CBxMLsAjaOUTROCmM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729783AbgAVNVj (ORCPT ); Wed, 22 Jan 2020 08:21:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:38818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729777AbgAVNVi (ORCPT ); Wed, 22 Jan 2020 08:21:38 -0500 Received: from localhost (unknown [84.241.205.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2AE6C205F4; Wed, 22 Jan 2020 13:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699297; bh=3NHg/j5Ylm3/V5vjjW3y4fiKoJeTEfYhg0I3kxwap98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fSeRLtTWRevxLz15q0kwRpRKaoZB0Brr7MykJsOxbZ63FK5Et0Qp8CVhJnj4vfC0H XHtnoA/4VdGykoTk/aVQ3gcveIJmvIsX8UU+sIJHbsyLanb1Lt1033M7TliwZaHLYC RV5Hif8A9xivKAbnj2XQ7ALSctAz+FPMOfw8ohb8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" Subject: [PATCH 5.4 100/222] net: stmmac: Enable 16KB buffer size Date: Wed, 22 Jan 2020 10:28:06 +0100 Message-Id: <20200122092840.900104446@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jose Abreu commit b2f3a481c4cd62f78391b836b64c0a6e72b503d2 upstream. XGMAC supports maximum MTU that can go to 16KB. Lets add this check in the calculation of RX buffer size. Fixes: 7ac6653a085b ("stmmac: Move the STMicroelectronics driver") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1108,7 +1108,9 @@ static int stmmac_set_bfsize(int mtu, in { int ret = bufsize; - if (mtu >= BUF_SIZE_4KiB) + if (mtu >= BUF_SIZE_8KiB) + ret = BUF_SIZE_16KiB; + else if (mtu >= BUF_SIZE_4KiB) ret = BUF_SIZE_8KiB; else if (mtu >= BUF_SIZE_2KiB) ret = BUF_SIZE_4KiB;