Commit 41257629 authored by Lizhi Hou's avatar Lizhi Hou Committed by Mario Limonciello
Browse files

accel/amdxdna: Remove casting mailbox payload pointer 



The mailbox payload pointer is void __iomem *. Casting it to u32 * is
incorrect and causes sparse warning.
  cast removes address space '__iomem' of expression

Fixes: b87f920b ("accel/amdxdna: Support hardware mailbox")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501130921.ktqwsMLH-lkp@intel.com/


Signed-off-by: default avatarLizhi Hou <lizhi.hou@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250113182617.1256094-1-lizhi.hou@amd.com
parent 749b5b27

drivers/accel/amdxdna/aie2_ctx.c

+11 −11
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ aie2_sched_notify(struct amdxdna_sched_job *job) 
}



static int

aie2_sched_resp_handler(void *handle, const u32 *data, size_t size)

aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size)

{

	struct amdxdna_sched_job *job = handle;

	struct amdxdna_gem_obj *cmd_abo;
@@ -203,7 +203,7 @@ aie2_sched_resp_handler(void *handle, const u32 *data, size_t size) 
		goto out;

	}



	status = *data;

	status = readl(data);

	XDNA_DBG(job->hwctx->client->xdna, "Resp status 0x%x", status);

	if (status == AIE2_STATUS_SUCCESS)

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);
@@ -216,7 +216,7 @@ aie2_sched_resp_handler(void *handle, const u32 *data, size_t size) 
}



static int

aie2_sched_nocmd_resp_handler(void *handle, const u32 *data, size_t size)

aie2_sched_nocmd_resp_handler(void *handle, void __iomem *data, size_t size)

{

	struct amdxdna_sched_job *job = handle;

	u32 ret = 0;
@@ -230,7 +230,7 @@ aie2_sched_nocmd_resp_handler(void *handle, const u32 *data, size_t size) 
		goto out;

	}



	status = *data;

	status = readl(data);

	XDNA_DBG(job->hwctx->client->xdna, "Resp status 0x%x", status);



out:
@@ -239,14 +239,14 @@ aie2_sched_nocmd_resp_handler(void *handle, const u32 *data, size_t size) 
}



static int

aie2_sched_cmdlist_resp_handler(void *handle, const u32 *data, size_t size)

aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)

{

	struct amdxdna_sched_job *job = handle;

	struct amdxdna_gem_obj *cmd_abo;

	struct cmd_chain_resp *resp;

	struct amdxdna_dev *xdna;

	u32 fail_cmd_status;

	u32 fail_cmd_idx;

	u32 cmd_status;

	u32 ret = 0;



	cmd_abo = job->cmd_bo;
@@ -256,17 +256,17 @@ aie2_sched_cmdlist_resp_handler(void *handle, const u32 *data, size_t size) 
		goto out;

	}



	resp = (struct cmd_chain_resp *)data;

	cmd_status = readl(data + offsetof(struct cmd_chain_resp, status));

	xdna = job->hwctx->client->xdna;

	XDNA_DBG(xdna, "Status 0x%x", resp->status);

	if (resp->status == AIE2_STATUS_SUCCESS) {

	XDNA_DBG(xdna, "Status 0x%x", cmd_status);

	if (cmd_status == AIE2_STATUS_SUCCESS) {

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);

		goto out;

	}



	/* Slow path to handle error, read from ringbuf on BAR */

	fail_cmd_idx = resp->fail_cmd_idx;

	fail_cmd_status = resp->fail_cmd_status;

	fail_cmd_idx = readl(data + offsetof(struct cmd_chain_resp, fail_cmd_idx));

	fail_cmd_status = readl(data + offsetof(struct cmd_chain_resp, fail_cmd_status));

	XDNA_DBG(xdna, "Failed cmd idx %d, status 0x%x",

		 fail_cmd_idx, fail_cmd_status);

drivers/accel/amdxdna/aie2_error.c

+3 −5
Original line number Diff line number Diff line
@@ -209,16 +209,14 @@ static u32 aie2_error_backtrack(struct amdxdna_dev_hdl *ndev, void *err_info, u3 
	return err_col;

}



static int aie2_error_async_cb(void *handle, const u32 *data, size_t size)

static int aie2_error_async_cb(void *handle, void __iomem *data, size_t size)

{

	struct async_event_msg_resp *resp;

	struct async_event *e = handle;



	if (data) {

		resp = (struct async_event_msg_resp *)data;

		e->resp.type = resp->type;

		e->resp.type = readl(data + offsetof(struct async_event_msg_resp, type));

		wmb(); /* Update status in the end, so that no lock for here */

		e->resp.status = resp->status;

		e->resp.status = readl(data + offsetof(struct async_event_msg_resp, status));

	}

	queue_work(e->wq, &e->work);

	return 0;

drivers/accel/amdxdna/aie2_message.c

+5 −5
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, 
}



int aie2_register_asyn_event_msg(struct amdxdna_dev_hdl *ndev, dma_addr_t addr, u32 size,

				 void *handle, int (*cb)(void*, const u32 *, size_t))

				 void *handle, int (*cb)(void*, void __iomem *, size_t))

