Commit fc3ebc3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc fixes from Greg KH:
 "Some tiny char/misc driver fixes for 5.8-rc3.

  The "largest" changes are in the mei driver, to resolve some reported
  problems and add some new device ids. There's also a binder bugfix, an
  fpga driver build fix, and some assorted habanalabs fixes.

  All of these, except for the habanalabs fixes, have been in linux-next
  with no reported issues. The habanalabs driver changes showed up in my
  tree on Friday, but as they are totally self-contained, all should be
  good there"

* tag 'char-misc-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  habanalabs: increase h/w timer when checking idle
  habanalabs: Correct handling when failing to enqueue CB
  habanalabs: increase GAUDI QMAN ARB WDT timeout
  habanalabs: rename mmu_write() to mmu_asid_va_write()
  habanalabs: use PI in MMU cache invalidation
  habanalabs: block scalar load_and_exe on external queue
  mei: me: add tiger lake point device ids for H platforms.
  mei: me: disable mei interface on Mehlow server platforms
  binder: fix null deref of proc->context
  fpga: zynqmp: fix modular build
parents 42f8f9bc 70b23b87

drivers/android/binder.c

+7 −7
Original line number Diff line number Diff line
@@ -4686,8 +4686,15 @@ static struct binder_thread *binder_get_thread(struct binder_proc *proc) 


static void binder_free_proc(struct binder_proc *proc)

{

	struct binder_device *device;



	BUG_ON(!list_empty(&proc->todo));

	BUG_ON(!list_empty(&proc->delivered_death));

	device = container_of(proc->context, struct binder_device, context);

	if (refcount_dec_and_test(&device->ref)) {

		kfree(proc->context->name);

		kfree(device);

	}

	binder_alloc_deferred_release(&proc->alloc);

	put_task_struct(proc->tsk);

	binder_stats_deleted(BINDER_STAT_PROC);
@@ -5406,7 +5413,6 @@ static int binder_node_release(struct binder_node *node, int refs) 
static void binder_deferred_release(struct binder_proc *proc)

{

	struct binder_context *context = proc->context;

	struct binder_device *device;

	struct rb_node *n;

	int threads, nodes, incoming_refs, outgoing_refs, active_transactions;
@@ -5423,12 +5429,6 @@ static void binder_deferred_release(struct binder_proc *proc) 
		context->binder_context_mgr_node = NULL;

	}

	mutex_unlock(&context->context_mgr_node_lock);

	device = container_of(proc->context, struct binder_device, context);

	if (refcount_dec_and_test(&device->ref)) {

		kfree(context->name);

		kfree(device);

	}

	proc->context = NULL;

	binder_inner_proc_lock(proc);

	/*

	 * Make sure proc stays alive after we

drivers/fpga/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ config FPGA_DFL_PCI 


config FPGA_MGR_ZYNQMP_FPGA

	tristate "Xilinx ZynqMP FPGA"

	depends on ARCH_ZYNQMP || COMPILE_TEST

	depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST)

	help

	  FPGA manager driver support for Xilinx ZynqMP FPGAs.

	  This driver uses the processor configuration port(PCAP)

drivers/misc/habanalabs/command_submission.c

+13 −0
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ static void hl_fence_release(struct dma_fence *fence) 
		container_of(fence, struct hl_cs_compl, base_fence);

	struct hl_device *hdev = hl_cs_cmpl->hdev;



	/* EBUSY means the CS was never submitted and hence we don't have

	 * an attached hw_sob object that we should handle here

	 */

	if (fence->error == -EBUSY)

		goto free;



	if ((hl_cs_cmpl->type == CS_TYPE_SIGNAL) ||

			(hl_cs_cmpl->type == CS_TYPE_WAIT)) {
@@ -92,6 +98,7 @@ static void hl_fence_release(struct dma_fence *fence) 
		kref_put(&hl_cs_cmpl->hw_sob->kref, hl_sob_reset);

	}



free:

	kfree_rcu(hl_cs_cmpl, base_fence.rcu);

}
@@ -328,10 +335,16 @@ static void cs_do_release(struct kref *ref) 


	hl_ctx_put(cs->ctx);



	/* We need to mark an error for not submitted because in that case

	 * the dma fence release flow is different. Mainly, we don't need

	 * to handle hw_sob for signal/wait

	 */

	if (cs->timedout)

		dma_fence_set_error(cs->fence, -ETIMEDOUT);

	else if (cs->aborted)

		dma_fence_set_error(cs->fence, -EIO);

	else if (!cs->submitted)

		dma_fence_set_error(cs->fence, -EBUSY);



	dma_fence_signal(cs->fence);

	dma_fence_put(cs->fence);

drivers/misc/habanalabs/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ out: 
	return 0;

}



static ssize_t mmu_write(struct file *file, const char __user *buf,

static ssize_t mmu_asid_va_write(struct file *file, const char __user *buf,

		size_t count, loff_t *f_pos)

{

	struct seq_file *s = file->private_data;
@@ -1125,7 +1125,7 @@ static const struct hl_info_list hl_debugfs_list[] = { 
	{"command_submission_jobs", command_submission_jobs_show, NULL},

	{"userptr", userptr_show, NULL},

	{"vm", vm_show, NULL},

	{"mmu", mmu_show, mmu_write},

	{"mmu", mmu_show, mmu_asid_va_write},

	{"engines", engines_show, NULL}

};

drivers/misc/habanalabs/gaudi/gaudi.c

+35 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 


#define GAUDI_NUM_OF_QM_ARB_ERR_CAUSE	3



#define GAUDI_ARB_WDT_TIMEOUT		0x400000

#define GAUDI_ARB_WDT_TIMEOUT		0x1000000



static const char gaudi_irq_name[GAUDI_MSI_ENTRIES][GAUDI_MAX_STRING_LEN] = {

		"gaudi cq 0_0", "gaudi cq 0_1", "gaudi cq 0_2", "gaudi cq 0_3",
@@ -1893,6 +1893,8 @@ static void gaudi_init_pci_dma_qman(struct hl_device *hdev, int dma_id, 
	WREG32(mmDMA0_QM_CP_MSG_BASE3_ADDR_LO_0 + q_off, so_base_ws_lo);

	WREG32(mmDMA0_QM_CP_MSG_BASE3_ADDR_HI_0 + q_off, so_base_ws_hi);



	WREG32(mmDMA0_QM_CP_BARRIER_CFG_0 + q_off, 0x100);



	/* The following configuration is needed only once per QMAN */

	if (qman_id == 0) {

		/* Configure RAZWI IRQ */
@@ -2725,6 +2727,12 @@ static int gaudi_mmu_init(struct hl_device *hdev) 
	WREG32(mmSTLB_HOP_CONFIGURATION,

			hdev->mmu_huge_page_opt ? 0x30440 : 0x40440);



	/*

	 * The H/W expects the first PI after init to be 1. After wraparound

	 * we'll write 0.

	 */

	gaudi->mmu_cache_inv_pi = 1;



	gaudi->hw_cap_initialized |= HW_CAP_MMU;



	return 0;
@@ -3790,6 +3798,25 @@ static int gaudi_validate_dma_pkt_no_mmu(struct hl_device *hdev, 
						src_in_host);

}



static int gaudi_validate_load_and_exe_pkt(struct hl_device *hdev,

					struct hl_cs_parser *parser,

					struct packet_load_and_exe *user_pkt)

{

	u32 cfg;



	cfg = le32_to_cpu(user_pkt->cfg);



	if (cfg & GAUDI_PKT_LOAD_AND_EXE_CFG_DST_MASK) {

		dev_err(hdev->dev,

			"User not allowed to use Load and Execute\n");

		return -EPERM;

	}



	parser->patched_cb_size += sizeof(struct packet_load_and_exe);



	return 0;

}



static int gaudi_validate_cb(struct hl_device *hdev,

			struct hl_cs_parser *parser, bool is_mmu)

{
@@ -3838,6 +3865,11 @@ static int gaudi_validate_cb(struct hl_device *hdev, 
			rc = -EPERM;

			break;



		case PACKET_LOAD_AND_EXE:

			rc = gaudi_validate_load_and_exe_pkt(hdev, parser,

				(struct packet_load_and_exe *) user_pkt);

			break;



		case PACKET_LIN_DMA:

			parser->contains_dma_pkt = true;

			if (is_mmu)
@@ -3855,7 +3887,6 @@ static int gaudi_validate_cb(struct hl_device *hdev, 
		case PACKET_FENCE:

		case PACKET_NOP:

		case PACKET_ARB_POINT:

		case PACKET_LOAD_AND_EXE:

			parser->patched_cb_size += pkt_size;

			break;
@@ -5994,6 +6025,8 @@ static int gaudi_mmu_invalidate_cache(struct hl_device *hdev, bool is_hard, 
	mutex_lock(&hdev->mmu_cache_lock);



	/* L0 & L1 invalidation */

	WREG32(mmSTLB_INV_PS, 3);

	WREG32(mmSTLB_CACHE_INV, gaudi->mmu_cache_inv_pi++);

	WREG32(mmSTLB_INV_PS, 2);



	rc = hl_poll_timeout(

CRA Git | Maintained and supported by SUSTech CRA and CCSE