Commit 3e5fd29d authored by Yizhen Fan's avatar Yizhen Fan
Browse files

ub: fix warning happened in compilation 



driver inclusion
category: feature
bugzilla: NA
CVE: NA

--------------------------------

Fix warning happened in compilation.
Change the kconfig of urea so that it will not
compile on other structure of computer

Signed-off-by: default avatarGuoxin Qian <qianguoxin@huawei.com>
Signed-off-by: default avatarYizhen Fan <fanyizhen@huawei.com>
parent 155b929c

drivers/ub/urma/ubcore/ubcore_main.c

+12 −12
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int ubcore_cmd_query_stats(struct ubcore_cmd_hdr *hdr) 


	key.type = (uint8_t)arg.in.type;

	key.key = arg.in.key;

	val.addr = (uint64_t)&com_val;

	val.addr = (uintptr_t)&com_val;

	val.len = sizeof(struct ubcore_stats_com_val);



	ret = ubcore_query_stats(dev, &key, &val);
@@ -407,57 +407,57 @@ static int ubcore_fill_user_res_dev(struct ubcore_res_dev_val *dev_val, 
	int ret;



	dev_val->seg_cnt = ubcore_addr->seg_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->seg_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->seg_list,

				  ubcore_addr->seg_list,

				  dev_val->seg_cnt * sizeof(struct ubcore_seg_info));

	if (ret != 0)

		return ret;



	dev_val->jfs_cnt = ubcore_addr->jfs_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->jfs_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->jfs_list,

				  ubcore_addr->jfs_list, dev_val->jfs_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->jfr_cnt = ubcore_addr->jfr_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->jfr_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->jfr_list,

				  ubcore_addr->jfr_list, dev_val->jfr_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->jfc_cnt = ubcore_addr->jfc_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->jfc_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->jfc_list,

				  ubcore_addr->jfc_list, dev_val->jfc_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->jetty_cnt = ubcore_addr->jetty_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->jetty_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->jetty_list,

				  ubcore_addr->jetty_list, dev_val->jetty_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->jetty_group_cnt = ubcore_addr->jetty_group_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->jetty_group_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->jetty_group_list,

				  ubcore_addr->jetty_group_list,

				  dev_val->jetty_group_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->tp_cnt = ubcore_addr->tp_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->tp_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->tp_list,

				  ubcore_addr->tp_list, dev_val->tp_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->tpg_cnt = ubcore_addr->tpg_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->tpg_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->tpg_list,

				  ubcore_addr->tpg_list, dev_val->tpg_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;



	dev_val->utp_cnt = ubcore_addr->utp_cnt;

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)(uint64_t)dev_val->utp_list,

	ret = ubcore_copy_to_user((void __user *)(uintptr_t)dev_val->utp_list,

				  ubcore_addr->utp_list, dev_val->utp_cnt * sizeof(uint32_t));

	if (ret != 0)

		return ret;
@@ -480,7 +480,7 @@ static int ubcore_query_res_dev(const struct ubcore_device *dev, struct ubcore_r 
		return -ENOMEM;

	}



	val.addr = (uint64_t)&ubcore_addr;

	val.addr = (uintptr_t)&ubcore_addr;

	val.len = sizeof(struct ubcore_res_dev_val);



	ret = ubcore_query_resource(dev, key, &val);
@@ -511,7 +511,7 @@ static int ubcore_query_res_arg(const struct ubcore_device *dev, struct ubcore_c 


	key.type = (uint8_t)arg->in.type;

	key.key = arg->in.key;

	val.addr = (uint64_t)addr;

	val.addr = (uintptr_t)addr;

	val.len = res_len;



	if (arg->in.type == UBCORE_RES_KEY_URMA_DEV)

drivers/ub/urma/ubcore/ubcore_tp.c

+5 −5
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int ubcore_set_tp_peer_ext(struct ubcore_tp_attr *attr, const uint8_t *ex 


	(void)memcpy(peer_ext, ext_addr, ext_len);



	attr->peer_ext.addr = (uint64_t)peer_ext;

	attr->peer_ext.addr = (uintptr_t)peer_ext;

	attr->peer_ext.len = ext_len;

	return 0;

}
@@ -916,7 +916,7 @@ static struct ubcore_tp *ubcore_create_target_tp(struct ubcore_device *dev, 
	struct ubcore_nl_create_tp_req *create =

		(struct ubcore_nl_create_tp_req *)(void *)req->payload;

	/* create tp parameters */

	struct ubcore_udrv_priv udrv_data = { .in_addr = (uint64_t)(create->ext_udrv +

	struct ubcore_udrv_priv udrv_data = { .in_addr = (uintptr_t)(create->ext_udrv +

								    create->ext_len),

					      .in_len = create->udrv_in_len,

					      .out_addr = 0,
@@ -1714,7 +1714,7 @@ int ubcore_config_utp(struct ubcore_device *dev, const union ubcore_eid *eid, 
		return -1;

	}

	// Query the utp_list under the device

	val.addr = (uint64_t)&dev_val;

	val.addr = (uintptr_t)&dev_val;

	val.len = sizeof(struct ubcore_res_dev_val);

	key_val.type = UBCORE_RES_KEY_URMA_DEV;

	key_val.key = eid->in4.addr;
@@ -1745,7 +1745,7 @@ int ubcore_show_utp(struct ubcore_device *dev, const union ubcore_eid *eid) 
		return -1;

	}

	// Query the utp_list under the device

	val.addr = (uint64_t)&dev_val;

	val.addr = (uintptr_t)&dev_val;

	val.len = sizeof(struct ubcore_res_dev_val);

	key_val.type = UBCORE_RES_KEY_URMA_DEV;

	key_val.key = eid->in4.addr;
@@ -1755,7 +1755,7 @@ int ubcore_show_utp(struct ubcore_device *dev, const union ubcore_eid *eid) 
	}

	for (i = 0; dev_val.utp_list != NULL && i < dev_val.utp_cnt; i++) {

		// Query the utp_val under the utp list

		val.addr = (uint64_t)&utp_val;

		val.addr = (uintptr_t)&utp_val;

		val.len = sizeof(struct ubcore_res_utp_val);

		key_val.type = UBCORE_RES_KEY_UTP;

		key_val.key = dev_val.utp_list[i];

drivers/ub/urma/uburma/uburma_cdev_file.c

+4 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static ssize_t eid_store_cb(struct ubcore_device *ubc_dev, const char *buf, size 
	ssize_t ret;



	if (str_to_eid(buf, len, &eid) != 0) {

		uburma_log_err("failed to str_to_eid: %s, %lu.\n", buf, len);

		uburma_log_err("failed to str_to_eid: %s, %zu.\n", buf, len);

		return -EINVAL;

	}
@@ -187,7 +187,7 @@ static ssize_t uburma_query_upi(const struct ubcore_device *ubc_dev, char *buf, 
	key.key = (uint32_t)vf_id;



	val.len = sizeof(uint32_t) * UBCORE_MAX_UPI_CNT;

	val.addr = (uint64_t)kcalloc(1, val.len, GFP_KERNEL);

	val.addr = (uintptr_t)kcalloc(1, val.len, GFP_KERNEL);

	if (val.addr == 0) {

		uburma_log_err("kcalloc vf%u failed.\n", vf_id);

		return -ENOMEM;
@@ -204,7 +204,7 @@ static ssize_t uburma_query_upi(const struct ubcore_device *ubc_dev, char *buf, 
		upi = *((uint32_t *)val.addr + i);

		ret = snprintf(buf + (UBURMA_UPI_STR_LEN * i), UBURMA_UPI_STR_LEN + 1, "%8u ", upi);

		if (ret <= 0) {

			uburma_log_err("snprintf for vf%u upi failed %ld.\n", vf_id, ret);

			uburma_log_err("snprintf for vf%u upi failed %zd.\n", vf_id, ret);

			kfree((void *)val.addr);

			return ret;

		}
@@ -236,7 +236,7 @@ static ssize_t uburma_upi_store(struct ubcore_device *ubc_dev, const char *buf, 


	ret = uburma_parse_upi_str(buf, len, &idx, &upi);

	if (ret != 0) {

		uburma_log_err("parse vf%u upi str:%s failed %ld.\n", vf_id, buf, ret);

		uburma_log_err("parse vf%u upi str:%s failed %zd.\n", vf_id, buf, ret);

		return -EINVAL;

	}

drivers/ub/urma/uburma/uburma_dev_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int uburma_open(struct inode *inode, struct file *filp) 
	srcu_idx = srcu_read_lock(&ubu_dev->ubc_dev_srcu);

	mutex_lock(&ubu_dev->lists_mutex);

	ubc_dev = srcu_dereference(ubu_dev->ubc_dev, &ubu_dev->ubc_dev_srcu);

	if (ubc_dev == NULL || ubc_dev->dev_name == NULL) {

	if (ubc_dev == NULL) {

		uburma_log_err("can not find ubcore device.\n");

		ret = EIO;

		goto err;

include/urma/ubcore_types.h

+4 −4
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ union ubcore_reg_seg_flag { 
};



struct ubcore_udrv_priv {

	uint64_t in_addr;

	uintptr_t in_addr;

	uint32_t in_len;

	uint64_t out_addr;

	uintptr_t out_addr;

	uint32_t out_len;

};
@@ -745,7 +745,7 @@ struct ubcore_tp_cfg { 
};



struct ubcore_tp_ext {

	uint64_t addr;

	uintptr_t addr;

	uint32_t len;

};
@@ -923,7 +923,7 @@ struct ubcore_res_key { 
};



struct ubcore_res_val {

	uint64_t addr; /* allocated and free by ubcore */

	uintptr_t addr; /* allocated and free by ubcore */

	uint32_t len;	/* in&out. As a input parameter,

			 * it indicates the length allocated by the ubcore

			 * As a output parameter, it indicates the actual data length.