On 04/19/2018 07:01 AM, Arnon Warshavsky wrote:
> replace panic calls with log and retrun value.
typo return, seems to be in a few commit msgs
> Local function to this file,
> changing from void to int is non-abi-breaking
>
> Signed-off-by: Arnon Warshavsky <ar...@qwilt.com>
> ---
> drivers/net/ixgbe/ixgbe_ethdev.c | 3 ++-
> drivers/net/ixgbe/ixgbe_ethdev.h | 2 +-
> drivers/net/ixgbe/ixgbe_pf.c | 13 +++++++++----
> 3 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index a5e2fc0..c7797f1 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -1224,7 +1224,8 @@ struct rte_ixgbe_xstats_name_off {
> memset(hwstrip, 0, sizeof(*hwstrip));
>
> /* initialize PF if max_vfs not zero */
> - ixgbe_pf_host_init(eth_dev);
> + if (ixgbe_pf_host_init(eth_dev) != 0)
> + return -1;
similar comment as previous patch about using an appropriate return value
>
> ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
> /* let hardware know driver is loaded */
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h
> b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 6550777..8bb41ec 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -661,7 +661,7 @@ int ixgbe_fdir_filter_program(struct rte_eth_dev *dev,
>
> void ixgbe_vlan_hw_strip_config(struct rte_eth_dev *dev);
>
> -void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev);
> +int ixgbe_pf_host_init(struct rte_eth_dev *eth_dev);
>
> void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);
>
> diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
> index 4e61310..4cd3651 100644
> --- a/drivers/net/ixgbe/ixgbe_pf.c
> +++ b/drivers/net/ixgbe/ixgbe_pf.c
> @@ -66,7 +66,7 @@ int ixgbe_vf_perm_addr_gen(struct rte_eth_dev *dev,
> uint16_t vf_num)
> return 0;
> }
>
> -void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
> +int ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
> {
> struct ixgbe_vf_info **vfinfo =
> IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
> @@ -84,11 +84,14 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
> RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
> vf_num = dev_num_vf(eth_dev);
> if (vf_num == 0)
> - return;
> + return 0;
>
> *vfinfo = rte_zmalloc("vf_info", sizeof(struct ixgbe_vf_info) * vf_num,
> 0);
> - if (*vfinfo == NULL)
> - rte_panic("Cannot allocate memory for private VF data\n");
> + if (*vfinfo == NULL) {
> + RTE_LOG(ERR, PMD, "%s() Cannot allocate memory for private VF
> data\n",
> + __func__);
> + return -1;
> + }
>
> memset(mirror_info, 0, sizeof(struct ixgbe_mirror_info));
> memset(uta_info, 0, sizeof(struct ixgbe_uta_info));
> @@ -116,6 +119,8 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
>
> /* set mb interrupt mask */
> ixgbe_mb_intr_setup(eth_dev);
> +
> + return 0;
> }
>
> void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
>
