From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C53E1A0C47 for ; Tue, 10 Aug 2021 17:40:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFF2A4014F; Tue, 10 Aug 2021 17:40:55 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 1ED7F411C5 for ; Tue, 10 Aug 2021 17:40:54 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id F2A5D3F0B8 for ; Tue, 10 Aug 2021 15:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610054; bh=1Y4OogtomrgXNNynWtSKDHCQUbs3yJz5q0gry/s593U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nTy15Bo8PyAUPDKbZpZ7CB/lX/6+XCN+gQ5t02Wm0KneAFDWtdIyMgaDEWqf3BTRC rnqsryVoDW7f9qlwUhGiwRhJdoUT7stzK7d9s6ovRInVeimEmd+4pBpg8d7r9uCRE9 YZn8MAI6Zi7ujIsIwmnOCejIZzlmh6qXIiaTh2DGGklm3WyIYraBxHq0ekgEtMd8Qm W4fBUpl4yMuymYQdR96mpb96qNQBkIn1gqscWfDaE7zZnMOw+ObuXYbCL32305WmUQ sUQK6ZDftRWSHFfSzrcvbQHdxu2czjUSDQehhkG28wMvN7KO9ewwdFEmZxSjLuP96k +k984STvvx9Hg== Received: by mail-ed1-f69.google.com with SMTP id y22-20020a0564023596b02903bd9452ad5cso10906891edc.20 for ; Tue, 10 Aug 2021 08:40:53 -0700 (PDT) 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=1Y4OogtomrgXNNynWtSKDHCQUbs3yJz5q0gry/s593U=; b=ElVQ0P3H+q+HUn+OMUbRrTgsGUoZalK5UdnT9l6sXk3EwT4OBZQISajL3AT9g2yHHM lsMjEzNThA6IEvF6aQb4weJwHAO5VtVoCqixfQIsynIdgetOgBpLu/zvwWjuLTAstcc+ BS06to/Bg0vVhpdQhtgNbjAKSc5XQmVstDb7kRhTLSlMivRLwsP2zuUHzZifuuBG2mTO rBcYJ2Um98bY6usa/LbaasvzDTaBapM/vHP99sQAQ/AJlzDU6RtRg/Jt0bg1U+ud95rI qQvfZ43sPGdrBAFmHS+3TFrauSbCCyM0KKuQm2EpteMwB/Qg0Ej4u7h95vV3aD05kkUt cwAg== X-Gm-Message-State: AOAM530EUY/I+IGdQEMnLnpwpYaWOnA+Lt6m1dJMHGWpWOSkHgkEoprD PlWj/bSfrGgxdeiqE4X6dmnbOTDJPM03zUHB3t46T3Rbzk7vGtF0iD9oadHFNGrT2WOOgemjwuT do8N50FE3Jd9odWiVeufP2ZLk X-Received: by 2002:a05:6402:d49:: with SMTP id ec9mr5626254edb.333.1628610053522; Tue, 10 Aug 2021 08:40:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0zNEmR8dFo6jIiJUEDA3XeqPbi0UQQt91AEgzeGPvuRdGQJZHw9E4E/A/hf2dDm4l8uR4jA== X-Received: by 2002:a05:6402:d49:: with SMTP id ec9mr5626236edb.333.1628610053364; Tue, 10 Aug 2021 08:40:53 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id i16sm9725499edr.38.2021.08.10.08.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:40:52 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Tue, 10 Aug 2021 17:38:49 +0200 Message-Id: <20210810154022.749358-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix check for PTP support in FW' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/831b94f05dbe2fafb96e999ba8119ab76150b5a7 Thanks. Christian Ehrhardt --- >From 831b94f05dbe2fafb96e999ba8119ab76150b5a7 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 31 May 2021 12:56:42 +0530 Subject: [PATCH] net/bnxt: fix check for PTP support in FW [ upstream commit a642112c91246b035dfa6d6f5bc52b0603c44952 ] On Thor, driver must use HWRM to access the timestamp information. Driver should not advertise PTP support to application if PTP information is not available via HWRM commands. Fixes: 6cbd89f9f3d8 ("net/bnxt: support PTP for Thor") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index d1f6d2317e..0701347003 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -551,9 +551,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp) HWRM_CHECK_RESULT(); - if (!BNXT_CHIP_THOR(bp) && - !(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_DIRECT_ACCESS)) - return 0; + if (BNXT_CHIP_THOR(bp)) { + if (!(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_HWRM_ACCESS)) + return 0; + } else { + if (!(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_DIRECT_ACCESS)) + return 0; + } if (resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_ONE_STEP_TX_TS) bp->flags |= BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS; -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.430176297 +0200 +++ 0009-net-bnxt-fix-check-for-PTP-support-in-FW.patch 2021-08-10 15:11:12.906637292 +0200 @@ -1 +1 @@ -From a642112c91246b035dfa6d6f5bc52b0603c44952 Mon Sep 17 00:00:00 2001 +From 831b94f05dbe2fafb96e999ba8119ab76150b5a7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a642112c91246b035dfa6d6f5bc52b0603c44952 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c6c0af28cb..a65ac6c0ec 100644 +index d1f6d2317e..0701347003 100644 @@ -24 +25 @@ -@@ -750,9 +750,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp) +@@ -551,9 +551,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp) @@ -28 +29 @@ -- if (!BNXT_CHIP_P5(bp) && +- if (!BNXT_CHIP_THOR(bp) && @@ -31 +32 @@ -+ if (BNXT_CHIP_P5(bp)) { ++ if (BNXT_CHIP_THOR(bp)) {