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 4F800A04B1; Wed, 30 Sep 2020 06:28:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5D7361DA4F; Wed, 30 Sep 2020 06:28:19 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id BAC541DA02; Wed, 30 Sep 2020 06:28:16 +0200 (CEST) IronPort-SDR: el7FQJcY7POk65NjojJ7DFX9YQoNgUCcwS8m8LzQVbmExejX+VMq/zpw+VoV7gzWh1suJmHRPM ag3mi/ADJ56g== X-IronPort-AV: E=McAfee;i="6000,8403,9759"; a="162414286" X-IronPort-AV: E=Sophos;i="5.77,321,1596524400"; d="scan'208";a="162414286" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 21:28:12 -0700 IronPort-SDR: bUljdQXC/CxoYqV5+AjTsn94z/o9prPvBC95Y3MQXICRAjUkkOpge6e789XdcZDW+NVAT3qupL bRgULbXdmqwQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,321,1596524400"; d="scan'208";a="457515677" Received: from npg-dpdk-virtio-xiachenbo-nw.sh.intel.com ([10.67.119.123]) by orsmga004.jf.intel.com with ESMTP; 29 Sep 2020 21:28:05 -0700 From: Chenbo Xia To: dev@dpdk.org Cc: ajit.khaparde@broadcom.com, somnath.kotur@broadcom.com, qiming.yang@intel.com, qi.z.zhang@intel.com, rmody@marvell.com, shshaikh@marvell.com, sbhosle@broadcom.com, kishore.padmanabha@broadcom.com, michael.baucom@broadcom.com, venkatkumar.duvvuru@broadcom.com, xiaoyun.li@intel.com, ferruh.yigit@intel.com, jingjing.wu@intel.com, irusskikh@marvell.com, wenzhuo.lu@intel.com, beilei.xing@intel.com, bernard.iremonger@intel.com, nikhil.rao@intel.com, konstantin.ananyev@intel.com, jerin.jacob@caviumnetworks.com, marko.kovacevic@intel.com, orika@nvidia.com, bruce.richardson@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com, tomasz.kantecki@intel.com, skori@marvell.com, pbhagavatula@marvell.com, john.mcnamara@intel.com, stable@dpdk.org Date: Wed, 30 Sep 2020 12:23:26 +0800 Message-Id: <20200930042328.22507-1-chenbo.xia@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200925053702.80367-1-chenbo.xia@intel.com> References: <20200925053702.80367-1-chenbo.xia@intel.com> Subject: [dpdk-dev] [PATCH v3 1/3] net: fix variable size of ethdev port id 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" 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") Cc: stable@dpdk.org Signed-off-by: Chenbo Xia --- 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 e8927f629..3d148029e 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_vf_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 2d0c3bccc..fdd2692f6 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)) diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index 9fa57b3b2..e4309b8b9 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -68,7 +68,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 */ @@ -112,7 +112,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; diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h index 5d4df5907..814000039 100644 --- a/drivers/net/qede/base/bcm_osal.h +++ b/drivers/net/qede/base/bcm_osal.h @@ -372,7 +372,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 1f2dbc6e7..d2ea1c910 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.17.1