diff mbox series

[v5,03/12] net/nfp: move app specific init logic to own function

Message ID 1659681155-16525-4-git-send-email-chaoyong.he@corigine.com (mailing list archive)
State Changes Requested, archived
Delegated to: Andrew Rybchenko
Headers
Series preparation for the rte_flow offload of nfp PMD |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Chaoyong He Aug. 5, 2022, 6:32 a.m. UTC 
  The NFP card can load different firmware applications.
This commit move the init logic of corenic app of the
secondary process into its own function.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 drivers/net/nfp/nfp_ethdev.c | 93 +++++++++++++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 31 deletions(-)

Comments

Andrew Rybchenko Aug. 5, 2022, 10:53 a.m. UTC | #1 
On 8/5/22 09:32, Chaoyong He wrote:
> The NFP card can load different firmware applications.
> This commit move the init logic of corenic app of the
> secondary process into its own function.
> 
> Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
> ---
>   drivers/net/nfp/nfp_ethdev.c | 93 +++++++++++++++++++++++++++++---------------
>   1 file changed, 62 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
> index 2c5607c..90dd01e 100644
> --- a/drivers/net/nfp/nfp_ethdev.c
> +++ b/drivers/net/nfp/nfp_ethdev.c
> @@ -936,7 +936,7 @@
>   		break;
>   	default:
>   		PMD_INIT_LOG(ERR, "nfp_net: no device ID matching");
> -		err = -ENODEV;
> +		ret = -ENODEV;

It looks unrelated to the patch and looks as a bug in previous
code/patches which deserves separate fix.

>   		goto pf_cleanup;
>   	}
>   
> @@ -991,6 +991,50 @@
>   	return ret;
>   }
>   
> +static int
> +nfp_secondary_init_app_nic(struct rte_pci_device *pci_dev,
> +		struct nfp_rtsym_table *sym_tbl,
> +		struct nfp_cpp *cpp)
> +{
> +	int i;
> +	int err = 0;
> +	int ret = 0;
> +	int total_vnics;
> +	struct nfp_net_hw *hw;
> +
> +	/* Read the number of vNIC's created for the PF */
> +	total_vnics = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err);
> +	if (err || total_vnics <= 0 || total_vnics > 8) {

Compare err vs 0 explicitly

> +		PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong value");
> +		return -ENODEV;
> +	}
> +
> +	for (i = 0; i < total_vnics; i++) {
> +		struct rte_eth_dev *eth_dev;
> +		char port_name[RTE_ETH_NAME_MAX_LEN];
> +		snprintf(port_name, sizeof(port_name), "%s_port%d",
> +				pci_dev->device.name, i);
> +
> +		PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name);
> +		eth_dev = rte_eth_dev_attach_secondary(port_name);
> +		if (eth_dev == NULL) {
> +			RTE_LOG(ERR, EAL,
> +				"secondary process attach failed, ethdev doesn't exist");
> +			ret = -ENODEV;
> +			break;
> +		}
> +
> +		eth_dev->process_private = cpp;
> +		hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +		if (nfp_net_ethdev_ops_mount(hw, eth_dev))
> +			return -EINVAL;
> +
> +		rte_eth_dev_probing_finish(eth_dev);
> +	}
> +
> +	return ret;
> +}
> +
>   /*
>    * When attaching to the NFP4000/6000 PF on a secondary process there
>    * is no need to initialise the PF again. Only minimal work is required
> @@ -999,12 +1043,10 @@
>   static int
>   nfp_pf_secondary_init(struct rte_pci_device *pci_dev)
>   {
> -	int i;
>   	int err = 0;
>   	int ret = 0;
> -	int total_ports;
> +	enum nfp_app_id app_id;
>   	struct nfp_cpp *cpp;
> -	struct nfp_net_hw *hw;
>   	struct nfp_rtsym_table *sym_tbl;
>   
>   	if (pci_dev == NULL)
> @@ -1038,37 +1080,26 @@
>   		return -EIO;
>   	}
>   
> -	total_ports = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err);
> -	if (err || total_ports <= 0 || total_ports > 8) {
> -		PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong value");
> -		ret = -ENODEV;
> +	/* Read the app ID of the firmware loaded */
> +	app_id = nfp_rtsym_read_le(sym_tbl, "_pf0_net_app_id", &err);
> +	if (err) {

Compare vs 0

> +		PMD_INIT_LOG(ERR, "Couldn't read app_id from fw");
>   		goto sym_tbl_cleanup;
>   	}
>   
> -	for (i = 0; i < total_ports; i++) {
> -		struct rte_eth_dev *eth_dev;
> -		char port_name[RTE_ETH_NAME_MAX_LEN];
> -
> -		snprintf(port_name, sizeof(port_name), "%s_port%d",
> -			 pci_dev->device.name, i);
> -
> -		PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name);
> -		eth_dev = rte_eth_dev_attach_secondary(port_name);
> -		if (eth_dev == NULL) {
> -			RTE_LOG(ERR, EAL,
> -				"secondary process attach failed, ethdev doesn't exist");
> -			ret = -ENODEV;
> -			break;
> +	switch (app_id) {
> +	case NFP_APP_CORE_NIC:
> +		PMD_INIT_LOG(INFO, "Initializing coreNIC");
> +		ret = nfp_secondary_init_app_nic(pci_dev, sym_tbl, cpp);
> +		if (ret) {

Compare vs 0

> +			PMD_INIT_LOG(ERR, "Could not initialize coreNIC!");
> +			goto sym_tbl_cleanup;
>   		}
> -
> -		hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> -
> -		if (nfp_net_ethdev_ops_mount(hw, eth_dev))
> -			return -EINVAL;
> -
> -		eth_dev->process_private = cpp;
> -
> -		rte_eth_dev_probing_finish(eth_dev);
> +		break;
> +	default:
> +		PMD_INIT_LOG(ERR, "Unsupported Firmware loaded");
> +		ret = -EINVAL;
> +		goto sym_tbl_cleanup;
>   	}
>   
>   	if (ret)
diff mbox series

Patch

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 2c5607c..90dd01e 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -936,7 +936,7 @@ 
 		break;
 	default:
 		PMD_INIT_LOG(ERR, "nfp_net: no device ID matching");
-		err = -ENODEV;
+		ret = -ENODEV;
 		goto pf_cleanup;
 	}
 
@@ -991,6 +991,50 @@ 
 	return ret;
 }
 
+static int
+nfp_secondary_init_app_nic(struct rte_pci_device *pci_dev,
+		struct nfp_rtsym_table *sym_tbl,
+		struct nfp_cpp *cpp)
+{
+	int i;
+	int err = 0;
+	int ret = 0;
+	int total_vnics;
+	struct nfp_net_hw *hw;
+
+	/* Read the number of vNIC's created for the PF */
+	total_vnics = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err);
+	if (err || total_vnics <= 0 || total_vnics > 8) {
+		PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong value");
+		return -ENODEV;
+	}
+
+	for (i = 0; i < total_vnics; i++) {
+		struct rte_eth_dev *eth_dev;
+		char port_name[RTE_ETH_NAME_MAX_LEN];
+		snprintf(port_name, sizeof(port_name), "%s_port%d",
+				pci_dev->device.name, i);
+
+		PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name);
+		eth_dev = rte_eth_dev_attach_secondary(port_name);
+		if (eth_dev == NULL) {
+			RTE_LOG(ERR, EAL,
+				"secondary process attach failed, ethdev doesn't exist");
+			ret = -ENODEV;
+			break;
+		}
+
+		eth_dev->process_private = cpp;
+		hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+		if (nfp_net_ethdev_ops_mount(hw, eth_dev))
+			return -EINVAL;
+
+		rte_eth_dev_probing_finish(eth_dev);
+	}
+
+	return ret;
+}
+
 /*
  * When attaching to the NFP4000/6000 PF on a secondary process there
  * is no need to initialise the PF again. Only minimal work is required
@@ -999,12 +1043,10 @@ 
 static int
 nfp_pf_secondary_init(struct rte_pci_device *pci_dev)
 {
-	int i;
 	int err = 0;
 	int ret = 0;
-	int total_ports;
+	enum nfp_app_id app_id;
 	struct nfp_cpp *cpp;
-	struct nfp_net_hw *hw;
 	struct nfp_rtsym_table *sym_tbl;
 
 	if (pci_dev == NULL)
@@ -1038,37 +1080,26 @@ 
 		return -EIO;
 	}
 
-	total_ports = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err);
-	if (err || total_ports <= 0 || total_ports > 8) {
-		PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong value");
-		ret = -ENODEV;
+	/* Read the app ID of the firmware loaded */
+	app_id = nfp_rtsym_read_le(sym_tbl, "_pf0_net_app_id", &err);
+	if (err) {
+		PMD_INIT_LOG(ERR, "Couldn't read app_id from fw");
 		goto sym_tbl_cleanup;
 	}
 
-	for (i = 0; i < total_ports; i++) {
-		struct rte_eth_dev *eth_dev;
-		char port_name[RTE_ETH_NAME_MAX_LEN];
-
-		snprintf(port_name, sizeof(port_name), "%s_port%d",
-			 pci_dev->device.name, i);
-
-		PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name);
-		eth_dev = rte_eth_dev_attach_secondary(port_name);
-		if (eth_dev == NULL) {
-			RTE_LOG(ERR, EAL,
-				"secondary process attach failed, ethdev doesn't exist");
-			ret = -ENODEV;
-			break;
+	switch (app_id) {
+	case NFP_APP_CORE_NIC:
+		PMD_INIT_LOG(INFO, "Initializing coreNIC");
+		ret = nfp_secondary_init_app_nic(pci_dev, sym_tbl, cpp);
+		if (ret) {
+			PMD_INIT_LOG(ERR, "Could not initialize coreNIC!");
+			goto sym_tbl_cleanup;
 		}
-
-		hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
-
-		if (nfp_net_ethdev_ops_mount(hw, eth_dev))
-			return -EINVAL;
-
-		eth_dev->process_private = cpp;
-
-		rte_eth_dev_probing_finish(eth_dev);
+		break;
+	default:
+		PMD_INIT_LOG(ERR, "Unsupported Firmware loaded");
+		ret = -EINVAL;
+		goto sym_tbl_cleanup;
 	}
 
 	if (ret)