Commit 97583f1d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'misc-habanalabs-fixes-2019-12-14' of... 

Merge tag 'misc-habanalabs-fixes-2019-12-14' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus

Oded writes:

This tag contains the following fixes:

- change dev_err to dev_err_ratelimited in hl_cs_wait_ioctl() as this can
  be called by the user multiple times and can spam the kernel log.

- Eliminate GCC warnings by removing unused variables.

* tag 'misc-habanalabs-fixes-2019-12-14' of git://people.freedesktop.org/~gabbayo/linux:
  habanalabs: remove variable 'val' set but not used
  habanalabs: rate limit error msg on waiting for CS
parents d1eef1c6 68a1fdf2

drivers/misc/habanalabs/command_submission.c

+3 −2
Original line number Diff line number Diff line
@@ -824,7 +824,8 @@ int hl_cs_wait_ioctl(struct hl_fpriv *hpriv, void *data) 
	memset(args, 0, sizeof(*args));



	if (rc < 0) {

		dev_err(hdev->dev, "Error %ld on waiting for CS handle %llu\n",

		dev_err_ratelimited(hdev->dev,

				"Error %ld on waiting for CS handle %llu\n",

				rc, seq);

		if (rc == -ERESTARTSYS) {

			args->out.status = HL_WAIT_CS_STATUS_INTERRUPTED;

drivers/misc/habanalabs/context.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct dma_fence *hl_ctx_get_fence(struct hl_ctx *ctx, u64 seq) 
	spin_lock(&ctx->cs_lock);



	if (seq >= ctx->cs_sequence) {

		dev_notice(hdev->dev,

		dev_notice_ratelimited(hdev->dev,

			"Can't wait on seq %llu because current CS is at seq %llu\n",

			seq, ctx->cs_sequence);

		spin_unlock(&ctx->cs_lock);

drivers/misc/habanalabs/goya/goya.c

+7 −8
Original line number Diff line number Diff line
@@ -2192,7 +2192,7 @@ static int goya_push_linux_to_device(struct hl_device *hdev) 


static int goya_pldm_init_cpu(struct hl_device *hdev)

{

	u32 val, unit_rst_val;

	u32 unit_rst_val;

	int rc;



	/* Must initialize SRAM scrambler before pushing u-boot to SRAM */
@@ -2200,14 +2200,14 @@ static int goya_pldm_init_cpu(struct hl_device *hdev) 


	/* Put ARM cores into reset */

	WREG32(mmCPU_CA53_CFG_ARM_RST_CONTROL, CPU_RESET_ASSERT);

	val = RREG32(mmCPU_CA53_CFG_ARM_RST_CONTROL);

	RREG32(mmCPU_CA53_CFG_ARM_RST_CONTROL);



	/* Reset the CA53 MACRO */

	unit_rst_val = RREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N);

	WREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N, CA53_RESET);

	val = RREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N);

	RREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N);

	WREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N, unit_rst_val);

	val = RREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N);

	RREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N);



	rc = goya_push_uboot_to_device(hdev);

	if (rc)
@@ -2228,7 +2228,7 @@ static int goya_pldm_init_cpu(struct hl_device *hdev) 
	/* Release ARM core 0 from reset */

	WREG32(mmCPU_CA53_CFG_ARM_RST_CONTROL,

					CPU_RESET_CORE0_DEASSERT);

	val = RREG32(mmCPU_CA53_CFG_ARM_RST_CONTROL);

	RREG32(mmCPU_CA53_CFG_ARM_RST_CONTROL);



	return 0;

}
@@ -2502,13 +2502,12 @@ err: 
static int goya_hw_init(struct hl_device *hdev)

{

	struct asic_fixed_properties *prop = &hdev->asic_prop;

	u32 val;

	int rc;



	dev_info(hdev->dev, "Starting initialization of H/W\n");



	/* Perform read from the device to make sure device is up */

	val = RREG32(mmPCIE_DBI_DEVICE_ID_VENDOR_ID_REG);

	RREG32(mmPCIE_DBI_DEVICE_ID_VENDOR_ID_REG);



	/*

	 * Let's mark in the H/W that we have reached this point. We check
@@ -2560,7 +2559,7 @@ static int goya_hw_init(struct hl_device *hdev) 
		goto disable_queues;



	/* Perform read from the device to flush all MSI-X configuration */

	val = RREG32(mmPCIE_DBI_DEVICE_ID_VENDOR_ID_REG);

	RREG32(mmPCIE_DBI_DEVICE_ID_VENDOR_ID_REG);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE