From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BA515A04F0 for ; Tue, 10 Dec 2019 16:00:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9E2621BE9E; Tue, 10 Dec 2019 16:00:27 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 364091B13C for ; Tue, 10 Dec 2019 16:00:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tq2/DzK9jSKoEK+MLXEwgCUXMBCDCzVMHIESOSmafck=; b=VhwLXItSIyMURBM3og5P7Clai0HuX1txUcCb6b3NXs8H8DUhOdGBs0J0LO2w4QPrnb1JOg vF7V+7+z33c9NheJm1VvuItmd1kb2VyaYbVA7b0Mt3G0HNemtN0j5z+IseM68qL0uUyNtf iV2jPa81sOBEFt96DcSQxoCi5yzjXi0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-N8yVCeB3MG-X9AJb1EKBww-1; Tue, 10 Dec 2019 10:00:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7CCD8024D0; Tue, 10 Dec 2019 15:00:21 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id D30875D9C5; Tue, 10 Dec 2019 15:00:20 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: dpdk stable Date: Tue, 10 Dec 2019 14:58:47 +0000 Message-Id: <20191210145937.32755-13-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: N8yVCeB3MG-X9AJb1EKBww-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/enetc: fix BD ring alignment' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/ad6f6c69be6e487d25= 4dcd4cf495841115e913cc Thanks. Kevin. --- >From ad6f6c69be6e487d254dcd4cf495841115e913cc Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 23 Oct 2019 11:35:59 +0530 Subject: [PATCH] net/enetc: fix BD ring alignment [ upstream commit 896d9372062e2f63033a607cc5893111e057cd98 ] enetc BD rings should be aligned to 128 instead of RTE_CACHE_LINE_SIZE. Fixes: 469c6111a799 ("net/enetc: enable Rx and Tx") Signed-off-by: Gagandeep Singh --- drivers/net/enetc/base/enetc_hw.h | 3 +++ drivers/net/enetc/enetc_ethdev.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/ene= tc_hw.h index f36fa11e0..478731d8d 100644 --- a/drivers/net/enetc/base/enetc_hw.h +++ b/drivers/net/enetc/base/enetc_hw.h @@ -13,4 +13,7 @@ #define ENETC_DEV_ID=09=090xe100 =20 +/* BD RING ALIGNMENT */ +#define ENETC_BD_RING_ALIGN=09128 + /* ENETC register block BAR */ #define ENETC_BAR_REGS=09=09=090x0 diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_eth= dev.c index a21205af0..2cc851751 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -303,10 +303,10 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_= desc) =20 =09size =3D nb_desc * sizeof(struct enetc_swbd); -=09txr->q_swbd =3D rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); +=09txr->q_swbd =3D rte_malloc(NULL, size, ENETC_BD_RING_ALIGN); =09if (txr->q_swbd =3D=3D NULL) =09=09return -ENOMEM; =20 =09size =3D nb_desc * sizeof(struct enetc_tx_bd); -=09txr->bd_base =3D rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); +=09txr->bd_base =3D rte_malloc(NULL, size, ENETC_BD_RING_ALIGN); =09if (txr->bd_base =3D=3D NULL) { =09=09rte_free(txr->q_swbd); @@ -454,10 +454,10 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr, =20 =09size =3D nb_rx_desc * sizeof(struct enetc_swbd); -=09rxr->q_swbd =3D rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); +=09rxr->q_swbd =3D rte_malloc(NULL, size, ENETC_BD_RING_ALIGN); =09if (rxr->q_swbd =3D=3D NULL) =09=09return -ENOMEM; =20 =09size =3D nb_rx_desc * sizeof(union enetc_rx_bd); -=09rxr->bd_base =3D rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); +=09rxr->bd_base =3D rte_malloc(NULL, size, ENETC_BD_RING_ALIGN); =09if (rxr->bd_base =3D=3D NULL) { =09=09rte_free(rxr->q_swbd); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:39.970929350 +0000 +++ 0013-net-enetc-fix-BD-ring-alignment.patch=092019-12-10 14:49:38.999458= 756 +0000 @@ -1 +1 @@ -From 896d9372062e2f63033a607cc5893111e057cd98 Mon Sep 17 00:00:00 2001 +From ad6f6c69be6e487d254dcd4cf495841115e913cc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 896d9372062e2f63033a607cc5893111e057cd98 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index fd71155ee..2fe7ccb5b 100644 +index f36fa11e0..478731d8d 100644 @@ -31 +32 @@ -index dc05c00ff..4e978348c 100644 +index a21205af0..2cc851751 100644 @@ -34 +35 @@ -@@ -179,10 +179,10 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb= _desc) +@@ -303,10 +303,10 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb= _desc) @@ -47 +48 @@ -@@ -326,10 +326,10 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr, +@@ -454,10 +454,10 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,