Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4633273ybl; Wed, 22 Jan 2020 01:41:01 -0800 (PST) X-Google-Smtp-Source: APXvYqzDcgHmQ1oQ5DBgrA5Ig14atWO/kNebRzapAG2BslOBj3SjamAKxGHJX9ZVsQvjzrUtEnXh X-Received: by 2002:aca:c551:: with SMTP id v78mr6200758oif.161.1579686061491; Wed, 22 Jan 2020 01:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579686061; cv=none; d=google.com; s=arc-20160816; b=oNsmTPld0vCYFKT+M0TRYdUlGPe3PBy3kYCjkF4oIizId/eHfuggi0b9+crbRh9boW HBlNcUCtFAEkeDd3fRkRLgOkWmbaBTPYcgsTdb72ZWBymVlpVh5Sl1dXvGPy01qWejrW k6qAneFht075mrHChHgiZXSvECuT6BRfa7MipaXvrprozG4AvKg69Ssj71naueL34MIl t+Ej4ChLetc5bIyDPLZzW2r8fqR7D/bqKtveyAEvBmdEeDrHtJJSrhzlOeHJlmMiDCLU 0YHbA5f5mNhkvDW47wC/699i3gZAZPL4RII949A+UvABBuj7aGuE+WMrtuo8cd/0hPpI L+sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=98DwKISf+57vsK3eVGjjJGSmiFLVjfV586oZhU3Uwh4=; b=qTG6ue0qbzyY0xdp3rSra8AhZURpHLJCISyYKcwirZbJWJ8ZK+pFv85EuDjNb/qpek 9KRHNXcqEAYJYy05VM93CGoHPwa6S5xPoxLBiJPaDuBUTWYxwb/XhGiFrzRiadUXFLRE vVoOJ00o6HfT5hpNaP1gzOcVtlsILTJvSh0xvqk6+AolOP2zP8B2omX+RB6sJvawrysB CO1CBrF8t2TYiHvgNQMUck6wMV+Ae++9HJJzzK6znhmgppDw6DO2kVizBnqo9mkOa577 +avgPNodO3vZBpg3zythBMpv0gyd7bJlRXmpgmRMYb5jci7SVr+ZDVjKBiVZwTgmfDR2 OMog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=A6pf4rb6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v67si22104658oia.26.2020.01.22.01.40.50; Wed, 22 Jan 2020 01:41:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=A6pf4rb6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733299AbgAVJj6 (ORCPT + 99 others); Wed, 22 Jan 2020 04:39:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:58300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733295AbgAVJjz (ORCPT ); Wed, 22 Jan 2020 04:39:55 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 6AD8F24684; Wed, 22 Jan 2020 09:39:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685994; bh=bCq0ctxizNCAwzs1hJaNsvFiiEgdIQRvQWKcWtlFrOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A6pf4rb6SpOFBoQAEVk5dmG8f6yFKEyMNXdoD0bht5UT/xEclvMSQHDPwbO1tOu3J hpWnT92kCpO9bV7T1A2mUUg3S7nNoLcWYxLLFR+qqk28129259CmNzd01d+ipnvDVg ey9RIOoIrH77uhLRSb5AOjeVCh1rKPNrk878MyvE= 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 4.14 30/65] net: stmmac: Enable 16KB buffer size Date: Wed, 22 Jan 2020 10:29:15 +0100 Message-Id: <20200122092755.081585763@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092750.976732974@linuxfoundation.org> References: <20200122092750.976732974@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -1043,7 +1043,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;