* Re: [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
2019-03-29 9:53 [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue chenmin.sun
@ 2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 8:25 ` Zhang, Qi Z
2019-03-29 9:53 ` chenmin.sun
1 sibling, 2 replies; 6+ messages in thread
From: Lu, Wenzhuo @ 2019-03-29 3:21 UTC (permalink / raw)
To: Sun, Chenmin, dev
Hi,
> -----Original Message-----
> From: Sun, Chenmin
> Sent: Friday, March 29, 2019 5:54 PM
> To: dev@dpdk.org
> Cc: Sun, Chenmin <chenmin.sun@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>
> Subject: [PATCH] net/ice: fixed speed capability error issue
>
> From: Chenmin Sun <chenmin.sun@intel.com>
>
> Device speed capability should be specified based on different phy types
> instead of a fixed value, this patch fix the issue.
>
> Fixes: 690175ee51bf ("net/ice: support getting device information")
> Cc: wenzhuo.lu@intel.com
>
> Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
2019-03-29 3:21 ` Lu, Wenzhuo
@ 2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 8:25 ` Zhang, Qi Z
1 sibling, 0 replies; 6+ messages in thread
From: Lu, Wenzhuo @ 2019-03-29 3:21 UTC (permalink / raw)
To: Sun, Chenmin, dev
Hi,
> -----Original Message-----
> From: Sun, Chenmin
> Sent: Friday, March 29, 2019 5:54 PM
> To: dev@dpdk.org
> Cc: Sun, Chenmin <chenmin.sun@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>
> Subject: [PATCH] net/ice: fixed speed capability error issue
>
> From: Chenmin Sun <chenmin.sun@intel.com>
>
> Device speed capability should be specified based on different phy types
> instead of a fixed value, this patch fix the issue.
>
> Fixes: 690175ee51bf ("net/ice: support getting device information")
> Cc: wenzhuo.lu@intel.com
>
> Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 3:21 ` Lu, Wenzhuo
@ 2019-03-29 8:25 ` Zhang, Qi Z
2019-03-29 8:25 ` Zhang, Qi Z
1 sibling, 1 reply; 6+ messages in thread
From: Zhang, Qi Z @ 2019-03-29 8:25 UTC (permalink / raw)
To: Lu, Wenzhuo, Sun, Chenmin, dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Friday, March 29, 2019 11:22 AM
> To: Sun, Chenmin <chenmin.sun@intel.com>; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
>
> Hi,
>
>
> > -----Original Message-----
> > From: Sun, Chenmin
> > Sent: Friday, March 29, 2019 5:54 PM
> > To: dev@dpdk.org
> > Cc: Sun, Chenmin <chenmin.sun@intel.com>; Lu, Wenzhuo
> > <wenzhuo.lu@intel.com>
> > Subject: [PATCH] net/ice: fixed speed capability error issue
> >
> > From: Chenmin Sun <chenmin.sun@intel.com>
> >
> > Device speed capability should be specified based on different phy
> > types instead of a fixed value, this patch fix the issue.
> >
> > Fixes: 690175ee51bf ("net/ice: support getting device information")
> > Cc: wenzhuo.lu@intel.com
> >
> > Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
2019-03-29 8:25 ` Zhang, Qi Z
@ 2019-03-29 8:25 ` Zhang, Qi Z
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Qi Z @ 2019-03-29 8:25 UTC (permalink / raw)
To: Lu, Wenzhuo, Sun, Chenmin, dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Friday, March 29, 2019 11:22 AM
> To: Sun, Chenmin <chenmin.sun@intel.com>; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
>
> Hi,
>
>
> > -----Original Message-----
> > From: Sun, Chenmin
> > Sent: Friday, March 29, 2019 5:54 PM
> > To: dev@dpdk.org
> > Cc: Sun, Chenmin <chenmin.sun@intel.com>; Lu, Wenzhuo
> > <wenzhuo.lu@intel.com>
> > Subject: [PATCH] net/ice: fixed speed capability error issue
> >
> > From: Chenmin Sun <chenmin.sun@intel.com>
> >
> > Device speed capability should be specified based on different phy
> > types instead of a fixed value, this patch fix the issue.
> >
> > Fixes: 690175ee51bf ("net/ice: support getting device information")
> > Cc: wenzhuo.lu@intel.com
> >
> > Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
@ 2019-03-29 9:53 chenmin.sun
2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 9:53 ` chenmin.sun
0 siblings, 2 replies; 6+ messages in thread
From: chenmin.sun @ 2019-03-29 9:53 UTC (permalink / raw)
To: dev; +Cc: Chenmin Sun, wenzhuo.lu
From: Chenmin Sun <chenmin.sun@intel.com>
Device speed capability should be specified based on different phy types
instead of a fixed value, this patch fix the issue.
Fixes: 690175ee51bf ("net/ice: support getting device information")
Cc: wenzhuo.lu@intel.com
Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
---
drivers/net/ice/ice_ethdev.c | 17 +++++++++++----
drivers/net/ice/ice_ethdev.h | 40 ++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index c468962e2..f29fb4e3a 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1820,6 +1820,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct ice_vsi *vsi = pf->main_vsi;
struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
+ u64 phy_type_low;
+ u64 phy_type_high;
dev_info->min_rx_bufsize = ICE_BUF_SIZE_MIN;
dev_info->max_rx_pktlen = ICE_FRAME_SIZE_MAX;
@@ -1899,10 +1901,17 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
ETH_LINK_SPEED_5G |
ETH_LINK_SPEED_10G |
ETH_LINK_SPEED_20G |
- ETH_LINK_SPEED_25G |
- ETH_LINK_SPEED_40G |
- ETH_LINK_SPEED_50G |
- ETH_LINK_SPEED_100G;
+ ETH_LINK_SPEED_25G;
+
+ phy_type_low = hw->port_info->phy.phy_type_low;
+ phy_type_high = hw->port_info->phy.phy_type_high;
+
+ if (ICE_PHY_TYPE_SUPPORT_50G(phy_type_low))
+ dev_info->speed_capa |= ETH_LINK_SPEED_50G;
+
+ if (ICE_PHY_TYPE_SUPPORT_100G_LOW(phy_type_low) ||
+ ICE_PHY_TYPE_SUPPORT_100G_HIGH(phy_type_high))
+ dev_info->speed_capa |= ETH_LINK_SPEED_100G;
dev_info->nb_rx_queues = dev->data->nb_rx_queues;
dev_info->nb_tx_queues = dev->data->nb_tx_queues;
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 151a09e52..630ee00b2 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -317,4 +317,44 @@ ice_align_floor(int n)
return 0;
return 1 << (sizeof(n) * CHAR_BIT - 1 - __builtin_clz(n));
}
+
+#define ICE_PHY_TYPE_SUPPORT_50G(phy_type) \
+ (((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_CR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_SR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_LR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_KR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_LAUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_LAUI2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_CP) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_SR) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_FR) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_LR) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_KR_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI1_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI1))
+
+#define ICE_PHY_TYPE_SUPPORT_100G_LOW(phy_type) \
+ (((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_CR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_SR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_LR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_KR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_CAUI4_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_CAUI4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_AUI4_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_AUI4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_CR_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_KR_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_CP2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_SR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_DR))
+
+#define ICE_PHY_TYPE_SUPPORT_100G_HIGH(phy_type) \
+ (((phy_type) & ICE_PHY_TYPE_HIGH_100GBASE_KR2_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_CAUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_CAUI2) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_AUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_AUI2))
+
#endif /* _ICE_ETHDEV_H_ */
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue
2019-03-29 9:53 [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue chenmin.sun
2019-03-29 3:21 ` Lu, Wenzhuo
@ 2019-03-29 9:53 ` chenmin.sun
1 sibling, 0 replies; 6+ messages in thread
From: chenmin.sun @ 2019-03-29 9:53 UTC (permalink / raw)
To: dev; +Cc: Chenmin Sun, wenzhuo.lu
From: Chenmin Sun <chenmin.sun@intel.com>
Device speed capability should be specified based on different phy types
instead of a fixed value, this patch fix the issue.
Fixes: 690175ee51bf ("net/ice: support getting device information")
Cc: wenzhuo.lu@intel.com
Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
---
drivers/net/ice/ice_ethdev.c | 17 +++++++++++----
drivers/net/ice/ice_ethdev.h | 40 ++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index c468962e2..f29fb4e3a 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1820,6 +1820,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct ice_vsi *vsi = pf->main_vsi;
struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
+ u64 phy_type_low;
+ u64 phy_type_high;
dev_info->min_rx_bufsize = ICE_BUF_SIZE_MIN;
dev_info->max_rx_pktlen = ICE_FRAME_SIZE_MAX;
@@ -1899,10 +1901,17 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
ETH_LINK_SPEED_5G |
ETH_LINK_SPEED_10G |
ETH_LINK_SPEED_20G |
- ETH_LINK_SPEED_25G |
- ETH_LINK_SPEED_40G |
- ETH_LINK_SPEED_50G |
- ETH_LINK_SPEED_100G;
+ ETH_LINK_SPEED_25G;
+
+ phy_type_low = hw->port_info->phy.phy_type_low;
+ phy_type_high = hw->port_info->phy.phy_type_high;
+
+ if (ICE_PHY_TYPE_SUPPORT_50G(phy_type_low))
+ dev_info->speed_capa |= ETH_LINK_SPEED_50G;
+
+ if (ICE_PHY_TYPE_SUPPORT_100G_LOW(phy_type_low) ||
+ ICE_PHY_TYPE_SUPPORT_100G_HIGH(phy_type_high))
+ dev_info->speed_capa |= ETH_LINK_SPEED_100G;
dev_info->nb_rx_queues = dev->data->nb_rx_queues;
dev_info->nb_tx_queues = dev->data->nb_tx_queues;
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 151a09e52..630ee00b2 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -317,4 +317,44 @@ ice_align_floor(int n)
return 0;
return 1 << (sizeof(n) * CHAR_BIT - 1 - __builtin_clz(n));
}
+
+#define ICE_PHY_TYPE_SUPPORT_50G(phy_type) \
+ (((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_CR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_SR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_LR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_KR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_LAUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_LAUI2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_CP) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_SR) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_FR) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_LR) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50GBASE_KR_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI1_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_50G_AUI1))
+
+#define ICE_PHY_TYPE_SUPPORT_100G_LOW(phy_type) \
+ (((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_CR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_SR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_LR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_KR4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_CAUI4_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_CAUI4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_AUI4_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100G_AUI4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_CR_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_KR_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_CP2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_SR2) || \
+ ((phy_type) & ICE_PHY_TYPE_LOW_100GBASE_DR))
+
+#define ICE_PHY_TYPE_SUPPORT_100G_HIGH(phy_type) \
+ (((phy_type) & ICE_PHY_TYPE_HIGH_100GBASE_KR2_PAM4) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_CAUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_CAUI2) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_AUI2_AOC_ACC) || \
+ ((phy_type) & ICE_PHY_TYPE_HIGH_100G_AUI2))
+
#endif /* _ICE_ETHDEV_H_ */
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-29 8:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-29 9:53 [dpdk-dev] [PATCH] net/ice: fixed speed capability error issue chenmin.sun
2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 3:21 ` Lu, Wenzhuo
2019-03-29 8:25 ` Zhang, Qi Z
2019-03-29 8:25 ` Zhang, Qi Z
2019-03-29 9:53 ` chenmin.sun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).