From patchwork Sat Jan 11 09:50:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234164 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 B7A63C33C9E for ; Sat, 11 Jan 2020 10:04:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EE7A2082E for ; Sat, 11 Jan 2020 10:04:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737086; bh=cxid6C6F9WrArkdBSO7ewILRRUwrf6B52AkZM6I+OZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kOJ1MNT4G2FKJ7kfgXvQPk5Ud9i3ZzNbzymtmeOMeHtI++XAtGHvLidwcixwl2ZuI eXOyPKOPorVJR85oAUmmyTvbeEMnh1lC59Oga9nNlBeMVyjey24umZqLrr1O6VhAzG /tTQcD/Nj3fZR4qQQqH2MMO7f1r3/cNKksdEGBn0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729311AbgAKKEp (ORCPT ); Sat, 11 Jan 2020 05:04:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:37408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729021AbgAKKEp (ORCPT ); Sat, 11 Jan 2020 05:04:45 -0500 Received: from localhost (unknown [62.119.166.9]) (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 DB4F020848; Sat, 11 Jan 2020 10:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737085; bh=cxid6C6F9WrArkdBSO7ewILRRUwrf6B52AkZM6I+OZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ga5lMUWbPKlUR8lncotJbYYq3V3A9acVbAfsjP+4ouvf+TQGO3awXyK7r7oBXPb1c delxHOvFwxV15fpngBk3hRUUxBWm/SIHIXHyfGdVz5ERTkI+SxU5LeTOY9hFEnPMsg 40i+7BGWugyb2a5lCC3mcVNnFjfAdfOaxzl2oov0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 76/91] net: stmmac: RX buffer size must be 16 byte aligned Date: Sat, 11 Jan 2020 10:50:09 +0100 Message-Id: <20200111094911.724733301@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094844.748507863@linuxfoundation.org> References: <20200111094844.748507863@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jose Abreu [ Upstream commit 8d558f0294fe92e04af192e221d0d0f6a180ee7b ] We need to align the RX buffer size to at least 16 byte so that IP doesn't mis-behave. This is required by HW. Changes from v2: - Align UP and not DOWN (David) Fixes: 7ac6653a085b ("stmmac: Move the STMicroelectronics driver") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 5ac48a594951..a2b7c685cbf1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -55,7 +55,7 @@ #include #include "dwmac1000.h" -#define STMMAC_ALIGN(x) __ALIGN_KERNEL(x, SMP_CACHE_BYTES) +#define STMMAC_ALIGN(x) ALIGN(ALIGN(x, SMP_CACHE_BYTES), 16) #define TSO_MAX_BUFF_SIZE (SZ_16K - 1) /* Module parameters */