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 37DE9A0093 for ; Tue, 19 May 2020 14:59:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F66E1C1E4; Tue, 19 May 2020 14:59:10 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 21DE41D610 for ; Tue, 19 May 2020 14:59:09 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id l18so15807376wrn.6 for ; Tue, 19 May 2020 05:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QK5lXdsxUlAQMBMYKPhkWJpRSrgOVzzcB4E4tUU/1n0=; b=Enk0aqlaNuURn3HWWVgYW68k9rWQxgoAg61+L3bIT2N5JoMOdRnhqfnB2Hx2bqOAZC INOFfyD5caxktsVjUVGlHoE3BsIEc9567P3+f82vEt+Pa3LL8g7uOM93clBJkujSb7SY eNwwx6QikJMWFDR5nBXB6MPtBB05jBbg6V6CsmalnpoWXNQOM12ZvuXap4tZfvEVejpE GCRmTkIS10/dxOJA09L+4ej7TqGXIXjmeLBxi3a9cc+xSMMLqIQHPrwhhirMmuIqDkW/ 82kQ6RvcMfbCR4+OnKt7yWYOXorM1XaU9WSFMSp1dIep7U3qILhdYB6aiaNa98a6JGAY RD7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QK5lXdsxUlAQMBMYKPhkWJpRSrgOVzzcB4E4tUU/1n0=; b=EARvO6EN093499J/C5xSeUIQQQZ2vY+TAz9XzCvIYn2m9ulJDnHnk2PAye5L/E14pV ZPlkqS40vGtjTvz1wd73a527qW4oDiRB52KG3QW2J3yOFx9V/i655VRPzPbUXt2aLO65 OVkJj6dstp02NKh56kXktxbg5MnBLATh7Ro+qdGqkYG1RiF5h8fmnHgZA5+ARl0ti4Cg 2XXKq5uPi3/nspWqAharvy2eLNQ4oPYP6aq3O8lphwu99Q803wCRD4kely7sMI2f1I/i nxEVPo2yEzYe/c5oO2kOvuz2FmGTz5M1fhWzwaLjd8ZUtyAA5ikR1GuGTpb2Qx/R+HKx hKtA== X-Gm-Message-State: AOAM5339TEWeZ8ceK6tP/roUB8Re1er81GP3TEQzutU6PrlBFmVNd7nj NkhwZaI+5QVZCshfJcq1jP7tTnCP2aYZ32T3 X-Google-Smtp-Source: ABdhPJxQlJZmHNTBT23KiyH1eQvvZirLqHEnBaAcK1YLB4Guvv/Ah30pwZfHRLNLPk1BX9Vkkibzxw== X-Received: by 2002:adf:9286:: with SMTP id 6mr27197644wrn.179.1589893148652; Tue, 19 May 2020 05:59:08 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w13sm20251732wrm.28.2020.05.19.05.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Alex Marginean Cc: Gagandeep Singh , dpdk stable Date: Tue, 19 May 2020 13:53:33 +0100 Message-Id: <20200519125804.104349-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/enetc: fix Rx lock-up' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 2847184082104fa408a97d599f92b9e686970b8d Mon Sep 17 00:00:00 2001 From: Alex Marginean Date: Mon, 2 Mar 2020 20:02:03 +0530 Subject: [PATCH] net/enetc: fix Rx lock-up [ upstream commit 880728f8d449304a7fd0085a950509b5b21746da ] The default value in hardware for the Rx MAC FIFO (@) is higher than it should be and can lead to Rx lock-up under traffic. Set it to the value recommended by hardware team, 1. Signed-off-by: Alex Marginean Signed-off-by: Gagandeep Singh --- drivers/net/enetc/base/enetc_hw.h | 3 ++- drivers/net/enetc/enetc_ethdev.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/enetc_hw.h index 2fe7ccb5bb..00813284ee 100644 --- a/drivers/net/enetc/base/enetc_hw.h +++ b/drivers/net/enetc/base/enetc_hw.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #ifndef _ENETC_HW_H_ @@ -86,6 +86,7 @@ enum enetc_bdr_type {TX, RX}; #define ENETC_PSIPMAR1(n) (0x00104 + (n) * 0x20) #define ENETC_PCAPR0 0x00900 #define ENETC_PCAPR1 0x00904 +#define ENETC_PM0_RX_FIFO 0x801C #define ENETC_PM0_IF_MODE 0x8300 #define ENETC_PM1_IF_MODE 0x9300 #define ENETC_PMO_IFM_RG BIT(2) diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index 20b77c006c..eb637d0306 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #include @@ -147,6 +147,9 @@ enetc_hardware_init(struct enetc_eth_hw *hw) hw->hw.port = (void *)((size_t)hw->hw.reg + ENETC_PORT_BASE); hw->hw.global = (void *)((size_t)hw->hw.reg + ENETC_GLOBAL_BASE); + /* WA for Rx lock-up HW erratum */ + enetc_port_wr(enetc_hw, ENETC_PM0_RX_FIFO, 1); + /* Enabling Station Interface */ enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.756387333 +0100 +++ 0023-net-enetc-fix-Rx-lock-up.patch 2020-05-19 13:56:18.203501531 +0100 @@ -1,8 +1,10 @@ -From 880728f8d449304a7fd0085a950509b5b21746da Mon Sep 17 00:00:00 2001 +From 2847184082104fa408a97d599f92b9e686970b8d Mon Sep 17 00:00:00 2001 From: Alex Marginean Date: Mon, 2 Mar 2020 20:02:03 +0530 Subject: [PATCH] net/enetc: fix Rx lock-up +[ upstream commit 880728f8d449304a7fd0085a950509b5b21746da ] + The default value in hardware for the Rx MAC FIFO (@) is higher than it should be and can lead to Rx lock-up under traffic. Set it to the value recommended by hardware team, 1.