Unverified Commit 56db1289 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!675 driver/hifc&hinic: Fix compile error in allyesconfigs 

Merge Pull Request from: @aspiresky01 
 
When using allyesconfig to configure the kernel, errors may occur during the linking process when making. 
 
Link:https://gitee.com/openeuler/kernel/pulls/675

 

Reviewed-by: default avatarChiqijun <chiqijun@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 22fb0556 3d776c92

drivers/net/ethernet/huawei/hinic/hinic_cfg.c

+5 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(g_rdma_mpts_num, "number of roce used mpts, use default value w 
module_param(g_vfs_num, uint, 0444);

MODULE_PARM_DESC(g_vfs_num, "number of used vfs, use default value when pass 0 ");



uint intr_mode;

static uint intr_mode;



uint timer_enable = 1;

uint bloomfilter_enable;
@@ -1461,7 +1461,7 @@ static void cfg_mbx_cleanup(struct hinic_hwdev *dev) 
	hinic_unregister_vf_mbox_cb(dev, HINIC_MOD_CFGM);

}



int init_cfg_mgmt(struct hinic_hwdev *dev)

static int init_cfg_mgmt(struct hinic_hwdev *dev)

{

	int err;

	struct cfg_mgmt_info *cfg_mgmt;
@@ -1509,7 +1509,7 @@ int init_cfg_mgmt(struct hinic_hwdev *dev) 
	return err;

}



void free_cfg_mgmt(struct hinic_hwdev *dev)

static void free_cfg_mgmt(struct hinic_hwdev *dev)

{

	struct cfg_mgmt_info *cfg_mgmt = dev->cfg_mgmt;
@@ -1542,7 +1542,7 @@ void free_cfg_mgmt(struct hinic_hwdev *dev) 
	kfree(cfg_mgmt);

}



int init_capability(struct hinic_hwdev *dev)

static int init_capability(struct hinic_hwdev *dev)

{

	struct cfg_mgmt_info *cfg_mgmt = dev->cfg_mgmt;

	int err;
@@ -1571,7 +1571,7 @@ int init_capability(struct hinic_hwdev *dev) 
	return 0;

}



void free_capability(struct hinic_hwdev *dev)

static void free_capability(struct hinic_hwdev *dev)

{

	cfg_mbx_cleanup(dev);

	sdk_info(dev->dev_hdl, "Free capability success");

drivers/net/ethernet/huawei/hinic/hinic_dbgtool_knl.c

+72 −72
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ struct ffm_intr_info { 
#define DBGTOOL_MSG_MAX_SIZE			2048ULL

#define HINIC_SELF_CMD_UP2PF_FFM		0x26



void *g_card_node_array[MAX_CARD_NUM] = {0};

void *g_card_vir_addr[MAX_CARD_NUM] = {0};

u64 g_card_phy_addr[MAX_CARD_NUM] = {0};

/* lock for g_card_vir_addr */

struct mutex	g_addr_lock;

int card_id;

void *g_hinic_card_node_array[MAX_CARD_NUM] = {0};

void *g_hinic_card_vir_addr[MAX_CARD_NUM] = {0};

u64 g_hinic_card_phy_addr[MAX_CARD_NUM] = {0};

/* lock for g_hinic_card_vir_addr */

struct mutex	g_hinic_addr_lock;

int g_hinic_card_id;



/* dbgtool character device name, class name, dev path */

#define CHR_DEV_DBGTOOL		"dbgtool_chr_dev"
@@ -66,15 +66,15 @@ struct dbgtool_k_glb_info { 
	struct ffm_record_info *ffm;

};



dev_t dbgtool_dev_id;			/* device id */

struct cdev dbgtool_chr_dev;		/* struct of char device */

static dev_t dbgtool_dev_id;			/* device id */

static struct cdev dbgtool_chr_dev;		/* struct of char device */



/*lint -save -e104 -e808*/

struct class *dbgtool_d_class;		/* struct of char class */

static struct class *dbgtool_d_class;		/* struct of char class */

/*lint -restore*/



int g_dbgtool_init_flag;

int g_dbgtool_ref_cnt;

static int g_dbgtool_init_flag;

static int g_dbgtool_ref_cnt;



static int dbgtool_knl_open(struct inode *pnode,

			    struct file *pfile)
@@ -109,7 +109,7 @@ static bool is_valid_phy_addr(u64 offset) 
	int i;



	for (i = 0; i < MAX_CARD_NUM; i++) {

		if (offset == g_card_phy_addr[i])

		if (offset == g_hinic_card_phy_addr[i])

			return true;

	}
@@ -134,9 +134,9 @@ int hinic_mem_mmap(struct file *filp, struct vm_area_struct *vma) 
	}



	/* old version of tool set vma->vm_pgoff to 0 */

	phy_addr = offset ? offset : g_card_phy_addr[card_id];

	phy_addr = offset ? offset : g_hinic_card_phy_addr[g_hinic_card_id];

	if (!phy_addr) {

		pr_err("Card_id = %d physical address is 0\n", card_id);

		pr_err("Card_id = %d physical address is 0\n", g_hinic_card_id);

		return -EAGAIN;

	}
@@ -154,7 +154,7 @@ int hinic_mem_mmap(struct file *filp, struct vm_area_struct *vma) 
 * @g_func_handle_array: global function handle

 * Return: 0 - success, negative - failure

 */

long dbgtool_knl_api_cmd_read(struct dbgtool_param *para,

static long dbgtool_knl_api_cmd_read(struct dbgtool_param *para,

				     void **g_func_handle_array)

{

	long ret = 0;
@@ -237,7 +237,7 @@ long dbgtool_knl_api_cmd_read(struct dbgtool_param *para, 
 * @g_func_handle_array: global function handle

 * Return: 0 - success, negative - failure

 */

long dbgtool_knl_api_cmd_write(struct dbgtool_param *para,

static long dbgtool_knl_api_cmd_write(struct dbgtool_param *para,

				      void **g_func_handle_array)

{

	long ret = 0;
@@ -289,7 +289,7 @@ long dbgtool_knl_api_cmd_write(struct dbgtool_param *para, 
	return ret;

}



void chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_idx,

void hinic_chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_idx,

				      void **g_func_handle_array)

{

	u32 func_idx;
@@ -304,7 +304,7 @@ void chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_idx, 
	for (func_idx = 0; func_idx < 16; func_idx++) {

		hwdev = (struct hinic_hwdev *)g_func_handle_array[func_idx];



		dev_info[func_idx].phy_addr = g_card_phy_addr[card_idx];

		dev_info[func_idx].phy_addr = g_hinic_card_phy_addr[card_idx];



		if (!hwdev) {

			dev_info[func_idx].bar0_size = 0;
@@ -334,47 +334,47 @@ void chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_idx, 
 * @g_func_handle_array: global function handle

 * Return: 0 - success, negative - failure

 */

long dbgtool_knl_pf_dev_info_get(struct dbgtool_param *para,

static long dbgtool_knl_pf_dev_info_get(struct dbgtool_param *para,

					void **g_func_handle_array)

{

	struct pf_dev_info dev_info[16] = { {0} };

	unsigned char *tmp;

	int i;



	mutex_lock(&g_addr_lock);

	if (!g_card_vir_addr[card_id]) {

		g_card_vir_addr[card_id] =

	mutex_lock(&g_hinic_addr_lock);

	if (!g_hinic_card_vir_addr[g_hinic_card_id]) {

		g_hinic_card_vir_addr[g_hinic_card_id] =

			(void *)__get_free_pages(GFP_KERNEL,

						 DBGTOOL_PAGE_ORDER);

		if (!g_card_vir_addr[card_id]) {

		if (!g_hinic_card_vir_addr[g_hinic_card_id]) {

			pr_err("Alloc dbgtool api chain fail!\n");

			mutex_unlock(&g_addr_lock);

			mutex_unlock(&g_hinic_addr_lock);

			return -EFAULT;

		}



		memset(g_card_vir_addr[card_id], 0,

		memset(g_hinic_card_vir_addr[g_hinic_card_id], 0,

		       PAGE_SIZE * (1 << DBGTOOL_PAGE_ORDER));



		g_card_phy_addr[card_id] =

			virt_to_phys(g_card_vir_addr[card_id]);

		if (!g_card_phy_addr[card_id]) {

			pr_err("phy addr for card %d is 0\n", card_id);

			free_pages((unsigned long)g_card_vir_addr[card_id],

		g_hinic_card_phy_addr[g_hinic_card_id] =

			virt_to_phys(g_hinic_card_vir_addr[g_hinic_card_id]);

		if (!g_hinic_card_phy_addr[g_hinic_card_id]) {

			pr_err("phy addr for card %d is 0\n", g_hinic_card_id);

			free_pages((unsigned long)g_hinic_card_vir_addr[g_hinic_card_id],

				   DBGTOOL_PAGE_ORDER);

			g_card_vir_addr[card_id] = NULL;

			mutex_unlock(&g_addr_lock);

			g_hinic_card_vir_addr[g_hinic_card_id] = NULL;

			mutex_unlock(&g_hinic_addr_lock);

			return -EFAULT;

		}



		tmp = g_card_vir_addr[card_id];

		tmp = g_hinic_card_vir_addr[g_hinic_card_id];

		for (i = 0; i < (1 << DBGTOOL_PAGE_ORDER); i++) {

			SetPageReserved(virt_to_page(tmp));

			tmp += PAGE_SIZE;

		}

	}

	mutex_unlock(&g_addr_lock);

	mutex_unlock(&g_hinic_addr_lock);



	chipif_get_all_pf_dev_info(dev_info, card_id, g_func_handle_array);

	hinic_chipif_get_all_pf_dev_info(dev_info, g_hinic_card_id, g_func_handle_array);



	/* Copy the dev_info to user mode */

	if (copy_to_user(para->param.dev_info, dev_info,
@@ -392,7 +392,7 @@ long dbgtool_knl_pf_dev_info_get(struct dbgtool_param *para, 
 * @dbgtool_info: the dbgtool info

 * Return: 0 - success, negative - failure

 */

long dbgtool_knl_ffm_info_rd(struct dbgtool_param *para,

static long dbgtool_knl_ffm_info_rd(struct dbgtool_param *para,

				    struct dbgtool_k_glb_info *dbgtool_info)

{

	/* Copy the ffm_info to user mode */
@@ -410,7 +410,7 @@ long dbgtool_knl_ffm_info_rd(struct dbgtool_param *para, 
 * @para: unused

 * @dbgtool_info: the dbgtool info

 */

void dbgtool_knl_ffm_info_clr(struct dbgtool_param *para,

static void dbgtool_knl_ffm_info_clr(struct dbgtool_param *para,

				     struct dbgtool_k_glb_info *dbgtool_info)

{

	dbgtool_info->ffm->ffm_num = 0;
@@ -422,7 +422,7 @@ void dbgtool_knl_ffm_info_clr(struct dbgtool_param *para, 
 * @g_func_handle_array: global function handle

 * Return: 0 - success, negative - failure

 */

long dbgtool_knl_msg_to_up(struct dbgtool_param *para,

static long dbgtool_knl_msg_to_up(struct dbgtool_param *para,

				  void **g_func_handle_array)

{

	long ret = 0;
@@ -506,29 +506,29 @@ long dbgtool_knl_msg_to_up(struct dbgtool_param *para, 
	return ret;

}



long dbgtool_knl_free_mem(int id)

long hinic_dbgtool_knl_free_mem(int id)

{

	unsigned char *tmp;

	int i;



	mutex_lock(&g_addr_lock);

	mutex_lock(&g_hinic_addr_lock);



	if (!g_card_vir_addr[id]) {

		mutex_unlock(&g_addr_lock);

	if (!g_hinic_card_vir_addr[id]) {

		mutex_unlock(&g_hinic_addr_lock);

		return 0;

	}



	tmp = g_card_vir_addr[id];

	tmp = g_hinic_card_vir_addr[id];

	for (i = 0; i < (1 << DBGTOOL_PAGE_ORDER); i++) {

		ClearPageReserved(virt_to_page(tmp));

		tmp += PAGE_SIZE;

	}



	free_pages((unsigned long)g_card_vir_addr[id], DBGTOOL_PAGE_ORDER);

	g_card_vir_addr[id] = NULL;

	g_card_phy_addr[id] = 0;

	free_pages((unsigned long)g_hinic_card_vir_addr[id], DBGTOOL_PAGE_ORDER);

	g_hinic_card_vir_addr[id] = NULL;

	g_hinic_card_phy_addr[id] = 0;



	mutex_unlock(&g_addr_lock);

	mutex_unlock(&g_hinic_addr_lock);



	return 0;

}
@@ -540,7 +540,7 @@ long dbgtool_knl_free_mem(int id) 
 * @pfile: the pointer to file

 * @cmd: the command type

 */

long dbgtool_knl_unlocked_ioctl(struct file *pfile,

static long dbgtool_knl_unlocked_ioctl(struct file *pfile,

				       unsigned int cmd,

				       unsigned long arg)

{
@@ -560,7 +560,7 @@ long dbgtool_knl_unlocked_ioctl(struct file *pfile, 


	param.chip_name[IFNAMSIZ - 1] = '\0';

	for (i = 0; i < MAX_CARD_NUM; i++) {

		card_info = (struct card_node *)g_card_node_array[i];

		card_info = (struct card_node *)g_hinic_card_node_array[i];

		if (!card_info)

			continue;

		if (!strncmp(param.chip_name, card_info->chip_name, IFNAMSIZ))
@@ -572,7 +572,7 @@ long dbgtool_knl_unlocked_ioctl(struct file *pfile, 
		return -EFAULT;

	}



	card_id = i;

	g_hinic_card_id = i;



	dbgtool_info = (struct dbgtool_k_glb_info *)card_info->dbgtool_info;
@@ -604,7 +604,7 @@ long dbgtool_knl_unlocked_ioctl(struct file *pfile, 
					    card_info->func_handle_array);

		break;

	case DBGTOOL_CMD_FREE_MEM:

		ret = dbgtool_knl_free_mem(i);

		ret = hinic_dbgtool_knl_free_mem(i);

		break;

	default:

		pr_err("Dbgtool cmd(x%x) not support now\n", real_cmd);
@@ -621,7 +621,7 @@ long dbgtool_knl_unlocked_ioctl(struct file *pfile, 
 * @buf_in: the pointer to input buffer

 * @buf_out: the pointer to outputput buffer

 */

void ffm_intr_msg_record(void *handle, void *buf_in, u16 in_size,

static void ffm_intr_msg_record(void *handle, void *buf_in, u16 in_size,

				void *buf_out, u16 *out_size)

{

	struct dbgtool_k_glb_info *dbgtool_info;
@@ -634,7 +634,7 @@ void ffm_intr_msg_record(void *handle, void *buf_in, u16 in_size, 
	int i, j;



	for (i = 0; i < MAX_CARD_NUM; i++) {

		card_info = (struct card_node *)g_card_node_array[i];

		card_info = (struct card_node *)g_hinic_card_node_array[i];

		if (!card_info)

			continue;
@@ -709,12 +709,12 @@ static const struct file_operations dbgtool_file_operations = { 
};



/**

 * dbgtool_knl_init - dbgtool character device init

 * hinic_dbgtool_knl_init - dbgtool character device init

 * @hwdev: the pointer to hardware device

 * @chip_node: the pointer to card node

 * Return: 0 - success, negative - failure

 */

int dbgtool_knl_init(void *vhwdev, void *chip_node)

int hinic_dbgtool_knl_init(void *vhwdev, void *chip_node)

{

	int ret = 0;

	int id;
@@ -770,7 +770,7 @@ int dbgtool_knl_init(void *vhwdev, void *chip_node) 
		goto sscanf_chdev_fail;

	}



	g_card_node_array[id] = chip_info;

	g_hinic_card_node_array[id] = chip_info;

	chip_info->func_num++;



	if (g_dbgtool_init_flag) {
@@ -817,7 +817,7 @@ int dbgtool_knl_init(void *vhwdev, void *chip_node) 
	}

	g_dbgtool_init_flag = 1;

	g_dbgtool_ref_cnt = 1;

	mutex_init(&g_addr_lock);

	mutex_init(&g_hinic_addr_lock);



	return 0;
@@ -828,7 +828,7 @@ int dbgtool_knl_init(void *vhwdev, void *chip_node) 
cdev_add_fail:

	unregister_chrdev_region(dbgtool_dev_id, 1);

alloc_chdev_fail:

	g_card_node_array[id] = NULL;

	g_hinic_card_node_array[id] = NULL;

sscanf_chdev_fail:

	kfree(dbgtool_info->ffm);

dbgtool_info_ffm_fail:
@@ -844,11 +844,11 @@ int dbgtool_knl_init(void *vhwdev, void *chip_node) 
}



/**

 * dbgtool_knl_deinit - dbgtool character device deinit

 * hinic_dbgtool_knl_deinit - dbgtool character device deinit

 * @hwdev: the pointer to hardware device

 * @chip_node: the pointer to card node

 */

void dbgtool_knl_deinit(void *vhwdev, void *chip_node)

void hinic_dbgtool_knl_deinit(void *vhwdev, void *chip_node)

{

	struct dbgtool_k_glb_info *dbgtool_info;

	struct card_node *chip_info = (struct card_node *)chip_node;
@@ -874,7 +874,7 @@ void dbgtool_knl_deinit(void *vhwdev, void *chip_node) 
	if (err <= 0)

		pr_err("Failed to get hinic id\n");



	g_card_node_array[id] = NULL;

	g_hinic_card_node_array[id] = NULL;



	dbgtool_info = chip_info->dbgtool_info;

	/* FFM deinit */
@@ -884,7 +884,7 @@ void dbgtool_knl_deinit(void *vhwdev, void *chip_node) 
	kfree(dbgtool_info);

	chip_info->dbgtool_info = NULL;



	(void)dbgtool_knl_free_mem(id);

	(void)hinic_dbgtool_knl_free_mem(id);



	if (g_dbgtool_init_flag) {

		if ((--g_dbgtool_ref_cnt))

drivers/net/ethernet/huawei/hinic/hinic_dbgtool_knl.h

+5 −5
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ struct dbgtool_param { 
#define MAX_CARD_NUM 64

#define DBGTOOL_PAGE_ORDER 10



int dbgtool_knl_init(void *vhwdev, void *chip_node);

void dbgtool_knl_deinit(void *vhwdev, void *chip_node);

int hinic_dbgtool_knl_init(void *vhwdev, void *chip_node);

void hinic_dbgtool_knl_deinit(void *vhwdev, void *chip_node);

int hinic_mem_mmap(struct file *filp, struct vm_area_struct *vma);

void chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_id,

void hinic_chipif_get_all_pf_dev_info(struct pf_dev_info *dev_info, int card_id,

				      void **g_func_handle_array);

long dbgtool_knl_free_mem(int id);

long hinic_dbgtool_knl_free_mem(int id);



#endif

drivers/net/ethernet/huawei/hinic/hinic_hwdev.c

+19 −19
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ struct hinic_mgmt_status_log { 
	const char *log;

};



struct hinic_mgmt_status_log mgmt_status_log[] = {

static struct hinic_mgmt_status_log mgmt_status_log[] = {

	{HINIC_MGMT_STATUS_ERR_PARAM, "Invalid parameter"},

	{HINIC_MGMT_STATUS_ERR_FAILED, "Operation failed"},

	{HINIC_MGMT_STATUS_ERR_PORT, "Invalid port"},
@@ -2700,7 +2700,7 @@ int hinic_func_tmr_bitmap_set(void *hwdev, bool en) 
}

EXPORT_SYMBOL(hinic_func_tmr_bitmap_set);



int ppf_ht_gpa_set(struct hinic_hwdev *hwdev, struct hinic_page_addr *pg0,

static int ppf_ht_gpa_set(struct hinic_hwdev *hwdev, struct hinic_page_addr *pg0,

			  struct hinic_page_addr *pg1)

{

	struct comm_info_ht_gpa_set ht_gpa_set = {0};
@@ -3903,9 +3903,9 @@ static void hinic_mctp_get_host_info_event_handler(struct hinic_hwdev *hwdev, 
	mctp_out->actual_len = host_info->data_len;

}



char *__hw_to_char_fec[HILINK_FEC_MAX_TYPE] = {"RS-FEC", "BASE-FEC", "NO-FEC"};

static char *__hw_to_char_fec[HILINK_FEC_MAX_TYPE] = {"RS-FEC", "BASE-FEC", "NO-FEC"};



char *__hw_to_char_port_type[LINK_PORT_MAX_TYPE] = {

static char *__hw_to_char_port_type[LINK_PORT_MAX_TYPE] = {

	"Unknown", "Fibre", "Electric", "Direct Attach Copper", "AOC",

	"Back plane", "BaseT"

};
@@ -4067,7 +4067,7 @@ static char *hilink_info_report_type[HILINK_EVENT_MAX_TYPE] = { 
	"", "link up", "link down", "cable plugged"

};



void print_hilink_info(struct hinic_hwdev *hwdev,

static void print_hilink_info(struct hinic_hwdev *hwdev,

			      enum hilink_info_print_event type,

			      struct hinic_link_info *info)

{
@@ -4318,7 +4318,7 @@ static void pf_hilink_event_handler(void *hwdev, void *pri_handle, u8 cmd, 
}



/* pf fault report event */

void pf_fault_event_handler(void *hwdev,

static void pf_fault_event_handler(void *hwdev,

				   void *buf_in, u16 in_size,

				   void *buf_out, u16 *out_size)

{
@@ -4326,28 +4326,28 @@ void pf_fault_event_handler(void *hwdev, 
		       in_size, buf_out, out_size);

}



void mgmt_watchdog_event_handler(void *hwdev, void *buf_in, u16 in_size,

static void mgmt_watchdog_event_handler(void *hwdev, void *buf_in, u16 in_size,

					void *buf_out, u16 *out_size)

{

	_event_handler(hwdev, HINIC_EVENT_MGMT_WATCHDOG, buf_in,

		       in_size, buf_out, out_size);

}



void mgmt_fmw_act_event_handler(void *hwdev, void *buf_in, u16 in_size,

static void mgmt_fmw_act_event_handler(void *hwdev, void *buf_in, u16 in_size,

				       void *buf_out, u16 *out_size)

{

	_event_handler(hwdev, HINIC_EVENT_MGMT_FMW_ACT_NTC, buf_in,

		       in_size, buf_out, out_size);

}



void mgmt_pcie_dfx_event_handler(void *hwdev, void *buf_in, u16 in_size,

static void mgmt_pcie_dfx_event_handler(void *hwdev, void *buf_in, u16 in_size,

					void *buf_out, u16 *out_size)

{

	_event_handler(hwdev, HINIC_EVENT_MGMT_PCIE_DFX, buf_in,

		       in_size, buf_out, out_size);

}



void mgmt_get_mctp_event_handler(void *hwdev, void *buf_in, u16 in_size,

static void mgmt_get_mctp_event_handler(void *hwdev, void *buf_in, u16 in_size,

					void *buf_out, u16 *out_size)

{

	_event_handler(hwdev, HINIC_EVENT_MCTP_HOST_INFO, buf_in,

drivers/net/ethernet/huawei/hinic/hinic_lld.c

+6 −6
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct hinic_lld_lock { 
	atomic_t		dev_ref_cnt;

};



struct hinic_lld_lock g_lld_lock;

static struct hinic_lld_lock g_lld_lock;



#define WAIT_LLD_DEV_HOLD_TIMEOUT	(10 * 60 * 1000)	/* 10minutes */

#define WAIT_LLD_DEV_NODE_CHANGED	(10 * 60 * 1000)	/* 10minutes */
@@ -1383,7 +1383,7 @@ int hinic_get_pf_id(void *hwdev, u32 port_id, u32 *pf_id, u32 *isvalid) 
	return 0;

}



void get_fc_devname(char *devname)

void hinic_get_fc_devname(char *devname)

{

	struct card_node *chip_node;

	struct hinic_pcidev *dev;
@@ -2441,7 +2441,7 @@ static int hinic_func_init(struct pci_dev *pdev, 


	/* dbgtool init */

	lld_lock_chip_node();

	err = dbgtool_knl_init(pci_adapter->hwdev, pci_adapter->chip_node);

	err = hinic_dbgtool_knl_init(pci_adapter->hwdev, pci_adapter->chip_node);

	if (err) {

		lld_unlock_chip_node();

		sdk_err(&pdev->dev, "Failed to initialize dbgtool\n");
@@ -2500,7 +2500,7 @@ static void hinic_func_deinit(struct pci_dev *pdev) 


	if (pci_adapter->init_state >= HINIC_INIT_STATE_DBGTOOL_INITED) {

		lld_lock_chip_node();

		dbgtool_knl_deinit(pci_adapter->hwdev, pci_adapter->chip_node);

		hinic_dbgtool_knl_deinit(pci_adapter->hwdev, pci_adapter->chip_node);

		lld_unlock_chip_node();

		hinic_destroy_syncfw_timer(pci_adapter);

		hinic_event_unregister(pci_adapter->hwdev);
@@ -2603,7 +2603,7 @@ static void hinic_remove(struct pci_dev *pdev) 
		lld_lock_chip_node();

		if (pci_adapter->init_state < HINIC_INIT_STATE_HW_IF_INITED)

			list_del(&pci_adapter->node);

		nictool_k_uninit();

		hinic_tool_k_uninit();

		free_chip_node(pci_adapter);

		lld_unlock_chip_node();

		unmapping_bar(pci_adapter);
@@ -2720,7 +2720,7 @@ static int hinic_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sscanf(pci_adapter->chip_node->chip_name, HINIC_CHIP_NAME "%d",

	       &pci_adapter->card_id);



	err = nictool_k_init();

	err = hinic_tool_k_init();

	if (err) {

		sdk_warn(&pdev->dev, "Failed to init nictool");

		goto init_nictool_err;