diff options
Diffstat (limited to 'kernel/common/ethosu_device.c')
-rw-r--r-- | kernel/common/ethosu_device.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/kernel/common/ethosu_device.c b/kernel/common/ethosu_device.c index f1e00ab..c14709e 100644 --- a/kernel/common/ethosu_device.c +++ b/kernel/common/ethosu_device.c @@ -69,12 +69,12 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, { struct ethosu_device *edev = dev_get_drvdata(&rpdev->dev); struct device *dev = &edev->dev; - struct ethosu_mailbox *mbox = &edev->mailbox; - struct ethosu_core_rpmsg *rpmsg = data; + struct ethosu_rpmsg_mailbox *mbox = &edev->mailbox; + struct ethosu_rpmsg *rpmsg = data; int length = len - sizeof(rpmsg->header); int ret = 0; - if (unlikely(rpmsg->header.magic != ETHOSU_CORE_MSG_MAGIC)) { + if (unlikely(rpmsg->header.magic != ETHOSU_RPMSG_MAGIC)) { dev_warn(dev, "Msg: Error invalid message magic. magic=0x%08x", rpmsg->header.magic); @@ -88,7 +88,7 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, rpmsg->header.magic, rpmsg->header.type, rpmsg->header.msg_id); switch (rpmsg->header.type) { - case ETHOSU_CORE_MSG_ERR: + case ETHOSU_RPMSG_ERR: if (length != sizeof(rpmsg->error)) { dev_warn(dev, "Msg: Error message of incorrect size. size=%u, expected=%zu", length, @@ -103,14 +103,14 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, rproc_report_crash(rproc_get_by_child(dev), RPROC_FATAL_ERROR); break; - case ETHOSU_CORE_MSG_PING: + case ETHOSU_RPMSG_PING: dev_dbg(dev, "Msg: Ping"); - ret = ethosu_mailbox_pong(mbox); + ret = ethosu_rpmsg_mailbox_pong(mbox); break; - case ETHOSU_CORE_MSG_PONG: + case ETHOSU_RPMSG_PONG: dev_dbg(dev, "Msg: Pong"); break; - case ETHOSU_CORE_MSG_INFERENCE_RSP: + case ETHOSU_RPMSG_INFERENCE_RSP: if (length != sizeof(rpmsg->inf_rsp)) { dev_warn(dev, "Msg: Inference response of incorrect size. size=%u, expected=%zu", length, @@ -123,10 +123,10 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, "Msg: Inference response. ofm_count=%u, status=%u", rpmsg->inf_rsp.ofm_count, rpmsg->inf_rsp.status); - ethosu_inference_rsp(mbox, rpmsg->header.msg_id, - &rpmsg->inf_rsp); + ethosu_rpmsg_inference_rsp(mbox, rpmsg->header.msg_id, + &rpmsg->inf_rsp); break; - case ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP: + case ETHOSU_RPMSG_CANCEL_INFERENCE_RSP: if (length != sizeof(rpmsg->cancel_rsp)) { dev_warn(dev, "Msg: Cancel Inference response of incorrect size. size=%u, expected=%zu", length, @@ -138,11 +138,11 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, dev_dbg(dev, "Msg: Cancel Inference response. status=%u", rpmsg->cancel_rsp.status); - ethosu_cancel_inference_rsp(mbox, - rpmsg->header.msg_id, - &rpmsg->cancel_rsp); + ethosu_rpmsg_cancel_inference_rsp(mbox, + rpmsg->header.msg_id, + &rpmsg->cancel_rsp); break; - case ETHOSU_CORE_MSG_VERSION_RSP: + case ETHOSU_RPMSG_VERSION_RSP: if (length != sizeof(rpmsg->version_rsp)) { dev_warn(dev, "Msg: Protocol version response of incorrect size. size=%u, expected=%zu", length, @@ -155,10 +155,10 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, rpmsg->version_rsp.major, rpmsg->version_rsp.minor, rpmsg->version_rsp.patch); - ethosu_version_rsp(mbox, rpmsg->header.msg_id, - &rpmsg->version_rsp); + ethosu_rpmsg_version_rsp(mbox, rpmsg->header.msg_id, + &rpmsg->version_rsp); break; - case ETHOSU_CORE_MSG_CAPABILITIES_RSP: + case ETHOSU_RPMSG_CAPABILITIES_RSP: if (length != sizeof(rpmsg->cap_rsp)) { dev_warn(dev, "Msg: Capabilities response of incorrect size. size=%u, expected=%zu", length, @@ -186,7 +186,7 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, ethosu_capability_rsp(mbox, rpmsg->header.msg_id, &rpmsg->cap_rsp); break; - case ETHOSU_CORE_MSG_NETWORK_INFO_RSP: + case ETHOSU_RPMSG_NETWORK_INFO_RSP: if (length != sizeof(rpmsg->net_info_rsp)) { dev_warn(dev, "Msg: Network info response of incorrect size. size=%u, expected=%zu", length, @@ -199,9 +199,9 @@ static int ethosu_handle_rpmsg(struct rpmsg_device *rpdev, "Msg: Network info response. status=%u", rpmsg->net_info_rsp.status); - ethosu_network_info_rsp(mbox, - rpmsg->header.msg_id, - &rpmsg->net_info_rsp); + ethosu_rpmsg_network_info_rsp(mbox, + rpmsg->header.msg_id, + &rpmsg->net_info_rsp); break; default: @@ -271,7 +271,7 @@ static long ethosu_ioctl(struct file *file, dev_dbg(dev, "Device ioctl: Send ping"); - ret = ethosu_mailbox_ping(&edev->mailbox); + ret = ethosu_rpmsg_mailbox_ping(&edev->mailbox); device_unlock(dev); @@ -314,7 +314,7 @@ static long ethosu_ioctl(struct file *file, dev_dbg(dev, "Device ioctl: Network create. type=%u\n", uapi.type); - ret = ethosu_network_create(dev, &edev->mailbox, &uapi); + ret = ethosu_rpmsg_network_create(dev, &edev->mailbox, &uapi); device_unlock(dev); @@ -370,7 +370,7 @@ static void ethosu_dev_release(struct device *dev) clear_bit(MINOR(edev->cdev.dev), minors); - ethosu_mailbox_deinit(&edev->mailbox); + ethosu_rpmsg_mailbox_deinit(&edev->mailbox); device_destroy(edev->class, edev->cdev.dev); kfree(edev); } @@ -481,12 +481,12 @@ int ethosu_dev_init(struct rpmsg_device *rpdev, goto device_unregister; } - ret = ethosu_mailbox_init(&edev->mailbox, dev, edev->ept); + ret = ethosu_rpmsg_mailbox_init(&edev->mailbox, dev, edev->ept); if (ret) goto free_rpmsg_ept; device_lock(dev); - ret = ethosu_version_check_request(dev, &edev->mailbox); + ret = ethosu_rpmsg_version_check_request(dev, &edev->mailbox); device_unlock(dev); if (ret) { dev_err(dev, "Protocol version check failed: %d", ret); @@ -494,8 +494,8 @@ int ethosu_dev_init(struct rpmsg_device *rpdev, } device_lock(dev); - ret = ethosu_capabilities_request(dev, &edev->mailbox, - &edev->capabilities); + ret = ethosu_rpmsg_capabilities_request(dev, &edev->mailbox, + &edev->capabilities); device_unlock(dev); if (ret) { dev_err(dev, "Failed to get device capabilities: %d", ret); @@ -534,7 +534,7 @@ del_cdev: cdev_del(&edev->cdev); deinit_mailbox: - ethosu_mailbox_deinit(&edev->mailbox); + ethosu_rpmsg_mailbox_deinit(&edev->mailbox); free_rpmsg_ept: rpmsg_destroy_ept(edev->ept); @@ -551,7 +551,7 @@ void ethosu_dev_deinit(struct rpmsg_device *rpdev) struct ethosu_device *edev = dev_get_drvdata(dev); device_lock(&edev->dev); - ethosu_mailbox_fail(&edev->mailbox); + ethosu_rpmsg_mailbox_fail(&edev->mailbox); device_unlock(&edev->dev); rpmsg_destroy_ept(edev->ept); |