From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Nov 2023 00:51:08 +0000 (-1000)
Subject: Merge tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d99b91a99be430be45413052bb428107c435918b;p=linux.git

Merge tag 'char-misc-6.7-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc updates from Greg KH:
 "Here is the big set of char/misc and other small driver subsystem
  changes for 6.7-rc1. Included in here are:

   - IIO subsystem driver updates and additions (largest part of this
     pull request)

   - FPGA subsystem driver updates

   - Counter subsystem driver updates

   - ICC subsystem driver updates

   - extcon subsystem driver updates

   - mei driver updates and additions

   - nvmem subsystem driver updates and additions

   - comedi subsystem dependency fixes

   - parport driver fixups

   - cdx subsystem driver and core updates

   - splice support for /dev/zero and /dev/full

   - other smaller driver cleanups

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

* tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (326 commits)
  cdx: add sysfs for subsystem, class and revision
  cdx: add sysfs for bus reset
  cdx: add support for bus enable and disable
  cdx: Register cdx bus as a device on cdx subsystem
  cdx: Create symbol namespaces for cdx subsystem
  cdx: Introduce lock to protect controller ops
  cdx: Remove cdx controller list from cdx bus system
  dts: ti: k3-am625-beagleplay: Add beaglecc1352
  greybus: Add BeaglePlay Linux Driver
  dt-bindings: net: Add ti,cc1352p7
  dt-bindings: eeprom: at24: allow NVMEM cells based on old syntax
  dt-bindings: nvmem: SID: allow NVMEM cells based on old syntax
  Revert "nvmem: add new config option"
  MAINTAINERS: coresight: Add missing Coresight files
  misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support
  firmware: xilinx: Move EXPORT_SYMBOL_GPL next to zynqmp_pm_feature definition
  uacce: make uacce_class constant
  ocxl: make ocxl_class constant
  cxl: make cxl_class constant
  misc: phantom: make phantom_class constant
  ...
---

d99b91a99be430be45413052bb428107c435918b
diff --cc drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
index 9327701da1b5b,dfc2878426fc2..b00d6c2801593
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
@@@ -21,8 -20,10 +21,10 @@@
  #include "intel_pxp_tee.h"
  #include "intel_pxp_types.h"
  
+ #define PXP_TRANSPORT_TIMEOUT_MS 5000 /* 5 sec */
+ 
  static bool
 -is_fw_err_platform_config(u32 type)
 +is_fw_err_platform_config(struct intel_pxp *pxp, u32 type)
  {
  	switch (type) {
  	case PXP_STATUS_ERROR_API_VERSION:
diff --cc drivers/parport/procfs.c
index 532d5cbbd3448,7aa99c65b934f..bd388560ed592
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@@ -435,18 -435,10 +427,12 @@@ int parport_proc_register(struct parpor
  	t->vars[0].data = &port->spintime;
  	for (i = 0; i < 5; i++) {
  		t->vars[i].extra1 = port;
 +#ifdef CONFIG_PARPORT_1284
  		t->vars[5 + i].extra2 = &port->probe_info[i];
 +#endif /* IEEE 1284 support */
  	}
  
- 	port_name_len = strnlen(port->name, PARPORT_NAME_MAX_LEN);
- 	/*
- 	 * Allocate a buffer for two paths: dev/parport/PORT and dev/parport/PORT/devices.
- 	 * We calculate for the second as that will give us enough for the first.
- 	 */
- 	tmp_path_len = PARPORT_BASE_DEVICES_PATH_SIZE + port_name_len;
- 	tmp_dir_path = kzalloc(tmp_path_len, GFP_KERNEL);
+ 	tmp_dir_path = kasprintf(GFP_KERNEL, "dev/parport/%s/devices", port->name);
  	if (!tmp_dir_path) {
  		err = -ENOMEM;
  		goto exit_free_t;
diff --cc include/linux/cdx/cdx_bus.h
index 8320ec3b9e373,cf9738e3a957c..94ad2c9017c9d
--- a/include/linux/cdx/cdx_bus.h
+++ b/include/linux/cdx/cdx_bus.h
@@@ -27,9 -26,12 +27,13 @@@ enum 
  
  struct cdx_device_config {
  	u8 type;
 +	bool bus_master_enable;
  };
  
+ typedef int (*cdx_bus_enable_cb)(struct cdx_controller *cdx, u8 bus_num);
+ 
+ typedef int (*cdx_bus_disable_cb)(struct cdx_controller *cdx, u8 bus_num);
+ 
  typedef int (*cdx_scan_cb)(struct cdx_controller *cdx);
  
  typedef int (*cdx_dev_configure_cb)(struct cdx_controller *cdx,