diff mbox

[dpdk-dev,v4,09/12] pmd/mlx5: add dev_ptype_info_get implementation

Message ID 1456445371-147264-10-git-send-email-jianfeng.tan@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Jianfeng Tan Feb. 26, 2016, 12:09 a.m. UTC 
  Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
---
 drivers/net/mlx4/mlx4.c        |  2 +-
 drivers/net/mlx5/mlx5.c        |  1 +
 drivers/net/mlx5/mlx5.h        |  1 +
 drivers/net/mlx5/mlx5_ethdev.c | 20 ++++++++++++++++++++
 drivers/net/mlx5/mlx5_rxtx.c   |  2 ++
 5 files changed, 25 insertions(+), 1 deletion(-)

Comments

Adrien Mazarguil Feb. 26, 2016, 8:26 a.m. UTC | #1 
Hi Jianfeng,

On Fri, Feb 26, 2016 at 08:09:28AM +0800, Jianfeng Tan wrote:
> Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
> ---
>  drivers/net/mlx4/mlx4.c        |  2 +-
>  drivers/net/mlx5/mlx5.c        |  1 +
>  drivers/net/mlx5/mlx5.h        |  1 +
>  drivers/net/mlx5/mlx5_ethdev.c | 20 ++++++++++++++++++++
>  drivers/net/mlx5/mlx5_rxtx.c   |  2 ++
>  5 files changed, 25 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
> index 85fdebf..58f4e1a 100644
> --- a/drivers/net/mlx4/mlx4.c
> +++ b/drivers/net/mlx4/mlx4.c
> @@ -4269,7 +4269,7 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
>  	priv_unlock(priv);
>  }
>  
> -static uint32_t *
> +static const uint32_t *
>  mlx4_dev_ptype_info_get(struct rte_eth_dev *dev)
>  {
>  	static const uint32_t ptypes[] = {

I'm probably nitpicking here but this change should be merged in the mlx4
patch. Otherwise both mlx4 and mlx5 patches look fine to me.
Jianfeng Tan Feb. 26, 2016, 8:36 a.m. UTC | #2 
Hi,

On 2/26/2016 4:26 PM, Adrien Mazarguil wrote:
> Hi Jianfeng,
>
> On Fri, Feb 26, 2016 at 08:09:28AM +0800, Jianfeng Tan wrote:
>> Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
>> ---
>>   drivers/net/mlx4/mlx4.c        |  2 +-
>>   drivers/net/mlx5/mlx5.c        |  1 +
>>   drivers/net/mlx5/mlx5.h        |  1 +
>>   drivers/net/mlx5/mlx5_ethdev.c | 20 ++++++++++++++++++++
>>   drivers/net/mlx5/mlx5_rxtx.c   |  2 ++
>>   5 files changed, 25 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
>> index 85fdebf..58f4e1a 100644
>> --- a/drivers/net/mlx4/mlx4.c
>> +++ b/drivers/net/mlx4/mlx4.c
>> @@ -4269,7 +4269,7 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
>>   	priv_unlock(priv);
>>   }
>>   
>> -static uint32_t *
>> +static const uint32_t *
>>   mlx4_dev_ptype_info_get(struct rte_eth_dev *dev)
>>   {
>>   	static const uint32_t ptypes[] = {
> I'm probably nitpicking here but this change should be merged in the mlx4
> patch. Otherwise both mlx4 and mlx5 patches look fine to me.
>

Oops, nice catch. It's should be in mlx4 commit. I'll fix it.

Thanks,
Jianfeng
diff mbox

Patch

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 85fdebf..58f4e1a 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -4269,7 +4269,7 @@  mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	priv_unlock(priv);
 }
 
-static uint32_t *
+static const uint32_t *
 mlx4_dev_ptype_info_get(struct rte_eth_dev *dev)
 {
 	static const uint32_t ptypes[] = {
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 821ee0f..e18b1e9 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -153,6 +153,7 @@  static const struct eth_dev_ops mlx5_dev_ops = {
 	.stats_get = mlx5_stats_get,
 	.stats_reset = mlx5_stats_reset,
 	.dev_infos_get = mlx5_dev_infos_get,
+	.dev_ptype_info_get = mlx5_dev_ptype_info_get,
 	.vlan_filter_set = mlx5_vlan_filter_set,
 	.rx_queue_setup = mlx5_rx_queue_setup,
 	.tx_queue_setup = mlx5_tx_queue_setup,
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index b84d31d..196435d 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -156,6 +156,7 @@  int priv_get_mtu(struct priv *, uint16_t *);
 int priv_set_flags(struct priv *, unsigned int, unsigned int);
 int mlx5_dev_configure(struct rte_eth_dev *);
 void mlx5_dev_infos_get(struct rte_eth_dev *, struct rte_eth_dev_info *);
+const uint32_t *mlx5_dev_ptype_info_get(struct rte_eth_dev *dev);
 int mlx5_link_update(struct rte_eth_dev *, int);
 int mlx5_dev_set_mtu(struct rte_eth_dev *, uint16_t);
 int mlx5_dev_get_flow_ctrl(struct rte_eth_dev *, struct rte_eth_fc_conf *);
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 1159fa3..406f8dc 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -526,6 +526,26 @@  mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	priv_unlock(priv);
 }
 
+const uint32_t *
+mlx5_dev_ptype_info_get(struct rte_eth_dev *dev)
+{
+	static const uint32_t ptypes[] = {
+		/* refers to rxq_cq_to_pkt_type() */
+		RTE_PTYPE_L3_IPV4,
+		RTE_PTYPE_L3_IPV6,
+		RTE_PTYPE_INNER_L3_IPV4,
+		RTE_PTYPE_INNER_L3_IPV6,
+		RTE_PTYPE_UNKNOWN
+
+	};
+
+	if (dev->rx_pkt_burst == mlx5_rx_burst ||
+	    dev->rx_pkt_burst == mlx5_rx_burst_sp)
+		return ptypes;
+	return NULL;
+
+}
+
 /**
  * DPDK callback to retrieve physical link information (unlocked version).
  *
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index fa5e648..79bdf8d 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -603,6 +603,8 @@  stop:
  * @param flags
  *   RX completion flags returned by poll_length_flags().
  *
+ * @note: fix mlx5_dev_ptype_info_get() if any change here.
+ *
  * @return
  *   Packet type for struct rte_mbuf.
  */