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 289C0A04DE for ; Wed, 28 Oct 2020 11:51:09 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 12C6CC9FA; Wed, 28 Oct 2020 11:51:08 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by dpdk.org (Postfix) with ESMTP id 21DD2C9CC for ; Wed, 28 Oct 2020 11:51:07 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id n6so5110341wrm.13 for ; Wed, 28 Oct 2020 03:51:07 -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=WLYt/VvODFXZN6DH2z+dPmotSB5sieghgz1yO5N265I=; b=fXRdVwtMQt0VLw7aw+VRg2yuZ4uY51vmEYFrezV6G7Jw7lOiXX2h6C4GBqkXGB3QOT Sg0eliEhEf/pDhjWU0QtNMrnkbpLiWEMQ7sdLZRCIUu6HRfGurl8xi1t5hRaT3oVE1dt 7DxxwXYNdO81wFQCox0hit1YEWjv6XuAUEk1ran7kqDqDCPuNGJ0Xh/TzWBCil3iqsXW GdaNiQJMeMpsB1Ln+elIOcocBGrbdgxRKoLmpc1dqiztTbuTu6PMcBtVEtOGKKGy0ip5 gYkGIahzE5j0EW0PbAt2d7IU4gnCArFr02zUvaiKaXYM2p8aFZGGEck2w47uUPtTZvs2 S9/Q== 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=WLYt/VvODFXZN6DH2z+dPmotSB5sieghgz1yO5N265I=; b=ChdfDw605UFChEd64CToEz2OTlloLDE2htXdicA8Itczs2HK8OzTqKCy9BwzN/AB/4 DlrppXxCP3gbmxmbWGtmcajUlnWYtRpDW5sPePs6ZW7b+iY76zyJs9oAoPFVHhyCdkjK 74kJD0XqETGuY6tnfnP5oHG3CJrrKB6W2GONpWv5ykJKeiV3HRjM8YJjMJdLGNxrA7tI OBnAH9sew+Z/KrJ/mrFgdYa5Dy5k8drbJ6sOTSKD64pMDj2vAYjqyeeoMa4MozqGVzXa gEnxGMiYJN5DVEnnnS4q/uTWDPr7DZxvG3y6pZmRDlUjTaxJtGlrIo22WxZ7LmlRGIot KyjQ== X-Gm-Message-State: AOAM533BZhi7l4dRkmorVfsUIvJkSYMFPduIY8szadC+ogoxfdd9//9L RM8r/X+/jJMZjw3IybHSzECAU3uUcnzDYe2T X-Google-Smtp-Source: ABdhPJxBIf99MKVEq2oK29GJ2dz/q4vhZ0T8Wm/I+q33JpUSK1nvv8dT/7uVYp7AuPxBmJE6/kOVnA== X-Received: by 2002:adf:b19c:: with SMTP id q28mr7937533wra.119.1603882265863; Wed, 28 Oct 2020 03:51:05 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o184sm5706408wmo.37.2020.10.28.03.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Chenbo Xia Cc: Ajit Khaparde , Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:44:13 +0000 Message-Id: <20201028104606.3504127-94-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'drivers/net: fix port id size' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 41d5a9c17c01719d96a145910767584a12bc8fe6 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Wed, 30 Sep 2020 12:23:26 +0800 Subject: [PATCH] drivers/net: fix port id size [ upstream commit fac8177a3669ff63d9ecb04372539e93e1f96ebf ] The ethdev port id should be 16 bits now. This patch changes the variable size of port id in some net drivers from 8 bits to 16 bits. Fixes: 09b23f8b9df6 ("net/bnxt: fix port stop process and cleanup resources") Fixes: 769de16872ab ("net/bnxt: fix port default rule create/destroy") Fixes: 50370662b727 ("net/ice: support device and queue ops") Fixes: a50d7cbbdad7 ("net/qede: support registers dump") Signed-off-by: Chenbo Xia Acked-by: Ajit Khaparde Reviewed-by: Ferruh Yigit --- drivers/net/ice/ice_rxtx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index 9e3d2cd076..041f00970d 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -66,7 +66,7 @@ struct ice_rx_queue { uint16_t rxrearm_start; /**< the idx we start the re-arming from */ uint64_t mbuf_initializer; /**< value to init mbufs */ - uint8_t port_id; /* device port ID */ + uint16_t port_id; /* device port ID */ uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */ uint16_t queue_id; /* RX queue index */ uint16_t reg_idx; /* RX queue register index */ @@ -109,7 +109,7 @@ struct ice_tx_queue { uint8_t pthresh; /**< Prefetch threshold register. */ uint8_t hthresh; /**< Host threshold register. */ uint8_t wthresh; /**< Write-back threshold reg. */ - uint8_t port_id; /* Device port identifier. */ + uint16_t port_id; /* Device port identifier. */ uint16_t queue_id; /* TX queue index. */ uint32_t q_teid; /* TX schedule node id. */ uint16_t reg_idx; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.708075078 +0000 +++ 0094-drivers-net-fix-port-id-size.patch 2020-10-28 10:35:11.644832085 +0000 @@ -1,8 +1,10 @@ -From fac8177a3669ff63d9ecb04372539e93e1f96ebf Mon Sep 17 00:00:00 2001 +From 41d5a9c17c01719d96a145910767584a12bc8fe6 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Wed, 30 Sep 2020 12:23:26 +0800 Subject: [PATCH] drivers/net: fix port id size +[ upstream commit fac8177a3669ff63d9ecb04372539e93e1f96ebf ] + The ethdev port id should be 16 bits now. This patch changes the variable size of port id in some net drivers from 8 bits to 16 bits. @@ -11,77 +13,28 @@ Fixes: 769de16872ab ("net/bnxt: fix port default rule create/destroy") Fixes: 50370662b727 ("net/ice: support device and queue ops") Fixes: a50d7cbbdad7 ("net/qede: support registers dump") -Cc: stable@dpdk.org Signed-off-by: Chenbo Xia Acked-by: Ajit Khaparde Reviewed-by: Ferruh Yigit --- - drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 2 +- - drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 6 +++--- - drivers/net/ice/ice_rxtx.h | 4 ++-- - drivers/net/qede/base/bcm_osal.h | 2 +- - drivers/net/qede/qede_regs.c | 2 +- - 5 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c -index 93a79592d6..289619411f 100644 ---- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c -+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c -@@ -646,7 +646,7 @@ static void - bnxt_ulp_destroy_vfr_default_rules(struct bnxt *bp, bool global) - { - struct bnxt_ulp_vfr_rule_info *info; -- uint8_t port_id; -+ uint16_t port_id; - struct rte_eth_dev *vfr_eth_dev; - struct bnxt_representor *vfr_bp; - -diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c -index f421e2ed6e..8dea235f0b 100644 ---- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c -+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c -@@ -402,7 +402,7 @@ void - bnxt_ulp_destroy_df_rules(struct bnxt *bp, bool global) - { - struct bnxt_ulp_df_rule_info *info; -- uint8_t port_id; -+ uint16_t port_id; - - if (!BNXT_TRUFLOW_EN(bp) || - BNXT_ETH_DEV_IS_REPRESENTOR(bp->eth_dev)) -@@ -466,7 +466,7 @@ int32_t - bnxt_ulp_create_df_rules(struct bnxt *bp) - { - struct bnxt_ulp_df_rule_info *info; -- uint8_t port_id; -+ uint16_t port_id; - int rc; - - if (!BNXT_TRUFLOW_EN(bp) || -@@ -540,7 +540,7 @@ bnxt_ulp_create_vfr_default_rules(struct rte_eth_dev *vfr_ethdev) - struct rte_eth_dev *parent_dev = vfr->parent_dev; - struct bnxt *bp = parent_dev->data->dev_private; - uint16_t vfr_port_id = vfr_ethdev->data->port_id; -- uint8_t port_id; -+ uint16_t port_id; - int rc; - - if (!bp || !BNXT_TRUFLOW_EN(bp)) + drivers/net/ice/ice_rxtx.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h -index 6937faec3e..1c23c7541e 100644 +index 9e3d2cd076..041f00970d 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h -@@ -71,7 +71,7 @@ struct ice_rx_queue { +@@ -66,7 +66,7 @@ struct ice_rx_queue { uint16_t rxrearm_start; /**< the idx we start the re-arming from */ uint64_t mbuf_initializer; /**< value to init mbufs */ - uint8_t port_id; /* device port ID */ + uint16_t port_id; /* device port ID */ uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */ - uint8_t fdir_enabled; /* 0 if FDIR disabled, 1 when enabled */ uint16_t queue_id; /* RX queue index */ -@@ -117,7 +117,7 @@ struct ice_tx_queue { + uint16_t reg_idx; /* RX queue register index */ +@@ -109,7 +109,7 @@ struct ice_tx_queue { uint8_t pthresh; /**< Prefetch threshold register. */ uint8_t hthresh; /**< Host threshold register. */ uint8_t wthresh; /**< Write-back threshold reg. */ @@ -90,32 +43,6 @@ uint16_t queue_id; /* TX queue index. */ uint32_t q_teid; /* TX schedule node id. */ uint16_t reg_idx; -diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h -index 575d4d0998..c5b5399282 100644 ---- a/drivers/net/qede/base/bcm_osal.h -+++ b/drivers/net/qede/base/bcm_osal.h -@@ -382,7 +382,7 @@ void qede_hw_err_notify(struct ecore_hwfn *p_hwfn, - /* TODO: */ - #define OSAL_SCHEDULE_RECOVERY_HANDLER(hwfn) nothing - --int qede_save_fw_dump(uint8_t port_id); -+int qede_save_fw_dump(uint16_t port_id); - - #define OSAL_SAVE_FW_DUMP(port_id) qede_save_fw_dump(port_id) - -diff --git a/drivers/net/qede/qede_regs.c b/drivers/net/qede/qede_regs.c -index 1f2dbc6e7b..d2ea1c9108 100644 ---- a/drivers/net/qede/qede_regs.c -+++ b/drivers/net/qede/qede_regs.c -@@ -242,7 +242,7 @@ qede_write_fwdump(const char *dump_file, void *dump, size_t len) - } - - int --qede_save_fw_dump(uint8_t port_id) -+qede_save_fw_dump(uint16_t port_id) - { - struct rte_eth_dev *eth_dev = &rte_eth_devices[port_id]; - struct rte_dev_reg_info regs; -- 2.20.1