From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1451573-1517181197-5-11028786692397504610 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES daen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181197; b=ChbxqCSo19NbK1oJhlj7GoiVGT7aJGKWiziTaTnpGe44tj6 rHA6jmaeLxTErN0fGz3iCZvG67+pVvksg62hQDvdstFcpMk1zCO99/wRfcjasq2x qV5yShXc8iIxOk62mxqjNEULK43bbqpNPJbYYAjt7nvyVyfFg2+Fla9LAspMPU32 U87ZGepPrts+FuJrzlAGdrbHEfvU5z3gWVgZ/y/kPv7arzZbr6kchSnzZhBrZYSI hbrtNIM9kZ1w3+pelG2tPMtre4TwEmscu+yOFKY74deRHJZ9Ef9HkEUXMdFamDT1 ReHpOXtuo44cV3yLFk3k1BdBR4pbumLEvj7I+DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181197; bh=Cl7apL m7BxAzn1ig7fCxW8DkTDPQyQhz7TJtPIjcafg=; b=MiT1antglh3DXp4D38FlKm qbE87bhX5tSovm/tR+GOdAT34NVc5153FIxQKJeGL6Qufr90C/5cBMcqfs7cm3t0 CP5aurvKd5g2tfLOpBndGee5GBN+2AIjDAcGjPxshvHrSjW08zs6YitvBmnJB0zV pByhP0sZhsf+G403cZ8OZ9UBUSJzBQPOtjUA8kVShMm+83tK6Qtwk7h8NXOxNSEJ n66OQD3DxRBjqTyGiEs5Y7OavKmlkycjrQbdIW+RahpM17Cw3pPbJVxC/0FlYX7w jsKwN3aO65dk6Ka2DFYKgSOMaMUJr+fxg9b0OFp+H6F8VpCEsKIJGFWCMC/59hqg == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=nyW4g9ew x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=nyW4g9ew x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752708AbeA1W0X (ORCPT ); Sun, 28 Jan 2018 17:26:23 -0500 Received: from mail-bn3nam01on0125.outbound.protection.outlook.com ([104.47.33.125]:13020 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752376AbeA1W0T (ORCPT ); Sun, 28 Jan 2018 17:26:19 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Yan Markman , Antoine Tenart , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 023/100] net: mvpp2: allocate zeroed tx descriptors Thread-Topic: [PATCH AUTOSEL for 4.14 023/100] net: mvpp2: allocate zeroed tx descriptors Thread-Index: AQHTmIcAzXgFmAABNUSysj4bTD9NaQ== Date: Sun, 28 Jan 2018 22:26:12 +0000 Message-ID: <20180128222547.7398-23-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1004;7:OCqESe5U5qZFuWJNOPa8Zckaee4+qLKk8ox62IJfxuekjD69R5pIxNz4rNKrgIFYjlAohjiW9wctatRwx5hMEZKISQ8Hs1bFiCFZhVGLtnScpTsE4CTKIIklvFKykEeT8PMgS3Rpd/QonhzoXUDoISeIQlFBY3MQ/S3WcwGR0A36RMndlnskPtb6ZxcRjyogpcntfDSFLMsho5WogB07Ecxb1S6PJEqyR3lh2GXgYKkFKaqnNLmihNOyFtlK1sSo x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 724ca88c-5221-457e-c642-08d5669e248f x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1004; x-ms-traffictypediagnostic: MW2PR2101MB1004: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(58145275503218); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB1004;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1004; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(396003)(376002)(39380400002)(39860400002)(366004)(199004)(189003)(2501003)(6486002)(186003)(110136005)(5660300001)(106356001)(97736004)(68736007)(6512007)(5250100002)(316002)(53936002)(66066001)(99286004)(2950100002)(86362001)(54906003)(22452003)(6436002)(26005)(102836004)(59450400001)(25786009)(10090500001)(76176011)(8676002)(10290500003)(14454004)(6506007)(86612001)(8936002)(81156014)(2900100001)(81166006)(1076002)(107886003)(478600001)(3280700002)(2906002)(72206003)(7736002)(305945005)(105586002)(36756003)(3846002)(3660700001)(6116002)(4326008)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1004;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 7/qUPIiLceZoomjnAoFOzscVZWyqnHsvWJQKaxW6OV9m2YtoRoirC88iOh8UJ00FMHjbKfVCFqZmQ4R0r4mS4w== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 724ca88c-5221-457e-c642-08d5669e248f X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:12.5605 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1004 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 netwo= rk 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 --- drivers/net/ethernet/marvell/mvpp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/ma= rvell/mvpp2.c index fcf9ba5eb8d1..e9bc551d7621 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -5408,7 +5408,7 @@ static int mvpp2_aggr_txq_init(struct platform_device= *pdev, u32 txq_dma; =20 /* Allocate memory for TX descriptors */ - aggr_txq->descs =3D dma_alloc_coherent(&pdev->dev, + aggr_txq->descs =3D dma_zalloc_coherent(&pdev->dev, MVPP2_AGGR_TXQ_SIZE * MVPP2_DESC_ALIGNED_SIZE, &aggr_txq->descs_dma, GFP_KERNEL); if (!aggr_txq->descs) --=20 2.11.0