[1/6] net/hns3: delete some unused capabilities
Checks
Commit Message
From: Chengwen Feng <fengchengwen@huawei.com>
This patch deletes some unused capabilities, include:
1. Delete some unused firmware capabilities definition.
2. Delete some unused driver capabilities definition.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
drivers/net/hns3/hns3_cmd.c | 7 -------
drivers/net/hns3/hns3_cmd.h | 15 +++++++--------
drivers/net/hns3/hns3_ethdev.h | 29 ++++++++++++++---------------
3 files changed, 21 insertions(+), 30 deletions(-)
Comments
On 4/26/2021 4:34 AM, Min Hu (Connor) wrote:
> From: Chengwen Feng <fengchengwen@huawei.com>
>
> This patch deletes some unused capabilities, include:
> 1. Delete some unused firmware capabilities definition.
> 2. Delete some unused driver capabilities definition.
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
<...>
> diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
> index d27c725..de17878 100644
> --- a/drivers/net/hns3/hns3_ethdev.h
> +++ b/drivers/net/hns3/hns3_ethdev.h
> @@ -855,17 +855,20 @@ enum {
>
> #define HNS3_DEVARG_DEV_CAPS_MASK "dev_caps_mask"
>
> -#define HNS3_DEV_SUPPORT_DCB_B 0x0
> -#define HNS3_DEV_SUPPORT_COPPER_B 0x1
> -#define HNS3_DEV_SUPPORT_UDP_GSO_B 0x2
> -#define HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B 0x3
> -#define HNS3_DEV_SUPPORT_PTP_B 0x4
> -#define HNS3_DEV_SUPPORT_TX_PUSH_B 0x5
> -#define HNS3_DEV_SUPPORT_INDEP_TXRX_B 0x6
> -#define HNS3_DEV_SUPPORT_STASH_B 0x7
> -#define HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B 0x9
> -#define HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B 0xA
> -#define HNS3_DEV_SUPPORT_RAS_IMP_B 0xB
> +enum {
> + HNS3_DEV_SUPPORT_DCB_B,
> + HNS3_DEV_SUPPORT_COPPER_B,
> + HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
> + HNS3_DEV_SUPPORT_PTP_B,
> + HNS3_DEV_SUPPORT_TX_PUSH_B,
> + HNS3_DEV_SUPPORT_INDEP_TXRX_B,
> + HNS3_DEV_SUPPORT_STASH_B,
> + HNS3_DEV_SUPPORT_SIMPLE_BD_B,
> + HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B,
> + HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B,
> + HNS3_DEV_SUPPORT_RAS_IMP_B,
> + HNS3_DEV_SUPPORT_TM_B,
> +};
This cause some values to be changed, because of added/removed items, is this
expected?
If so can you please mention from this value change in the commit log, to clarify.
From:Ferruh Yigit <ferruh.yigit@intel.com>
To:humin (Q) <humin29@huawei.com>;dev <dev@dpdk.org>
Date:2021-04-27 21:37:59
Subject:Re: [dpdk-dev] [PATCH 1/6] net/hns3: delete some unused capabilities
On 4/26/2021 4:34 AM, Min Hu (Connor) wrote:
> From: Chengwen Feng < fengchengwen@huawei.com<mailto:fengchengwen@huawei.com>>
>
> This patch deletes some unused capabilities, include:
> 1. Delete some unused firmware capabilities definition.
> 2. Delete some unused driver capabilities definition.
>
> Signed-off-by: Chengwen Feng < fengchengwen@huawei.com<mailto:fengchengwen@huawei.com>>
> Signed-off-by: Min Hu (Connor) < humin29@huawei.com<mailto:humin29@huawei.com>>
<...>
> diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
> index d27c725..de17878 100644
> --- a/drivers/net/hns3/hns3_ethdev.h
> +++ b/drivers/net/hns3/hns3_ethdev.h
> @@ -855,17 +855,20 @@ enum {
>
> #define HNS3_DEVARG_DEV_CAPS_MASK "dev_caps_mask"
>
> -#define HNS3_DEV_SUPPORT_DCB_B 0x0
> -#define HNS3_DEV_SUPPORT_COPPER_B 0x1
> -#define HNS3_DEV_SUPPORT_UDP_GSO_B 0x2
> -#define HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B 0x3
> -#define HNS3_DEV_SUPPORT_PTP_B 0x4
> -#define HNS3_DEV_SUPPORT_TX_PUSH_B 0x5
> -#define HNS3_DEV_SUPPORT_INDEP_TXRX_B 0x6
> -#define HNS3_DEV_SUPPORT_STASH_B 0x7
> -#define HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B 0x9
> -#define HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B 0xA
> -#define HNS3_DEV_SUPPORT_RAS_IMP_B 0xB
> +enum {
> + HNS3_DEV_SUPPORT_DCB_B,
> + HNS3_DEV_SUPPORT_COPPER_B,
> + HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
> + HNS3_DEV_SUPPORT_PTP_B,
> + HNS3_DEV_SUPPORT_TX_PUSH_B,
> + HNS3_DEV_SUPPORT_INDEP_TXRX_B,
> + HNS3_DEV_SUPPORT_STASH_B,
> + HNS3_DEV_SUPPORT_SIMPLE_BD_B,
> + HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B,
> + HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B,
> + HNS3_DEV_SUPPORT_RAS_IMP_B,
> + HNS3_DEV_SUPPORT_TM_B,
> +};
This cause some values to be changed, because of added/removed items, is this
expected?
If so can you please mention from this value change in the commit log, to clarify.
these values are used only in driver, so the order could adjust.
the commit log memtion it brifely, which is:
2. Delete some unused driver capabilities definition
thanks
On 4/27/2021 3:26 PM, Fengchengwen wrote:
>
>
> *From:*Ferruh Yigit <ferruh.yigit@intel.com>
> *To:*humin (Q) <humin29@huawei.com>;dev <dev@dpdk.org>
> *Date:*2021-04-27 21:37:59
> *Subject:*Re: [dpdk-dev] [PATCH 1/6] net/hns3: delete some unused capabilities
>
> On 4/26/2021 4:34 AM, Min Hu (Connor) wrote:
>> From: Chengwen Feng < fengchengwen@huawei.com <mailto:fengchengwen@huawei.com>>
>>
>> This patch deletes some unused capabilities, include:
>> 1. Delete some unused firmware capabilities definition.
>> 2. Delete some unused driver capabilities definition.
>>
>> Signed-off-by: Chengwen Feng < fengchengwen@huawei.com <mailto:fengchengwen@huawei.com>>
>> Signed-off-by: Min Hu (Connor) < humin29@huawei.com <mailto:humin29@huawei.com>>
>
> <...>
>
>> diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
>> index d27c725..de17878 100644
>> --- a/drivers/net/hns3/hns3_ethdev.h
>> +++ b/drivers/net/hns3/hns3_ethdev.h
>> @@ -855,17 +855,20 @@ enum {
>>
>> #define HNS3_DEVARG_DEV_CAPS_MASK "dev_caps_mask"
>>
>> -#define HNS3_DEV_SUPPORT_DCB_B 0x0
>> -#define HNS3_DEV_SUPPORT_COPPER_B 0x1
>> -#define HNS3_DEV_SUPPORT_UDP_GSO_B 0x2
>> -#define HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B 0x3
>> -#define HNS3_DEV_SUPPORT_PTP_B 0x4
>> -#define HNS3_DEV_SUPPORT_TX_PUSH_B 0x5
>> -#define HNS3_DEV_SUPPORT_INDEP_TXRX_B 0x6
>> -#define HNS3_DEV_SUPPORT_STASH_B 0x7
>> -#define HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B 0x9
>> -#define HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B 0xA
>> -#define HNS3_DEV_SUPPORT_RAS_IMP_B 0xB
>> +enum {
>> + HNS3_DEV_SUPPORT_DCB_B,
>> + HNS3_DEV_SUPPORT_COPPER_B,
>> + HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
>> + HNS3_DEV_SUPPORT_PTP_B,
>> + HNS3_DEV_SUPPORT_TX_PUSH_B,
>> + HNS3_DEV_SUPPORT_INDEP_TXRX_B,
>> + HNS3_DEV_SUPPORT_STASH_B,
>> + HNS3_DEV_SUPPORT_SIMPLE_BD_B,
>> + HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B,
>> + HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B,
>> + HNS3_DEV_SUPPORT_RAS_IMP_B,
>> + HNS3_DEV_SUPPORT_TM_B,
>> +};
>
> This cause some values to be changed, because of added/removed items, is this
> expected?
> If so can you please mention from this value change in the commit log, to clarify.
>
> these values are used only in driver, so the order could adjust.
> the commit log memtion it brifely, which is:
>
> 2. Delete some unused driver capabilities definition
>
I am not talking about deletion of unused macros,
Please mention that value of some of the macros have been changed and this is
known and won't cause a problem.
@@ -423,11 +423,8 @@ hns3_get_caps_name(uint32_t caps_id)
enum HNS3_CAPS_BITS caps;
const char *name;
} dev_caps[] = {
- { HNS3_CAPS_UDP_GSO_B, "udp_gso" },
- { HNS3_CAPS_ATR_B, "atr" },
{ HNS3_CAPS_FD_QUEUE_REGION_B, "fd_queue_region" },
{ HNS3_CAPS_PTP_B, "ptp" },
- { HNS3_CAPS_INT_QL_B, "int_ql" },
{ HNS3_CAPS_SIMPLE_BD_B, "simple_bd" },
{ HNS3_CAPS_TX_PUSH_B, "tx_push" },
{ HNS3_CAPS_PHY_IMP_B, "phy_imp" },
@@ -436,8 +433,6 @@ hns3_get_caps_name(uint32_t caps_id)
{ HNS3_CAPS_STASH_B, "stash" },
{ HNS3_CAPS_UDP_TUNNEL_CSUM_B, "udp_tunnel_csum" },
{ HNS3_CAPS_RAS_IMP_B, "ras_imp" },
- { HNS3_CAPS_FEC_B, "fec" },
- { HNS3_CAPS_PAUSE_B, "pause" },
{ HNS3_CAPS_RXD_ADV_LAYOUT_B, "rxd_adv_layout" }
};
uint32_t i;
@@ -484,8 +479,6 @@ hns3_parse_capability(struct hns3_hw *hw,
{
uint32_t caps = rte_le_to_cpu_32(cmd->caps[0]);
- if (hns3_get_bit(caps, HNS3_CAPS_UDP_GSO_B))
- hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_UDP_GSO_B, 1);
if (hns3_get_bit(caps, HNS3_CAPS_FD_QUEUE_REGION_B))
hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
1);
@@ -306,12 +306,13 @@ struct hns3_rx_priv_buff_cmd {
#define HNS3_FW_VERSION_BYTE0_M GENMASK(7, 0)
enum HNS3_CAPS_BITS {
- HNS3_CAPS_UDP_GSO_B,
- HNS3_CAPS_ATR_B,
- HNS3_CAPS_FD_QUEUE_REGION_B,
+ /*
+ * The following capability index definitions must be the same as those
+ * of the firmware.
+ */
+ HNS3_CAPS_FD_QUEUE_REGION_B = 2,
HNS3_CAPS_PTP_B,
- HNS3_CAPS_INT_QL_B,
- HNS3_CAPS_SIMPLE_BD_B,
+ HNS3_CAPS_SIMPLE_BD_B = 5,
HNS3_CAPS_TX_PUSH_B,
HNS3_CAPS_PHY_IMP_B,
HNS3_CAPS_TQP_TXRX_INDEP_B,
@@ -319,9 +320,7 @@ enum HNS3_CAPS_BITS {
HNS3_CAPS_STASH_B,
HNS3_CAPS_UDP_TUNNEL_CSUM_B,
HNS3_CAPS_RAS_IMP_B,
- HNS3_CAPS_FEC_B,
- HNS3_CAPS_PAUSE_B,
- HNS3_CAPS_RXD_ADV_LAYOUT_B,
+ HNS3_CAPS_RXD_ADV_LAYOUT_B = 15,
};
enum HNS3_API_CAP_BITS {
@@ -855,17 +855,20 @@ enum {
#define HNS3_DEVARG_DEV_CAPS_MASK "dev_caps_mask"
-#define HNS3_DEV_SUPPORT_DCB_B 0x0
-#define HNS3_DEV_SUPPORT_COPPER_B 0x1
-#define HNS3_DEV_SUPPORT_UDP_GSO_B 0x2
-#define HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B 0x3
-#define HNS3_DEV_SUPPORT_PTP_B 0x4
-#define HNS3_DEV_SUPPORT_TX_PUSH_B 0x5
-#define HNS3_DEV_SUPPORT_INDEP_TXRX_B 0x6
-#define HNS3_DEV_SUPPORT_STASH_B 0x7
-#define HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B 0x9
-#define HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B 0xA
-#define HNS3_DEV_SUPPORT_RAS_IMP_B 0xB
+enum {
+ HNS3_DEV_SUPPORT_DCB_B,
+ HNS3_DEV_SUPPORT_COPPER_B,
+ HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
+ HNS3_DEV_SUPPORT_PTP_B,
+ HNS3_DEV_SUPPORT_TX_PUSH_B,
+ HNS3_DEV_SUPPORT_INDEP_TXRX_B,
+ HNS3_DEV_SUPPORT_STASH_B,
+ HNS3_DEV_SUPPORT_SIMPLE_BD_B,
+ HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B,
+ HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B,
+ HNS3_DEV_SUPPORT_RAS_IMP_B,
+ HNS3_DEV_SUPPORT_TM_B,
+};
#define hns3_dev_dcb_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_DCB_B)
@@ -874,10 +877,6 @@ enum {
#define hns3_dev_copper_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_COPPER_B)
-/* Support UDP GSO offload */
-#define hns3_dev_udp_gso_supported(hw) \
- hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_UDP_GSO_B)
-
/* Support the queue region action rule of flow directory */
#define hns3_dev_fd_queue_region_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B)