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

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

Pull char / misc driver fixes from Greg KH:
 "Here are some small fixes for 6.7-rc5 for a variety of small driver
  subsystems. Included in here are:

   - debugfs revert for reported issue

   - greybus revert for reported issue

   - greybus fixup for endian build warning

   - coresight driver fixes

   - nvmem driver fixes

   - devcoredump fix

   - parport new device id

   - ndtest build fix

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

* tag 'char-misc-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  nvmem: Do not expect fixed layouts to grab a layout driver
  parport: Add support for Brainboxes IX/UC/PX parallel cards
  Revert "greybus: gb-beagleplay: Ensure le for values in transport"
  greybus: gb-beagleplay: Ensure le for values in transport
  greybus: BeaglePlay driver needs CRC_CCITT
  Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
  devcoredump: Send uevent once devcd is ready
  ndtest: fix typo class_regster -> class_register
  misc: mei: client.c: fix problem of return '-EOVERFLOW' in mei_cl_write
  misc: mei: client.c: return negative error code in mei_cl_write
  mei: pxp: fix mei_pxp_send_message return value
  coresight: ultrasoc-smb: Fix uninitialized before use buf_hw_base
  coresight: ultrasoc-smb: Config SMB buffer before register sink
  coresight: ultrasoc-smb: Fix sleep while close preempt in enable_smb
  Documentation: coresight: fix `make refcheckdocs` warning
  hwtracing: hisi_ptt: Don't try to attach a task
  hwtracing: hisi_ptt: Handle the interrupt in hardirq context
  hwtracing: hisi_ptt: Add dummy callback pmu::read()
  coresight: Fix crash when Perf and sysfs modes are used concurrently
  coresight: etm4x: Remove bogous __exit annotation for some functions
parents b10a3cca b7c1e537

Documentation/trace/coresight/coresight.rst

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ Misc: 
Device Tree Bindings

--------------------



See Documentation/devicetree/bindings/arm/arm,coresight-\*.yaml for details.

See ``Documentation/devicetree/bindings/arm/arm,coresight-*.yaml`` for details.



As of this writing drivers for ITM, STMs and CTIs are not provided but are

expected to be added as the solution matures.

drivers/base/devcoredump.c

+3 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ void dev_coredumpm(struct device *dev, struct module *owner, 
	devcd->devcd_dev.class = &devcd_class;



	mutex_lock(&devcd->mutex);

	dev_set_uevent_suppress(&devcd->devcd_dev, true);

	if (device_add(&devcd->devcd_dev))

		goto put_device;
@@ -376,6 +377,8 @@ void dev_coredumpm(struct device *dev, struct module *owner, 
		              "devcoredump"))

		dev_warn(dev, "devcoredump create_link failed\n");



	dev_set_uevent_suppress(&devcd->devcd_dev, false);

	kobject_uevent(&devcd->devcd_dev.kobj, KOBJ_ADD);

	INIT_DELAYED_WORK(&devcd->del_wk, devcd_del);

	schedule_delayed_work(&devcd->del_wk, DEVCD_TIMEOUT);

	mutex_unlock(&devcd->mutex);

drivers/greybus/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ if GREYBUS 
config GREYBUS_BEAGLEPLAY

	tristate "Greybus BeaglePlay driver"

	depends on SERIAL_DEV_BUS

	select CRC_CCITT

	help

	  Select this option if you have a BeaglePlay where CC1352

	  co-processor acts as Greybus SVC.

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

+2 −2
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static void etm_event_start(struct perf_event *event, int flags) 
		goto fail_end_stop;



	/* Finally enable the tracer */

	if (coresight_enable_source(csdev, CS_MODE_PERF, event))

	if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF))

		goto fail_disable_path;



	/*
@@ -587,7 +587,7 @@ static void etm_event_stop(struct perf_event *event, int mode) 
		return;



	/* stop tracer */

	coresight_disable_source(csdev, event);

	source_ops(csdev)->disable(csdev, event);



	/* tell the core */

	event->hw.state = PERF_HES_STOPPED;

drivers/hwtracing/coresight/coresight-etm4x-core.c

+3 −3
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ static void clear_etmdrvdata(void *info) 
	per_cpu(delayed_probe, cpu) = NULL;

}



static void __exit etm4_remove_dev(struct etmv4_drvdata *drvdata)

static void etm4_remove_dev(struct etmv4_drvdata *drvdata)

{

	bool had_delayed_probe;

	/*
@@ -2253,7 +2253,7 @@ static void __exit etm4_remove_dev(struct etmv4_drvdata *drvdata) 
	}

}



static void __exit etm4_remove_amba(struct amba_device *adev)

static void etm4_remove_amba(struct amba_device *adev)

{

	struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev);
@@ -2261,7 +2261,7 @@ static void __exit etm4_remove_amba(struct amba_device *adev) 
		etm4_remove_dev(drvdata);

}



static int __exit etm4_remove_platform_dev(struct platform_device *pdev)

static int etm4_remove_platform_dev(struct platform_device *pdev)

{

	struct etmv4_drvdata *drvdata = dev_get_drvdata(&pdev->dev);