Commit 5aa91007 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes Greg KH:
 "Here are some small char/misc driver fixes for 5.3-rc4.

  Two of these are for the habanalabs driver for issues found when
  running on a big-endian system (are they still alive?) The others are
  tiny fixes reported by people, and a MAINTAINERS update about the
  location of the fpga development tree.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  coresight: Fix DEBUG_LOCKS_WARN_ON for uninitialized attribute
  MAINTAINERS: Move linux-fpga tree to new location
  nvmem: Use the same permissions for eeprom as for nvmem
  habanalabs: fix host memory polling in BE architecture
  habanalabs: fix F/W download in BE architecture
parents 36e630ed 5511c0c3

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6344,7 +6344,7 @@ FPGA MANAGER FRAMEWORK 
M:	Moritz Fischer <mdf@kernel.org>

L:	linux-fpga@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git

Q:	http://patchwork.kernel.org/project/linux-fpga/list/

F:	Documentation/fpga/

F:	Documentation/driver-api/fpga/

drivers/hwtracing/coresight/coresight-etm-perf.c

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ int etm_perf_add_symlink_sink(struct coresight_device *csdev) 
	/* See function coresight_get_sink_by_id() to know where this is used */

	hash = hashlen_hash(hashlen_string(NULL, name));



	sysfs_attr_init(&ea->attr.attr);

	ea->attr.attr.name = devm_kstrdup(dev, name, GFP_KERNEL);

	if (!ea->attr.attr.name)

		return -ENOMEM;

drivers/misc/habanalabs/command_submission.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data) 


		rc = hl_poll_timeout_memory(hdev,

			&ctx->thread_ctx_switch_wait_token, tmp, (tmp == 1),

			100, jiffies_to_usecs(hdev->timeout_jiffies));

			100, jiffies_to_usecs(hdev->timeout_jiffies), false);



		if (rc == -ETIMEDOUT) {

			dev_err(hdev->dev,

drivers/misc/habanalabs/firmware_if.c

+4 −18
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ int hl_fw_push_fw_to_device(struct hl_device *hdev, const char *fw_name, 
{

	const struct firmware *fw;

	const u64 *fw_data;

	size_t fw_size, i;

	size_t fw_size;

	int rc;



	rc = request_firmware(&fw, fw_name, hdev->dev);
@@ -45,22 +45,7 @@ int hl_fw_push_fw_to_device(struct hl_device *hdev, const char *fw_name, 


	fw_data = (const u64 *) fw->data;



	if ((fw->size % 8) != 0)

		fw_size -= 8;



	for (i = 0 ; i < fw_size ; i += 8, fw_data++, dst += 8) {

		if (!(i & (0x80000 - 1))) {

			dev_dbg(hdev->dev,

				"copied so far %zu out of %zu for %s firmware",

				i, fw_size, fw_name);

			usleep_range(20, 100);

		}



		writeq(*fw_data, dst);

	}



	if ((fw->size % 8) != 0)

		writel(*(const u32 *) fw_data, dst);

	memcpy_toio(dst, fw_data, fw_size);



out:

	release_firmware(fw);
@@ -112,7 +97,8 @@ int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg, 
	}



	rc = hl_poll_timeout_memory(hdev, &pkt->fence, tmp,

				(tmp == ARMCP_PACKET_FENCE_VAL), 1000, timeout);

				(tmp == ARMCP_PACKET_FENCE_VAL), 1000,

				timeout, true);



	hl_hw_queue_inc_ci_kernel(hdev, hw_queue_id);

drivers/misc/habanalabs/goya/goya.c

+3 −2
Original line number Diff line number Diff line
@@ -2864,7 +2864,8 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job) 
	}



	rc = hl_poll_timeout_memory(hdev, fence_ptr, tmp,

				(tmp == GOYA_QMAN0_FENCE_VAL), 1000, timeout);

				(tmp == GOYA_QMAN0_FENCE_VAL), 1000,

				timeout, true);



	hl_hw_queue_inc_ci_kernel(hdev, GOYA_QUEUE_ID_DMA_0);
@@ -2945,7 +2946,7 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id) 
	}



	rc = hl_poll_timeout_memory(hdev, fence_ptr, tmp, (tmp == fence_val),

					1000, GOYA_TEST_QUEUE_WAIT_USEC);

					1000, GOYA_TEST_QUEUE_WAIT_USEC, true);



	hl_hw_queue_inc_ci_kernel(hdev, hw_queue_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE