Commit 3de2a3e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver fixes from Greg KH:
 "Here are a number of late-arrival driver fixes for issues reported for
  some char/misc drivers for 5.4-rc7

  These all come from the different subsystem/driver maintainers as
  things that they had reports for and wanted to see fixed.

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

* tag 'char-misc-5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  intel_th: pci: Add Jasper Lake PCH support
  intel_th: pci: Add Comet Lake PCH support
  intel_th: msu: Fix possible memory leak in mode_store()
  intel_th: msu: Fix overflow in shift of an unsigned int
  intel_th: msu: Fix missing allocation failure check on a kstrndup
  intel_th: msu: Fix an uninitialized mutex
  intel_th: gth: Fix the window switching sequence
  soundwire: slave: fix scanf format
  soundwire: intel: fix intel_register_dai PDI offsets and numbers
  interconnect: Add locking in icc_set_tag()
  interconnect: qcom: Fix icc_onecell_data allocation
  soundwire: depend on ACPI || OF
  soundwire: depend on ACPI
  thunderbolt: Drop unnecessary read when writing LC command in Ice Lake
  thunderbolt: Fix lockdep circular locking depedency warning
  thunderbolt: Read DP IN adapter first two dwords in one go
parents a5871fcb 9d55499d

drivers/hwtracing/intel_th/gth.c

+3 −0
Original line number Diff line number Diff line
@@ -626,6 +626,9 @@ static void intel_th_gth_switch(struct intel_th_device *thdev, 
	if (!count)

		dev_dbg(&thdev->dev, "timeout waiting for CTS Trigger\n");



	/* De-assert the trigger */

	iowrite32(0, gth->base + REG_CTS_CTL);



	intel_th_gth_stop(gth, output, false);

	intel_th_gth_start(gth, output);

}

drivers/hwtracing/intel_th/msu.c

+8 −3
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ struct msc { 
};



static LIST_HEAD(msu_buffer_list);

static struct mutex msu_buffer_mutex;

static DEFINE_MUTEX(msu_buffer_mutex);



/**

 * struct msu_buffer_entry - internal MSU buffer bookkeeping
@@ -327,7 +327,7 @@ static size_t msc_win_total_sz(struct msc_window *win) 
		struct msc_block_desc *bdesc = sg_virt(sg);



		if (msc_block_wrapped(bdesc))

			return win->nr_blocks << PAGE_SHIFT;

			return (size_t)win->nr_blocks << PAGE_SHIFT;



		size += msc_total_sz(bdesc);

		if (msc_block_last_written(bdesc))
@@ -1848,9 +1848,14 @@ mode_store(struct device *dev, struct device_attribute *attr, const char *buf, 
		len = cp - buf;



	mode = kstrndup(buf, len, GFP_KERNEL);

	if (!mode)

		return -ENOMEM;



	i = match_string(msc_mode, ARRAY_SIZE(msc_mode), mode);

	if (i >= 0)

	if (i >= 0) {

		kfree(mode);

		goto found;

	}



	/* Buffer sinks only work with a usable IRQ */

	if (!msc->do_irq) {

drivers/hwtracing/intel_th/pci.c

+10 −0
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { 
		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x02a6),

		.driver_data = (kernel_ulong_t)&intel_th_2x,

	},

	{

		/* Comet Lake PCH */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x06a6),

		.driver_data = (kernel_ulong_t)&intel_th_2x,

	},

	{

		/* Ice Lake NNPI */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5),
@@ -209,6 +214,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { 
		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6),

		.driver_data = (kernel_ulong_t)&intel_th_2x,

	},

	{

		/* Jasper Lake PCH */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4da6),

		.driver_data = (kernel_ulong_t)&intel_th_2x,

	},

	{ 0 },

};

drivers/interconnect/core.c

+4 −0
Original line number Diff line number Diff line
@@ -405,8 +405,12 @@ void icc_set_tag(struct icc_path *path, u32 tag) 
	if (!path)

		return;



	mutex_lock(&icc_lock);



	for (i = 0; i < path->num_nodes; i++)

		path->reqs[i].tag = tag;



	mutex_unlock(&icc_lock);

}

EXPORT_SYMBOL_GPL(icc_set_tag);

drivers/interconnect/qcom/qcs404.c

+2 −1
Original line number Diff line number Diff line
@@ -433,7 +433,8 @@ static int qnoc_probe(struct platform_device *pdev) 
	if (!qp)

		return -ENOMEM;



	data = devm_kcalloc(dev, num_nodes, sizeof(*node), GFP_KERNEL);

	data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes),

			    GFP_KERNEL);

	if (!data)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE