From patchwork Tue Aug 25 11:53:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wei Hu (Xavier)" X-Patchwork-Id: 75932 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3D569A04B1; Tue, 25 Aug 2020 13:55:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5311C1C2BC; Tue, 25 Aug 2020 13:53:54 +0200 (CEST) Received: from mail.chinasoftinc.com (unknown [114.113.233.8]) by dpdk.org (Postfix) with ESMTP id E505B1C236 for ; Tue, 25 Aug 2020 13:53:49 +0200 (CEST) Received: from localhost.localdomain (65.49.108.226) by INCCAS002.ito.icss (10.168.0.60) with Microsoft SMTP Server id 14.3.487.0; Tue, 25 Aug 2020 19:53:44 +0800 From: "Wei Hu (Xavier)" To: CC: , Date: Tue, 25 Aug 2020 19:53:05 +0800 Message-ID: <20200825115305.58490-12-huwei013@chinasoftinc.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200825115305.58490-1-huwei013@chinasoftinc.com> References: <20200825115305.58490-1-huwei013@chinasoftinc.com> MIME-Version: 1.0 X-Originating-IP: [65.49.108.226] Subject: [dpdk-dev] [PATCH 11/11] net/hns3: fix some incomplete command structures X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Huisong Li The descriptor of the command between firmware and hns3 PMD driver consists of 8-byte header and 24-byte data field. The contents sent to firmware are packaged into a command structure as the data field of command descriptor. There are some command structures in hns3_dcb.h file that are less than 24 byte. So this patch fixes these incomplete command structures. Fixes: 62e3ccc2b94c6 ("net/hns3: support flow control") Cc: stable@dpdk.org Signed-off-by: Huisong Li Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_dcb.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h index 1636c5ae8..557d88bc1 100644 --- a/drivers/net/hns3/hns3_dcb.h +++ b/drivers/net/hns3/hns3_dcb.h @@ -26,16 +26,19 @@ enum hns3_shap_bucket { struct hns3_priority_weight_cmd { uint8_t pri_id; uint8_t dwrr; + uint8_t rsvd[22]; }; struct hns3_qs_weight_cmd { uint16_t qs_id; uint8_t dwrr; + uint8_t rsvd[21]; }; struct hns3_pg_weight_cmd { uint8_t pg_id; uint8_t dwrr; + uint8_t rsvd[22]; }; struct hns3_ets_tc_weight_cmd { @@ -50,6 +53,7 @@ struct hns3_qs_to_pri_link_cmd { uint8_t priority; #define HNS3_DCB_QS_PRI_LINK_VLD_MSK BIT(0) uint8_t link_vld; + uint8_t rsvd1[18]; }; struct hns3_nq_to_qs_link_cmd { @@ -57,6 +61,7 @@ struct hns3_nq_to_qs_link_cmd { uint16_t rsvd; #define HNS3_DCB_Q_QS_LINK_VLD_MSK BIT(10) uint16_t qset_id; + uint8_t rsvd1[18]; }; #define HNS3_DCB_SHAP_IR_B_MSK GENMASK(7, 0) @@ -74,12 +79,14 @@ struct hns3_pri_shapping_cmd { uint8_t pri_id; uint8_t rsvd[3]; uint32_t pri_shapping_para; + uint32_t rsvd1[4]; }; struct hns3_pg_shapping_cmd { uint8_t pg_id; uint8_t rsvd[3]; uint32_t pg_shapping_para; + uint32_t rsvd1[4]; }; #define HNS3_BP_GRP_NUM 32 @@ -92,16 +99,18 @@ struct hns3_bp_to_qs_map_cmd { uint8_t rsvd[2]; uint8_t qs_group_id; uint32_t qs_bit_map; - uint32_t rsvd1; + uint32_t rsvd1[4]; }; struct hns3_pfc_en_cmd { uint8_t tx_rx_en_bitmap; uint8_t pri_en_bitmap; + uint8_t rsvd[22]; }; struct hns3_port_shapping_cmd { uint32_t port_shapping_para; + uint32_t rsvd[5]; }; struct hns3_cfg_pause_param_cmd { @@ -119,6 +128,7 @@ struct hns3_pg_to_pri_link_cmd { uint8_t pg_id; uint8_t rsvd1[3]; uint8_t pri_bit_map; + uint8_t rsvd2[19]; }; enum hns3_shaper_level {