diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-12-02 00:54:52 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-12-02 00:54:52 -0800 |
| commit | 55d4cd3ca27291ade75309ac3cfe28cd7000dc8e (patch) | |
| tree | e9efcff2bba96574bda02fc1f93937fd922a908a | |
| parent | 3dd3e9791220e626d0af4ae24d705ea7385ffb5e (diff) | |
| parent | fd4c96da805bdc2788a99bdf22a7e6417787013c (diff) | |
| download | securemsm-55d4cd3ca27291ade75309ac3cfe28cd7000dc8e.tar.gz | |
Merge fd4c96da805bdc2788a99bdf22a7e6417787013c on remote branch
Change-Id: Ied92d1cb0a057f6f9b69786bc6b8b87aff78c487
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | crypto-qti/qcedev.c | 11 | ||||
| -rw-r--r-- | qseecom/qseecom.c | 2 |
3 files changed, 11 insertions, 6 deletions
@@ -6,7 +6,7 @@ KBUILD_OPTIONS+=SSG_MODULE_ROOT=$(SSG_MODULE_ROOT) all: modules clean: - $(MAKE) -C $(KERNEL_SRC) M=$(M) clean + rm -f *.cmd *.d *.mod *.o *.ko *.mod.c *.mod.o Module.symvers modules.order %: - $(MAKE) -C $(KERNEL_SRC) M=$(M) $(INC) $@ $(KBUILD_OPTIONS)
\ No newline at end of file + $(MAKE) -C $(KERNEL_SRC) M=$(M) $(INC) $@ $(KBUILD_OPTIONS) diff --git a/crypto-qti/qcedev.c b/crypto-qti/qcedev.c index 5c23705..c7ef677 100644 --- a/crypto-qti/qcedev.c +++ b/crypto-qti/qcedev.c @@ -767,6 +767,7 @@ static int submit_req(struct qcedev_async_req *qcedev_areq, bool print_sts = false; struct qcedev_async_req *new_req = NULL; int retries = 0; + int req_wait = MAX_REQUEST_TIME; qcedev_areq->err = 0; podev = handle->cntl; @@ -804,12 +805,16 @@ static int submit_req(struct qcedev_async_req *qcedev_areq, list_add_tail(&qcedev_areq->list, &podev->ready_commands); qcedev_areq->state = QCEDEV_REQ_WAITING; - if (wait_event_interruptible_lock_irq_timeout( + req_wait = wait_event_interruptible_lock_irq_timeout( qcedev_areq->wait_q, (qcedev_areq->state == QCEDEV_REQ_CURRENT), podev->lock, - msecs_to_jiffies(MAX_REQUEST_TIME)) == 0) { - pr_err("%s: request timed out\n", __func__); + msecs_to_jiffies(MAX_REQUEST_TIME)); + if ((req_wait == 0) || (req_wait == -ERESTARTSYS)) { + pr_err("%s: request timed out, req_wait = %d\n", + __func__, req_wait); + list_del(&qcedev_areq->list); + podev->active_command = NULL; spin_unlock_irqrestore(&podev->lock, flags); return qcedev_areq->err; } diff --git a/qseecom/qseecom.c b/qseecom/qseecom.c index 73ccb86..8aac9c8 100644 --- a/qseecom/qseecom.c +++ b/qseecom/qseecom.c @@ -1431,7 +1431,7 @@ static void qseecom_vaddr_unmap(void *vaddr, struct sg_table *sgt, if (!dmabuf || !vaddr || !sgt || !attach) return; - pr_err("SMITA trying to unmap vaddr"); + pr_err("Trying to unmap vaddr"); dma_buf_vunmap(dmabuf, &dmabufmap); dma_buf_end_cpu_access(dmabuf, DMA_BIDIRECTIONAL); qseecom_dmabuf_unmap(sgt, attach, dmabuf); |