提交 ac6bd719 编写于 作者: T tanshukun 提交者: Xie XiuQi

arm64: Fix static check warning for qm/zip

driver inclusion
category: bugfix
bugzilla: 13683
CVE: NA

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

Fix static check warning for qm/zip modules

Feature or Bugfix:Bugfix
Signed-off-by: Ntanshukun (A) <tanshukun1@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: NMingqiang Ling <lingmingqiang@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 d437058f
...@@ -255,7 +255,7 @@ static int qm_wait_mb_ready(struct hisi_qm *qm) ...@@ -255,7 +255,7 @@ static int qm_wait_mb_ready(struct hisi_qm *qm)
} }
/* 128 bit should be wrote to hardware at one time to trigger a mailbox */ /* 128 bit should be wrote to hardware at one time to trigger a mailbox */
static void qm_mb_write(struct hisi_qm *qm, void *src) static void qm_mb_write(struct hisi_qm *qm, const void *src)
{ {
void __iomem *fun_base = qm->io_base + QM_MB_CMD_SEND_BASE; void __iomem *fun_base = qm->io_base + QM_MB_CMD_SEND_BASE;
unsigned long tmp0 = 0, tmp1 = 0; unsigned long tmp0 = 0, tmp1 = 0;
...@@ -646,7 +646,8 @@ static void qm_vft_data_cfg(struct hisi_qm *qm, enum vft_type type, u32 base, ...@@ -646,7 +646,8 @@ static void qm_vft_data_cfg(struct hisi_qm *qm, enum vft_type type, u32 base,
static int qm_set_vft_common(struct hisi_qm *qm, enum vft_type type, static int qm_set_vft_common(struct hisi_qm *qm, enum vft_type type,
u32 fun_num, u32 base, u32 number) u32 fun_num, u32 base, u32 number)
{ {
int val, ret; int ret;
unsigned int val;
ret = readl_relaxed_poll_timeout(qm->io_base + QM_VFT_CFG_RDY, val, ret = readl_relaxed_poll_timeout(qm->io_base + QM_VFT_CFG_RDY, val,
val & BIT(0), POLL_PERIOD, val & BIT(0), POLL_PERIOD,
...@@ -1305,7 +1306,7 @@ EXPORT_SYMBOL_GPL(hisi_qm_stop_qp); ...@@ -1305,7 +1306,7 @@ EXPORT_SYMBOL_GPL(hisi_qm_stop_qp);
* This function will return -EBUSY if qp is currently full, and -EAGAIN * This function will return -EBUSY if qp is currently full, and -EAGAIN
* if qp related qm is resetting. * if qp related qm is resetting.
*/ */
int hisi_qp_send(struct hisi_qp *qp, void *msg) int hisi_qp_send(struct hisi_qp *qp, const void *msg)
{ {
struct hisi_qp_status *qp_status = &qp->qp_status; struct hisi_qp_status *qp_status = &qp->qp_status;
u16 sq_tail = qp_status->sq_tail; u16 sq_tail = qp_status->sq_tail;
...@@ -1358,7 +1359,7 @@ EXPORT_SYMBOL_GPL(hisi_qp_wait); ...@@ -1358,7 +1359,7 @@ EXPORT_SYMBOL_GPL(hisi_qp_wait);
static void hisi_qm_cache_wb(struct hisi_qm *qm) static void hisi_qm_cache_wb(struct hisi_qm *qm)
{ {
int val; unsigned int val;
if (qm->ver == QM_HW_V2) { if (qm->ver == QM_HW_V2) {
writel(0x1, qm->io_base + QM_CACHE_WB_START); writel(0x1, qm->io_base + QM_CACHE_WB_START);
...@@ -2243,7 +2244,7 @@ void hisi_qm_clear_queues(struct hisi_qm *qm) ...@@ -2243,7 +2244,7 @@ void hisi_qm_clear_queues(struct hisi_qm *qm)
struct hisi_qp *qp; struct hisi_qp *qp;
int i; int i;
for (i = 0; i < qm->qp_num; i++, qp++) { for (i = 0; i < qm->qp_num; i++) {
qp = qm->qp_array[i]; qp = qm->qp_array[i];
if (qp) { if (qp) {
memset(qp->qdma.va, 0, qp->qdma.size); memset(qp->qdma.va, 0, qp->qdma.size);
......
...@@ -311,7 +311,7 @@ struct hisi_qp *hisi_qm_create_qp(struct hisi_qm *qm, u8 alg_type); ...@@ -311,7 +311,7 @@ struct hisi_qp *hisi_qm_create_qp(struct hisi_qm *qm, u8 alg_type);
int hisi_qm_start_qp(struct hisi_qp *qp, unsigned long arg); int hisi_qm_start_qp(struct hisi_qp *qp, unsigned long arg);
int hisi_qm_stop_qp(struct hisi_qp *qp); int hisi_qm_stop_qp(struct hisi_qp *qp);
void hisi_qm_release_qp(struct hisi_qp *qp); void hisi_qm_release_qp(struct hisi_qp *qp);
int hisi_qp_send(struct hisi_qp *qp, void *msg); int hisi_qp_send(struct hisi_qp *qp, const void *msg);
int hisi_qp_wait(struct hisi_qp *qp); int hisi_qp_wait(struct hisi_qp *qp);
int hisi_qm_get_vft(struct hisi_qm *qm, u32 *base, u32 *number); int hisi_qm_get_vft(struct hisi_qm *qm, u32 *base, u32 *number);
int hisi_qm_set_vft(struct hisi_qm *qm, u32 fun_num, u32 base, u32 number); int hisi_qm_set_vft(struct hisi_qm *qm, u32 fun_num, u32 base, u32 number);
......
...@@ -718,7 +718,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -718,7 +718,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
/* now we only support equal assignment */ /* now we only support equal assignment */
static int hisi_zip_vf_q_assign(struct hisi_zip *hisi_zip, int num_vfs) static int hisi_zip_vf_q_assign(struct hisi_zip *hisi_zip, u32 num_vfs)
{ {
struct hisi_qm *qm = &hisi_zip->qm; struct hisi_qm *qm = &hisi_zip->qm;
u32 qp_num = qm->qp_num; u32 qp_num = qm->qp_num;
......
...@@ -22,7 +22,7 @@ struct uacce_qfile_region { ...@@ -22,7 +22,7 @@ struct uacce_qfile_region {
enum uacce_qfrt type; enum uacce_qfrt type;
unsigned long iova; /* iova share between user and device space */ unsigned long iova; /* iova share between user and device space */
struct page **pages; struct page **pages;
int nr_pages; unsigned int nr_pages;
unsigned long prot; unsigned long prot;
int flags; int flags;
struct list_head qs; /* qs sharing the same region, for ss */ struct list_head qs; /* qs sharing the same region, for ss */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册