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 29833A0C4C for ; Mon, 12 Jul 2021 15:10:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 239214069D; Mon, 12 Jul 2021 15:10:07 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id D85E34069D for ; Mon, 12 Jul 2021 15:10:05 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id f9so19876255wrq.11 for ; Mon, 12 Jul 2021 06:10:05 -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=4ccFj1ubDiz9gXpyzw87LjXs1MN8R1Y7Zcod6z8l5VM=; b=RQVLcbBX8Ym8Gkp5SdvQhpDmi8MsS6cJ6OfMM72UJVwP83hIYprQMWPXo8MWxkSeaL b33wZ0eUoRO2ZG6vYZ5Iz+wGGgheKzkWrcO/EegDDJ3J+F0K+cy0/Ix7RQdOOVQu+Z1Z S9VNbsJJEGLNHGT/acyhNLkDiRcFi/P871/iDCXUppXMH/uHr/TtQxFulrjA6xcYzg99 6OjUo+4ZSG2KGki5rGEVdXJshNnh1Xv9aqhUwTvvSDVXlUOtSVZn0jYFMFJn98Y8mB4x kQMzc1VBXpmngDwx0dgW1dUFheJ45znBSpCyC1Wj5jFbNJQ6htAGp6UAwUpjLQxJK71v 5tNg== 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=4ccFj1ubDiz9gXpyzw87LjXs1MN8R1Y7Zcod6z8l5VM=; b=gthvwMEhVhlGz29DxvIqAGZz4OYnGIe9MPT/yhN4NwzQhrY6EhfS2ZIos/F64Q+aFz bHo8DrZGK+AhRx8KyTGMq4aeyITZYW5uTMqZN4jdivw+xX7C452WLADSR5BqY1wRYSpe HBNCkWcZx43JaOjh/xvL20bYN270fU175GEvD0NumSkA4sW/QyLfLLlSzCecrSwR1wgX of9uXTofUhU6w9g0/cY/fFUf6qh+qUGt6kCwKl2h5vToJx6U+9ZbNqAG6HA+teCNOw9s oJ5Cc7bCrZv516NEHza/uZaolT0IFhEYnM3vlvEb8/pKz5V/3AkS2BCUco7IPcfU6BC6 w8gw== X-Gm-Message-State: AOAM533Vofp/enGvjvHHigjMPnNfYwnpvgWgkcAXTU3EYcecfSxEjqDN CC+lg0hC4BlMqW+14L14syE= X-Google-Smtp-Source: ABdhPJydS+veRSyO5zmo1x/VIvhulyKkmAA6SAnnJPWq9qhxdPe8mA3IOKbzsW1eZ/VG8alqVJqZTg== X-Received: by 2002:adf:ed46:: with SMTP id u6mr24847364wro.252.1626095405693; Mon, 12 Jul 2021 06:10:05 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id 6sm1785824wmi.3.2021.07.12.06.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:10:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Mon, 12 Jul 2021 14:04:09 +0100 Message-Id: <20210712130551.2462159-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.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 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a2e10ac19d644b2fb0d1be75f8107f7fe47087aa Thanks. Luca Boccassi --- >From a2e10ac19d644b2fb0d1be75f8107f7fe47087aa 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 4b59c5bfa4..be9c7eb75e 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -635,9 +635,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:37.584974242 +0100 +++ 0014-net-bnxt-fix-check-for-PTP-support-in-FW.patch 2021-07-12 13:41:36.206116694 +0100 @@ -1 +1 @@ -From a642112c91246b035dfa6d6f5bc52b0603c44952 Mon Sep 17 00:00:00 2001 +From a2e10ac19d644b2fb0d1be75f8107f7fe47087aa 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 4b59c5bfa4..be9c7eb75e 100644 @@ -24 +25 @@ -@@ -750,9 +750,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp) +@@ -635,9 +635,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)) {