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 2B2D4A0547 for ; Tue, 9 Feb 2021 11:36:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2463716070A; Tue, 9 Feb 2021 11:36:15 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id E3C5A40147 for ; Tue, 9 Feb 2021 11:36:12 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id v14so5403494wro.7 for ; Tue, 09 Feb 2021 02:36:12 -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=+XJsq0YN/quWXXft/cpdeYD5DKD9kz/B5EoM3eWjL/s=; b=aUN/t3rqNOdU718tzXOG9nXvRimvIlZPdiTxuUe8IvC1nKknryl/XnZZNR/t9cpRWq 05KoU317tzTKBtpi9ZKityJNhvcqH68LqbGNQPqtz3Xwk8DujoJO6AwNhsKk5EdaEGfK wSMS1RbSoE0EgkWVIAQ+RVgpEpWVyaQvKCXkvwr5tkKCZxEYQkwWEJfcm0BYHw/Q0j1b JtcBRDWHbf3v5nIi8lHA/zZGBpdrk/BvXlNrn8QlSVgbIz5eNBMqxbae/Yd6EKSpd3gt a3yVRtu39mmfhZ+l14qtCabD921aXUdJv6ybMTRkonL0qzyiL686Syp+M0Uzg30tWx7e K1Mg== 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=+XJsq0YN/quWXXft/cpdeYD5DKD9kz/B5EoM3eWjL/s=; b=GmDuZXZLh162Aal+3s6TvLHSXcPWflTk8htFGGyByNpV4t4Yl4MBHOqQNKNsPT9sX/ Pb3R/yNv+jSvpDd2pcqd0MzbwKVWeKrUBkqx9Bd5VwTBa9kAU+OXxMLXu2ZAo51poj6n omgkLLjCqA9K5L6x/ZjOsy1ZWGvezuxxTzrv/iXXtTlwKC9FPFs6G7z7JYfeuYZ/eGwL O84L5zD51Yt1eAh1UL8DkXasufoN8P3VL3qvs/RVGvrQEkiHpkc1HPvg4e7jueHI0RNn AWQ4OqN2Le4Cecda55aJ0aiKx5dU+OdHKrGwuuZCZ2901KIkT5V6fwozUFAN3+l2YoRz QzCw== X-Gm-Message-State: AOAM5322D1LGIiMhqfHVCEWQeoqEwm8aEuCJe+e3RNogfs/E0IeXDIZ1 /H5T+kuxsDuxD/luNOrv4nQjlG5UzECNQA== X-Google-Smtp-Source: ABdhPJzXttFfW0+s6xi2mc5V8M5uBzgTRaYLtqvE7nghgXPDAoIrkQeGac3p6RfOkVi4T1eBbdhBeQ== X-Received: by 2002:a5d:4142:: with SMTP id c2mr25003946wrq.359.1612866972668; Tue, 09 Feb 2021 02:36:12 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z4sm34497517wrw.38.2021.02.09.02.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 02:36:11 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Lijun Ou , dpdk stable Date: Tue, 9 Feb 2021 10:35:13 +0000 Message-Id: <20210209103529.466775-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210209103529.466775-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> <20210209103529.466775-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix link status change from firmware' has been queued to stable release 20.11.1 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.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/11/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/1c40552b23c5e0376002f8b1b4e371185ab41311 Thanks. Luca Boccassi --- >From 1c40552b23c5e0376002f8b1b4e371185ab41311 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 3 Feb 2021 20:23:48 +0800 Subject: [PATCH] net/hns3: fix link status change from firmware [ upstream commit bac6a06441216aceff3588291c79e3a558a1c5a5 ] When the hardware link status changes, the firmware proactively reports the link status change message, and then driver update link status. This feature is lack of a switch to control in PF driver. Otherwise, this feature does not take effect when the kernel PF driver that supports the feature is not loaded. Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox") Signed-off-by: Huisong Li Signed-off-by: Lijun Ou --- drivers/net/hns3/hns3_cmd.h | 10 ++++++++++ drivers/net/hns3/hns3_ethdev.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h index a15e7b9d1d..761735da87 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -205,6 +205,9 @@ enum hns3_opcode_type { /* Clear hardware state command */ HNS3_OPC_CLEAR_HW_STATE = 0x700B, + /* Firmware stats command */ + HNS3_OPC_FIRMWARE_COMPAT_CFG = 0x701A, + /* SFP command */ HNS3_OPC_SFP_GET_SPEED = 0x7104, @@ -632,6 +635,13 @@ enum hns3_promisc_type { HNS3_BROADCAST = 3, }; +#define HNS3_LINK_EVENT_REPORT_EN_B 0 +#define HNS3_NCSI_ERROR_REPORT_EN_B 1 +struct hns3_firmware_compat_cmd { + uint32_t compat; + uint8_t rsv[20]; +}; + #define HNS3_MAC_TX_EN_B 6 #define HNS3_MAC_RX_EN_B 7 #define HNS3_MAC_PAD_TX_B 11 diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index efc1a29459..0eb49a10aa 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -3893,6 +3893,26 @@ hns3_buffer_alloc(struct hns3_hw *hw) return ret; } +static int +hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init) +{ + struct hns3_firmware_compat_cmd *req; + struct hns3_cmd_desc desc; + uint32_t compat = 0; + + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_FIRMWARE_COMPAT_CFG, false); + req = (struct hns3_firmware_compat_cmd *)desc.data; + + if (is_init) { + hns3_set_bit(compat, HNS3_LINK_EVENT_REPORT_EN_B, 1); + hns3_set_bit(compat, HNS3_NCSI_ERROR_REPORT_EN_B, 0); + } + + req->compat = rte_cpu_to_le_32(compat); + + return hns3_cmd_send(hw, &desc, 1); +} + static int hns3_mac_init(struct hns3_hw *hw) { @@ -4542,6 +4562,15 @@ hns3_init_hardware(struct hns3_adapter *hns) goto err_mac_init; } + /* + * Requiring firmware to enable some features, driver can + * still work without it. + */ + ret = hns3_firmware_compat_config(hw, true); + if (ret) + PMD_INIT_LOG(WARNING, "firmware compatible features not " + "supported, ret = %d.", ret); + return 0; err_mac_init: @@ -4676,6 +4705,7 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) err_enable_intr: hns3_fdir_filter_uninit(hns); err_fdir: + (void)hns3_firmware_compat_config(hw, false); hns3_uninit_umv_space(hw); err_init_hw: hns3_tqp_stats_uninit(hw); @@ -4709,6 +4739,7 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev) (void)hns3_config_gro(hw, false); hns3_promisc_uninit(hw); hns3_fdir_filter_uninit(hns); + (void)hns3_firmware_compat_config(hw, false); hns3_uninit_umv_space(hw); hns3_tqp_stats_uninit(hw); hns3_pf_disable_irq0(hw); -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-09 10:34:58.524078607 +0000 +++ 0015-net-hns3-fix-link-status-change-from-firmware.patch 2021-02-09 10:34:57.894583694 +0000 @@ -1 +1 @@ -From bac6a06441216aceff3588291c79e3a558a1c5a5 Mon Sep 17 00:00:00 2001 +From 1c40552b23c5e0376002f8b1b4e371185ab41311 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bac6a06441216aceff3588291c79e3a558a1c5a5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index dc97a1a852..ad5e188315 100644 +index a15e7b9d1d..761735da87 100644 @@ -26 +27 @@ -@@ -206,6 +206,9 @@ enum hns3_opcode_type { +@@ -205,6 +205,9 @@ enum hns3_opcode_type { @@ -36 +37 @@ -@@ -633,6 +636,13 @@ enum hns3_promisc_type { +@@ -632,6 +635,13 @@ enum hns3_promisc_type { @@ -51 +52 @@ -index 8c57b630f3..f93870d24b 100644 +index efc1a29459..0eb49a10aa 100644 @@ -54 +55 @@ -@@ -3918,6 +3918,26 @@ hns3_buffer_alloc(struct hns3_hw *hw) +@@ -3893,6 +3893,26 @@ hns3_buffer_alloc(struct hns3_hw *hw) @@ -81 +82 @@ -@@ -4610,6 +4630,15 @@ hns3_init_hardware(struct hns3_adapter *hns) +@@ -4542,6 +4562,15 @@ hns3_init_hardware(struct hns3_adapter *hns) @@ -97 +98 @@ -@@ -4746,6 +4775,7 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) +@@ -4676,6 +4705,7 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) @@ -105 +106 @@ -@@ -4780,6 +4810,7 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev) +@@ -4709,6 +4739,7 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)