{

	struct async_event_msg_req req = { 0 };

	struct xdna_mailbox_msg msg = {
@@ -435,7 +435,7 @@ int aie2_config_cu(struct amdxdna_hwctx *hwctx) 
}



int aie2_execbuf(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,

		 int (*notify_cb)(void *, const u32 *, size_t))

		 int (*notify_cb)(void *, void __iomem *, size_t))

{

	struct mailbox_channel *chann = hwctx->priv->mbox_chann;

	struct amdxdna_dev *xdna = hwctx->client->xdna;
@@ -640,7 +640,7 @@ aie2_cmd_op_to_msg_op(u32 op) 


int aie2_cmdlist_multi_execbuf(struct amdxdna_hwctx *hwctx,

			       struct amdxdna_sched_job *job,

			       int (*notify_cb)(void *, const u32 *, size_t))

			       int (*notify_cb)(void *, void __iomem *, size_t))

{

	struct amdxdna_gem_obj *cmdbuf_abo = aie2_cmdlist_get_cmd_buf(job);

	struct mailbox_channel *chann = hwctx->priv->mbox_chann;
@@ -705,7 +705,7 @@ int aie2_cmdlist_multi_execbuf(struct amdxdna_hwctx *hwctx, 


int aie2_cmdlist_single_execbuf(struct amdxdna_hwctx *hwctx,

				struct amdxdna_sched_job *job,

				int (*notify_cb)(void *, const u32 *, size_t))

				int (*notify_cb)(void *, void __iomem *, size_t))

{

	struct amdxdna_gem_obj *cmdbuf_abo = aie2_cmdlist_get_cmd_buf(job);

	struct mailbox_channel *chann = hwctx->priv->mbox_chann;
@@ -740,7 +740,7 @@ int aie2_cmdlist_single_execbuf(struct amdxdna_hwctx *hwctx, 
}



int aie2_sync_bo(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,

		 int (*notify_cb)(void *, const u32 *, size_t))

		 int (*notify_cb)(void *, void __iomem *, size_t))

{

	struct mailbox_channel *chann = hwctx->priv->mbox_chann;

	struct amdxdna_gem_obj *abo = to_xdna_obj(job->bos[0]);

drivers/accel/amdxdna/aie2_pci.h

+5 −5
Original line number Diff line number Diff line
@@ -271,18 +271,18 @@ int aie2_destroy_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwc 
int aie2_map_host_buf(struct amdxdna_dev_hdl *ndev, u32 context_id, u64 addr, u64 size);

int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, u32 size, u32 *cols_filled);

int aie2_register_asyn_event_msg(struct amdxdna_dev_hdl *ndev, dma_addr_t addr, u32 size,

				 void *handle, int (*cb)(void*, const u32 *, size_t));

				 void *handle, int (*cb)(void*, void __iomem *, size_t));

int aie2_config_cu(struct amdxdna_hwctx *hwctx);

int aie2_execbuf(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,

		 int (*notify_cb)(void *, const u32 *, size_t));

		 int (*notify_cb)(void *, void __iomem *, size_t));

int aie2_cmdlist_single_execbuf(struct amdxdna_hwctx *hwctx,

				struct amdxdna_sched_job *job,

				int (*notify_cb)(void *, const u32 *, size_t));

				int (*notify_cb)(void *, void __iomem *, size_t));

int aie2_cmdlist_multi_execbuf(struct amdxdna_hwctx *hwctx,

			       struct amdxdna_sched_job *job,

			       int (*notify_cb)(void *, const u32 *, size_t));

			       int (*notify_cb)(void *, void __iomem *, size_t));

int aie2_sync_bo(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,

		 int (*notify_cb)(void *, const u32 *, size_t));

		 int (*notify_cb)(void *, void __iomem *, size_t));



/* aie2_hwctx.c */

int aie2_hwctx_init(struct amdxdna_hwctx *hwctx);

drivers/accel/amdxdna/amdxdna_mailbox.c

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct mailbox_pkg { 


struct mailbox_msg {

	void			*handle;

	int			(*notify_cb)(void *handle, const u32 *data, size_t size);

	int			(*notify_cb)(void *handle, void __iomem *data, size_t size);

	size_t			pkg_size; /* package size in bytes */

	struct mailbox_pkg	pkg;

};
@@ -243,7 +243,7 @@ mailbox_send_msg(struct mailbox_channel *mb_chann, struct mailbox_msg *mb_msg) 


static int

mailbox_get_resp(struct mailbox_channel *mb_chann, struct xdna_msg_header *header,

		 void *data)

		 void __iomem *data)

{

	struct mailbox_msg *mb_msg;

	int msg_id;
@@ -331,7 +331,7 @@ static int mailbox_get_msg(struct mailbox_channel *mb_chann) 
	memcpy_fromio((u32 *)&header + 1, read_addr, rest);

	read_addr += rest;



	ret = mailbox_get_resp(mb_chann, &header, (u32 *)read_addr);

	ret = mailbox_get_resp(mb_chann, &header, read_addr);



	mailbox_set_headptr(mb_chann, head + msg_size);

	/* After update head, it can equal to ringbuf_size. This is expected. */