Received: by 10.223.185.116 with SMTP id b49csp1068551wrg; Fri, 23 Feb 2018 11:20:23 -0800 (PST) X-Google-Smtp-Source: AH8x224Wlq8CgLtzgzlh/yMWTIfkn4akhcUaWlSE7Uixe9bJnkw5oiKqEAYsNfHFGQ3xb/LWjySf X-Received: by 10.98.68.26 with SMTP id r26mr2723172pfa.231.1519413623454; Fri, 23 Feb 2018 11:20:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413623; cv=none; d=google.com; s=arc-20160816; b=hqaXeQcW3OyFCHgLPOl159f1X3UCSHoGhXNHmV5XMKW5sUkWd4xNIcVC1NrZDXZbxD EdFfFD2WjrfMBuUU69nwO+wH/82VlVuToVz0PYyQk/KdpOO6OIiiStPlLARPiX2t+F+v 7q57bitgJDqTBCJui5yfe7O8mwW1/6wFhzzEXjz9JQktzibuyz0G8rrufnZd1JufgIz0 hK9xrI5cqzT2Pt8UawtNt6kkTXMdjKm9bAnaDf+wWdvacwMFVmfTQ+yYWEA0cLr8D48k HHRqxlyxYVC1D+cdNQZQXpCrjUQYn2fJj4Lsx7WdI0ZD1sfminytGMkLOvb5OpyTb8WY qSqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=BwJ8LjGrxVFYYFEwTqDBDKi5tmSRXD2L5s2N4sw7Neg=; b=sBMKq5MglbDAK3fosmnAVr14+7FIr9D2iEf5d5+KbfhZnzlQ/Urt4X+re8OWtZdGc9 rPeparN52CDAz47KEKOk+FmrgKxmIrfSr2QvNJIFdZm5nKYcVhjgt8MwAU/0ofSxhSuj OGlSLMLMXt819zFzF82ZGTKiO3ssRvPh6HYTzIS9ixI+92uGssRInhzRbj5GbfeHTXRb qNk1O3j3Qg7jx3PvB6mnfRPs0HhvEjcjk4z1RNLwxpWTWmIhlX3KBDIckEAOMYbGEApx pVzAZnYMEmF9J4uaigqJ8nU+igbgrWCnSQLo9vsb3e+O1hZTDzsBP8KEtThLmlbdszkk Cj9Q== ARC-Authentication-Results: i=1; mx.google.com; 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 r1-v6si2166207plb.453.2018.02.23.11.20.09; Fri, 23 Feb 2018 11:20:23 -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; 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 S935506AbeBWSym (ORCPT + 99 others); Fri, 23 Feb 2018 13:54:42 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47862 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935496AbeBWSyk (ORCPT ); Fri, 23 Feb 2018 13:54:40 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E39141217; Fri, 23 Feb 2018 18:54:39 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yan Markman , Antoine Tenart , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 081/159] net: mvpp2: allocate zeroed tx descriptors Date: Fri, 23 Feb 2018 19:26:29 +0100 Message-Id: <20180223170753.395913447@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yan Markman [ Upstream commit a154f8e399a063137fc42b961f437248d55ece29 ] Reserved and unused fields in the Tx descriptors should be 0. The PPv2 driver doesn't clear them at run-time (for performance reasons) but these descriptors aren't zeroed when allocated, which can lead to unpredictable behaviors. This patch fixes this by using dma_zalloc_coherent instead of dma_alloc_coherent. Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit") Signed-off-by: Yan Markman [Antoine: commit message] Signed-off-by: Antoine Tenart Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvpp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -5399,7 +5399,7 @@ static int mvpp2_aggr_txq_init(struct pl u32 txq_dma; /* Allocate memory for TX descriptors */ - aggr_txq->descs = dma_alloc_coherent(&pdev->dev, + aggr_txq->descs = dma_zalloc_coherent(&pdev->dev, MVPP2_AGGR_TXQ_SIZE * MVPP2_DESC_ALIGNED_SIZE, &aggr_txq->descs_dma, GFP_KERNEL); if (!aggr_txq->descs)