Commit 73d513e4 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: Add new interface queues reinit 



Presently the recovery mechanism is using two hfi functions
to destroy and create interface queues. For the purpose of
recovery we don't need to free and allocate the memory used
for interface message queues, that's why we introduce new
function which just reinit the queues.  Also this will give
to the recovery procedure one less reason to fail (if for
some reason we couldn't allocate memory).

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: default avatarFritz Koenig <frkoenig@chromium.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 43e221e4

drivers/media/platform/qcom/venus/core.c

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ static void venus_sys_error_handler(struct work_struct *work) 
	while (core->pmdomains[0] && pm_runtime_active(core->pmdomains[0]))

		usleep_range(1000, 1500);



	hfi_destroy(core);

	ret |= hfi_create(core, &venus_core_ops);

	hfi_reinit(core);



	pm_runtime_get_sync(core->dev);

drivers/media/platform/qcom/venus/hfi.c

+5 −0
Original line number Diff line number Diff line
@@ -517,3 +517,8 @@ void hfi_destroy(struct venus_core *core) 
{

	venus_hfi_destroy(core);

}



void hfi_reinit(struct venus_core *core)

{

	venus_hfi_queues_reinit(core);

}

drivers/media/platform/qcom/venus/hfi.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ struct hfi_ops { 


int hfi_create(struct venus_core *core, const struct hfi_core_ops *ops);

void hfi_destroy(struct venus_core *core);

void hfi_reinit(struct venus_core *core);



int hfi_core_init(struct venus_core *core);

int hfi_core_deinit(struct venus_core *core, bool blocking);

drivers/media/platform/qcom/venus/hfi_venus.c

+51 −0
Original line number Diff line number Diff line
@@ -1603,3 +1603,54 @@ err_kfree: 
	core->ops = NULL;

	return ret;

}



void venus_hfi_queues_reinit(struct venus_core *core)

{

	struct venus_hfi_device *hdev = to_hfi_priv(core);

	struct hfi_queue_table_header *tbl_hdr;

	struct iface_queue *queue;

	struct hfi_sfr *sfr;

	unsigned int i;



	mutex_lock(&hdev->lock);



	for (i = 0; i < IFACEQ_NUM; i++) {

		queue = &hdev->queues[i];

		queue->qhdr =

			IFACEQ_GET_QHDR_START_ADDR(hdev->ifaceq_table.kva, i);



		venus_set_qhdr_defaults(queue->qhdr);



		queue->qhdr->start_addr = queue->qmem.da;



		if (i == IFACEQ_CMD_IDX)

			queue->qhdr->type |= HFI_HOST_TO_CTRL_CMD_Q;

		else if (i == IFACEQ_MSG_IDX)

			queue->qhdr->type |= HFI_CTRL_TO_HOST_MSG_Q;

		else if (i == IFACEQ_DBG_IDX)

			queue->qhdr->type |= HFI_CTRL_TO_HOST_DBG_Q;

	}



	tbl_hdr = hdev->ifaceq_table.kva;

	tbl_hdr->version = 0;

	tbl_hdr->size = IFACEQ_TABLE_SIZE;

	tbl_hdr->qhdr0_offset = sizeof(struct hfi_queue_table_header);

	tbl_hdr->qhdr_size = sizeof(struct hfi_queue_header);

	tbl_hdr->num_q = IFACEQ_NUM;

	tbl_hdr->num_active_q = IFACEQ_NUM;



	/*

	 * Set receive request to zero on debug queue as there is no

	 * need of interrupt from video hardware for debug messages

	 */

	queue = &hdev->queues[IFACEQ_DBG_IDX];

	queue->qhdr->rx_req = 0;



	sfr = hdev->sfr.kva;

	sfr->buf_size = ALIGNED_SFR_SIZE;



	/* ensure table and queue header structs are settled in memory */

	wmb();



	mutex_unlock(&hdev->lock);

}

drivers/media/platform/qcom/venus/hfi_venus.h

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ struct venus_core; 


void venus_hfi_destroy(struct venus_core *core);

int venus_hfi_create(struct venus_core *core);

void venus_hfi_queues_reinit(struct venus_core *core);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE