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 83776A04DD; Fri, 20 Nov 2020 15:36:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9AF5A4C90; Fri, 20 Nov 2020 15:36:03 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 12D21DED for ; Fri, 20 Nov 2020 15:36:00 +0100 (CET) IronPort-SDR: +/x1VHORdM+qRT9S1WiWbrWpLXDITNDtZZ2UZpds7t37UA/EOSU6zbqknVPw01RvUONFG6pplm EzyM7a10/8Dw== X-IronPort-AV: E=McAfee;i="6000,8403,9810"; a="256189957" X-IronPort-AV: E=Sophos;i="5.78,356,1599548400"; d="scan'208";a="256189957" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2020 06:35:59 -0800 IronPort-SDR: fVl/UY+tIp8z0L+K637XZEUBQ/McAUQ+GLg/iNxOUceLWn5w2sQYxIa7o90Lb5S0rDHWW90eS9 UjtSygdgDqPA== X-IronPort-AV: E=Sophos;i="5.78,356,1599548400"; d="scan'208";a="331335000" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.213.243.199]) ([10.213.243.199]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2020 06:35:57 -0800 From: Ferruh Yigit To: Lijun Ou Cc: dev@dpdk.org, linuxarm@huawei.com References: <1605871656-51819-1-git-send-email-oulijun@huawei.com> <1605871656-51819-5-git-send-email-oulijun@huawei.com> <25641017-788d-76ad-fdd4-bb2a2c285c63@intel.com> Message-ID: Date: Fri, 20 Nov 2020 14:35:56 +0000 MIME-Version: 1.0 In-Reply-To: <25641017-788d-76ad-fdd4-bb2a2c285c63@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH 4/4] net/hns3: fix FEC state query 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" On 11/20/2020 2:33 PM, Ferruh Yigit wrote: > On 11/20/2020 11:27 AM, Lijun Ou wrote: >> From: "Min Hu (Conor)" >> >> As FEC is not supported below 10 Gbps, CMD(0x031A) offered >> from Firmware read will return fail in 10 Gbps device. >> >> This patch will prevent read this CMD when below 10 Gbps, >> as this is non-sense. >> >> Fixes: 9bf2ea8dbc65 ("net/hns3: support FEC") >> Cc: stable@dpdk.org >> >> Signed-off-by: Min Hu (Connor) >> Signed-off-by: Lijun Ou >> --- >>   drivers/net/hns3/hns3_ethdev.c | 38 ++++++++++++++++++++++++-------------- >>   1 file changed, 24 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c >> index d6d3f03..faa7b0a 100644 >> --- a/drivers/net/hns3/hns3_ethdev.c >> +++ b/drivers/net/hns3/hns3_ethdev.c >> @@ -100,7 +100,7 @@ static int hns3_add_mc_addr(struct hns3_hw *hw, >>   static int hns3_remove_mc_addr(struct hns3_hw *hw, >>                   struct rte_ether_addr *mac_addr); >>   static int hns3_restore_fec(struct hns3_hw *hw); >> -static int hns3_query_dev_fec_info(struct rte_eth_dev *dev); >> +static int hns3_query_dev_fec_info(struct hns3_hw *hw); >>   void hns3_ether_format_addr(char *buf, uint16_t size, >>                   const struct rte_ether_addr *ether_addr) >> @@ -3010,13 +3010,6 @@ hns3_get_capability(struct hns3_hw *hw) >>           device_id == HNS3_DEV_ID_200G_RDMA) >>           hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1); >> -    ret = hns3_query_dev_fec_info(eth_dev); >> -    if (ret) { >> -        PMD_INIT_LOG(ERR, >> -                 "failed to query FEC information, ret = %d", ret); >> -        return ret; >> -    } >> - >>       /* Get PCI revision id */ >>       ret = rte_pci_read_config(pci_dev, &revision, HNS3_PCI_REVISION_ID_LEN, >>                     HNS3_PCI_REVISION_ID); >> @@ -3148,8 +3141,15 @@ hns3_get_configuration(struct hns3_hw *hw) >>       } >>       ret = hns3_get_board_configuration(hw); >> -    if (ret) >> +    if (ret) { >>           PMD_INIT_LOG(ERR, "failed to get board configuration: %d", ret); >> +        return ret; >> +    } >> + >> +    ret = hns3_query_dev_fec_info(hw); >> +    if (ret) >> +        PMD_INIT_LOG(ERR, >> +                 "failed to query FEC information, ret = %d", ret); >>       return ret; >>   } >> @@ -5797,6 +5797,15 @@ get_current_fec_auto_state(struct hns3_hw *hw, uint8_t >> *state) >>       struct hns3_cmd_desc desc; >>       int ret; >> +    /* >> +     * CMD(0x031A) read is not supported in device of link speed >> +     * below 10 Gbps. >> +     */ Also you can refer to "CMD(0x031A)" as 'HNS3_OPC_CONFIG_FEC_MODE', both in this comment and in the commit log, it is easier to understand than the numerical representation of the command. >> +    if (hw->mac.link_speed < ETH_SPEED_NUM_10G) { >> +        *state = 0; >> +        return 0; >> +    } >> + >>       hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_CONFIG_FEC_MODE, true); >>       req = (struct hns3_config_fec_cmd *)desc.data; >>       ret = hns3_cmd_send(hw, &desc, 1); >> @@ -6003,14 +6012,15 @@ hns3_restore_fec(struct hns3_hw *hw) >>   } >>   static int >> -hns3_query_dev_fec_info(struct rte_eth_dev *dev) >> +hns3_query_dev_fec_info(struct hns3_hw *hw) >>   { >> -    struct hns3_adapter *hns = dev->data->dev_private; >> -    struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(hns); >> -    struct hns3_pf *pf = &hns->pf; >> +    struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); >> +    struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(hns); >> +    struct rte_eth_dev *eth_dev; >>       int ret; >> -    ret = hns3_fec_get(dev, &pf->fec_mode); >> +    eth_dev = &rte_eth_devices[hw->data->port_id]; > > Not specific to this patch, but it is not good idea to access global > 'rte_eth_devices' array directly. Why not store the 'eth_dev' in the device > private data in the probe() and use it later? > Can you do a separate patch for this switch? > Thank you may not need to change the paramters of the > 'hns3_query_dev_fec_info()' or remove it from 'hns3_query_dev_fec_info()' since > you will be able to access to 'eth_dev' easily. > >> +    ret = hns3_fec_get(eth_dev, &pf->fec_mode); >>       if (ret) >>           hns3_err(hw, "query device FEC info failed, ret = %d", ret); >> >