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 D97EFA051C for ; Tue, 11 Feb 2020 12:25:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CFBA41BFA3; Tue, 11 Feb 2020 12:25:02 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 96E571BFA3 for ; Tue, 11 Feb 2020 12:25:01 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id s144so2034848wme.1 for ; Tue, 11 Feb 2020 03:25:01 -0800 (PST) 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=922dLwI5LtYm7yVQPLNwmIlYpQRdcOpM4g5RCCv0s/Q=; b=vAk8pmrjd0QHQlVjEA3KZV9NvIlY+xPaEFfuEvrzHgmIht2lCvGppAvpRsqEj748UZ 51vozux+U8mbBH/n7z+sBCYjg2NP19NqWUlugCQ8sAEpIJR+BVtz7pf0tOwttSkjOF2I 628VbOwS5qn/vGTgmA0XmEXoeaaheb9WtEwENGB2AHXtpSa5jab6Zb5I3aZoSBijNzYq 6C9v29+vpxSC5XgfK6d6PmfKXoRW8+N7X42Rb3m0nYL1zTzX+zvKDPJ89n+EoXOcLst4 rtHo2FfGioeOsEp8xPOmfuOgtysE9UwjhOUnmmmePiBoWdDDrbA7p3ucHJRnkOsC0/n6 YH3w== 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=922dLwI5LtYm7yVQPLNwmIlYpQRdcOpM4g5RCCv0s/Q=; b=V3NVEj8M4BEmNQsj71T9zyxETC2oxbpgD3gs3Kmfv9TDcRCo2MdmR67TsFuXc1ipuC PJ/XKvcfj8xcG2juzNo/dt7pMJDzhnJAAGb/oThElomGdysi9ybUlTjwE6mociJkhkE0 yV9i5gFvj2yzE6lf2AVz+kXemHbVk+b1Pnt95sr3Px3VBF4w1j9GZu4QaqeNoDSmWsYe TTHoIIfda63iy/1VHyNKYgXaAhfmH19iUMGtCAFfkS4eZOkcF58NN/mL7iz3u9h8vbaG +5psR2lCov+vBoXfHRiruhl8GExtzMTdlLz7sjTfvCKRRnIjFIxTjwV8+46FiFpa0UHy 7YlA== X-Gm-Message-State: APjAAAUsM/N5tEqOhNr3u3zsAQGmkGOW1h4VleSwtRl/fO4/hN21Daam mFr1PpL4DgSCgqpO6pZF/LA= X-Google-Smtp-Source: APXvYqxVfNmQ/EkASIhnY6HSFBDR4VppJbTF0qVzZPnV1mCmomDZGt4EX+hMrpNilhjG5fdbkm+ltA== X-Received: by 2002:a05:600c:2942:: with SMTP id n2mr4955245wmd.87.1581420301316; Tue, 11 Feb 2020 03:25:01 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v22sm3272033wml.11.2020.02.11.03.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:25:00 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Date: Tue, 11 Feb 2020 11:19:46 +0000 Message-Id: <20200211112216.3929-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix request for hot reset support' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 ae03b9580d494b6861d473a90f4eb673bd0ec97b Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 10 Dec 2019 20:35:26 +0530 Subject: [PATCH] net/bnxt: fix request for hot reset support [ upstream commit 596bbea4e76f118f8665f275fca9f2ab66dc145f ] During the registration process, the drivers must publish "HOT_RESET_SUPPORTED" capability to the core firmware only if core firmware is capable of Hot Reset. Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_hwrm.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index e259c8239d..f9e4d76e47 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -517,6 +517,7 @@ struct bnxt { #define BNXT_FLAG_INIT_DONE BIT(24) #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS BIT(25) #define BNXT_FLAG_ADV_FLOW_MGMT BIT(26) +#define BNXT_FLAG_FW_CAP_HOT_RESET BIT(27) #define BNXT_PF(bp) (!((bp)->flags & BNXT_FLAG_VF)) #define BNXT_VF(bp) ((bp)->flags & BNXT_FLAG_VF) #define BNXT_NPAR(bp) ((bp)->port_partition_type) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 41730089b1..6b8ebbe5b8 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -672,6 +672,11 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) else bp->flags &= ~BNXT_FLAG_FW_CAP_ERR_RECOVER_RELOAD; + if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_HOT_RESET_CAPABLE) + bp->flags |= BNXT_FLAG_FW_CAP_HOT_RESET; + else + bp->flags &= ~BNXT_FLAG_FW_CAP_HOT_RESET; + HWRM_UNLOCK(); return rc; @@ -756,7 +761,8 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp) if (bp->flags & BNXT_FLAG_REGISTERED) return 0; - flags = HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_HOT_RESET_SUPPORT; + if (bp->flags & BNXT_FLAG_FW_CAP_HOT_RESET) + flags = HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_HOT_RESET_SUPPORT; if (bp->flags & BNXT_FLAG_FW_CAP_ERROR_RECOVERY) flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_ERROR_RECOVERY_SUPPORT; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:40.515001296 +0000 +++ 0040-net-bnxt-fix-request-for-hot-reset-support.patch 2020-02-11 11:17:38.380000973 +0000 @@ -1,14 +1,15 @@ -From 596bbea4e76f118f8665f275fca9f2ab66dc145f Mon Sep 17 00:00:00 2001 +From ae03b9580d494b6861d473a90f4eb673bd0ec97b Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 10 Dec 2019 20:35:26 +0530 Subject: [PATCH] net/bnxt: fix request for hot reset support +[ upstream commit 596bbea4e76f118f8665f275fca9f2ab66dc145f ] + During the registration process, the drivers must publish "HOT_RESET_SUPPORTED" capability to the core firmware only if core firmware is capable of Hot Reset. Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde @@ -31,7 +32,7 @@ #define BNXT_VF(bp) ((bp)->flags & BNXT_FLAG_VF) #define BNXT_NPAR(bp) ((bp)->port_partition_type) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index b1f908ee40..d30da9b87c 100644 +index 41730089b1..6b8ebbe5b8 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -672,6 +672,11 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)