Commit df762375 authored by Tomer Tayar's avatar Tomer Tayar Committed by Oded Gabbay
Browse files

habanalabs: Mark queue as expecting CB handle or address 



Jobs on some queues must be provided with a handle to a driver command
buffer object, while for other queues, jobs must be provided with an
address to a command buffer.
Currently the distinction is done based on the queue type, which is less
flexible if the same queue type behaves differently on different
types of ASICs.
This patch adds a new queue property for this target, which is
configured per queue type per ASIC type.

Signed-off-by: default avatarTomer Tayar <ttayar@habana.ai>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent f435614f

drivers/misc/habanalabs/command_submission.c

+3 −1
Original line number Diff line number Diff line
@@ -414,7 +414,9 @@ static struct hl_cb *validate_queue_index(struct hl_device *hdev, 
			"Queue index %d is restricted for the kernel driver\n",

			chunk->queue_index);

		return NULL;

	} else if (hw_queue_prop->type == QUEUE_TYPE_INT) {

	}



	if (!hw_queue_prop->requires_kernel_cb) {

		*ext_queue = false;

		return (struct hl_cb *) (uintptr_t) chunk->cb_handle;

	}

drivers/misc/habanalabs/goya/goya.c

+3 −0
Original line number Diff line number Diff line
@@ -337,17 +337,20 @@ void goya_get_fixed_properties(struct hl_device *hdev) 
	for (i = 0 ; i < NUMBER_OF_EXT_HW_QUEUES ; i++) {

		prop->hw_queues_props[i].type = QUEUE_TYPE_EXT;

		prop->hw_queues_props[i].driver_only = 0;

		prop->hw_queues_props[i].requires_kernel_cb = 1;

	}



	for (; i < NUMBER_OF_EXT_HW_QUEUES + NUMBER_OF_CPU_HW_QUEUES ; i++) {

		prop->hw_queues_props[i].type = QUEUE_TYPE_CPU;

		prop->hw_queues_props[i].driver_only = 1;

		prop->hw_queues_props[i].requires_kernel_cb = 0;

	}



	for (; i < NUMBER_OF_EXT_HW_QUEUES + NUMBER_OF_CPU_HW_QUEUES +

			NUMBER_OF_INT_HW_QUEUES; i++) {

		prop->hw_queues_props[i].type = QUEUE_TYPE_INT;

		prop->hw_queues_props[i].driver_only = 0;

		prop->hw_queues_props[i].requires_kernel_cb = 0;

	}



	for (; i < HL_MAX_QUEUES; i++)

drivers/misc/habanalabs/habanalabs.h

+3 −0
Original line number Diff line number Diff line
@@ -98,10 +98,13 @@ enum hl_queue_type { 
 * @type: queue type.

 * @driver_only: true if only the driver is allowed to send a job to this queue,

 *               false otherwise.

 * @requires_kernel_cb: true if a CB handle must be provided for jobs on this

 *                      queue, false otherwise (a CB address must be provided).

 */

struct hw_queue_properties {

	enum hl_queue_type	type;

	u8			driver_only;

	u8			requires_kernel_cb;

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE