Commit 6798676f authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: fix etr asid configuration 



Pass the user's context pointer into the etr configuration function
to extract its ASID.

Using the compute_ctx pointer is an error as it is just an indication
of whether a user has opened the compute device.

Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 357ff3dc

drivers/misc/habanalabs/common/context.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void hl_ctx_fini(struct hl_ctx *ctx) 
		 * related to the stopped engines. Hence stop it explicitly.

		 */

		if (hdev->in_debug)

			hl_device_set_debug_mode(hdev, false);

			hl_device_set_debug_mode(hdev, ctx, false);



		hdev->asic_funcs->ctx_fini(ctx);

		hl_cb_va_pool_fini(ctx);

drivers/misc/habanalabs/common/device.c

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ int hl_device_utilization(struct hl_device *hdev, u32 *utilization) 
	return 0;

}



int hl_device_set_debug_mode(struct hl_device *hdev, bool enable)

int hl_device_set_debug_mode(struct hl_device *hdev, struct hl_ctx *ctx, bool enable)

{

	int rc = 0;
@@ -637,7 +637,7 @@ int hl_device_set_debug_mode(struct hl_device *hdev, bool enable) 
		}



		if (!hdev->hard_reset_pending)

			hdev->asic_funcs->halt_coresight(hdev);

			hdev->asic_funcs->halt_coresight(hdev, ctx);



		hdev->in_debug = 0;

drivers/misc/habanalabs/common/habanalabs.h

+3 −3
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ struct hl_asic_funcs { 
	int (*send_heartbeat)(struct hl_device *hdev);

	void (*set_clock_gating)(struct hl_device *hdev);

	void (*disable_clock_gating)(struct hl_device *hdev);

	int (*debug_coresight)(struct hl_device *hdev, void *data);

	int (*debug_coresight)(struct hl_device *hdev, struct hl_ctx *ctx, void *data);

	bool (*is_device_idle)(struct hl_device *hdev, u64 *mask_arr,

					u8 mask_len, struct seq_file *s);

	int (*non_hard_reset_late_init)(struct hl_device *hdev);
@@ -1303,7 +1303,7 @@ struct hl_asic_funcs { 
	int (*init_iatu)(struct hl_device *hdev);

	u32 (*rreg)(struct hl_device *hdev, u32 reg);

	void (*wreg)(struct hl_device *hdev, u32 reg, u32 val);

	void (*halt_coresight)(struct hl_device *hdev);

	void (*halt_coresight)(struct hl_device *hdev, struct hl_ctx *ctx);

	int (*ctx_init)(struct hl_ctx *ctx);

	void (*ctx_fini)(struct hl_ctx *ctx);

	int (*get_clk_rate)(struct hl_device *hdev, u32 *cur_clk, u32 *max_clk);
@@ -2867,7 +2867,7 @@ int hl_device_open_ctrl(struct inode *inode, struct file *filp); 
bool hl_device_operational(struct hl_device *hdev,

		enum hl_device_status *status);

enum hl_device_status hl_device_status(struct hl_device *hdev);

int hl_device_set_debug_mode(struct hl_device *hdev, bool enable);

int hl_device_set_debug_mode(struct hl_device *hdev, struct hl_ctx *ctx, bool enable);

int hl_hw_queues_create(struct hl_device *hdev);

void hl_hw_queues_destroy(struct hl_device *hdev);

int hl_hw_queue_send_cb_no_cmpl(struct hl_device *hdev, u32 hw_queue_id,

drivers/misc/habanalabs/common/habanalabs_ioctl.c

+7 −6
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int hw_idle(struct hl_device *hdev, struct hl_info_args *args) 
		min((size_t) max_size, sizeof(hw_idle))) ? -EFAULT : 0;

}



static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args)

static int debug_coresight(struct hl_device *hdev, struct hl_ctx *ctx, struct hl_debug_args *args)

{

	struct hl_debug_params *params;

	void *input = NULL, *output = NULL;
@@ -200,7 +200,7 @@ static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args) 
		params->output_size = args->output_size;

	}



	rc = hdev->asic_funcs->debug_coresight(hdev, params);

	rc = hdev->asic_funcs->debug_coresight(hdev, ctx, params);

	if (rc) {

		dev_err(hdev->dev,

			"debug coresight operation failed %d\n", rc);
@@ -738,13 +738,14 @@ static int hl_debug_ioctl(struct hl_fpriv *hpriv, void *data) 
				"Rejecting debug configuration request because device not in debug mode\n");

			return -EFAULT;

		}

		args->input_size =

			min(args->input_size, hl_debug_struct_size[args->op]);

		rc = debug_coresight(hdev, args);

		args->input_size = min(args->input_size, hl_debug_struct_size[args->op]);

		rc = debug_coresight(hdev, hpriv->ctx, args);

		break;



	case HL_DEBUG_OP_SET_MODE:

		rc = hl_device_set_debug_mode(hdev, (bool) args->enable);

		rc = hl_device_set_debug_mode(hdev, hpriv->ctx, (bool) args->enable);

		break;



	default:

		dev_err(hdev->dev, "Invalid request %d\n", args->op);

		rc = -ENOTTY;

drivers/misc/habanalabs/gaudi/gaudiP.h

+2 −2
Original line number Diff line number Diff line
@@ -357,8 +357,8 @@ void gaudi_init_security(struct hl_device *hdev); 
void gaudi_ack_protection_bits_errors(struct hl_device *hdev);

void gaudi_add_device_attr(struct hl_device *hdev,

			struct attribute_group *dev_attr_grp);

int gaudi_debug_coresight(struct hl_device *hdev, void *data);

void gaudi_halt_coresight(struct hl_device *hdev);

int gaudi_debug_coresight(struct hl_device *hdev, struct hl_ctx *ctx, void *data);

void gaudi_halt_coresight(struct hl_device *hdev, struct hl_ctx *ctx);

void gaudi_mmu_prepare_reg(struct hl_device *hdev, u64 reg, u32 asid);



#endif /* GAUDIP_H_ */