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

Merge tag 'driver-core-6.12-rc1' of... 

Merge tag 'driver-core-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here is a small set of patches for the driver core code for 6.12-rc1.

  This set is the one that caused the most delay on my side, due to lots
  of last-minute reports of problems in the async shutdown feature that
  was added. In the end, I've reverted all of the patches in that series
  so we are back to "normal" and the patch set is being reworked for the
  next merge window.

  Other than the async shutdown patches that were reverted, included in
  here are:

   - minor driver core cleanups

   - minor driver core bus and class api cleanups and simplifications
     for some callbacks

   - some const markings of structures

   - other even more minor cleanups

  All of these, including the last minute reverts, have been in
  linux-next, but all of the reports of problems in linux-next were
  before the reverts happened. After the reverts, all is good"

* tag 'driver-core-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (32 commits)
  Revert "driver core: don't always lock parent in shutdown"
  Revert "driver core: separate function to shutdown one device"
  Revert "driver core: shut down devices asynchronously"
  Revert "nvme-pci: Make driver prefer asynchronous shutdown"
  Revert "driver core: fix async device shutdown hang"
  driver core: fix async device shutdown hang
  driver core: attribute_container: Remove unused functions
  driver core: Trivially simplify ((struct device_private *)curr)->device->p to @curr
  devres: Correclty strip percpu address space of devm_free_percpu() argument
  driver core: Make parameter check consistent for API cluster device_(for_each|find)_child()
  bus: fsl-mc: make fsl_mc_bus_type const
  nvme-pci: Make driver prefer asynchronous shutdown
  driver core: shut down devices asynchronously
  driver core: separate function to shutdown one device
  driver core: don't always lock parent in shutdown
  platform: Make platform_bus_type constant
  driver core: class: Check namespace relevant parameters in class_register()
  driver:base:core: Adding a "Return:" line in comment for device_link_add()
  drivers/base: Introduce device_match_t for device finding APIs
  firmware_loader: Block path traversal
  ...
parents cb787f4a eb46cb32

drivers/base/attribute_container.c

+1 −47
Original line number Diff line number Diff line
@@ -346,8 +346,7 @@ attribute_container_device_trigger_safe(struct device *dev, 
 * @fn:   the function to execute for each classdev.

 *

 * This function is for executing a trigger when you need to know both

 * the container and the classdev.  If you only care about the

 * container, then use attribute_container_trigger() instead.

 * the container and the classdev.

 */

void

attribute_container_device_trigger(struct device *dev,
@@ -378,33 +377,6 @@ attribute_container_device_trigger(struct device *dev, 
	mutex_unlock(&attribute_container_mutex);

}



/**

 * attribute_container_trigger - trigger a function for each matching container

 *

 * @dev:  The generic device to activate the trigger for

 * @fn:	  the function to trigger

 *

 * This routine triggers a function that only needs to know the

 * matching containers (not the classdev) associated with a device.

 * It is more lightweight than attribute_container_device_trigger, so

 * should be used in preference unless the triggering function

 * actually needs to know the classdev.

 */

void

attribute_container_trigger(struct device *dev,

			    int (*fn)(struct attribute_container *,

				      struct device *))

{

	struct attribute_container *cont;



	mutex_lock(&attribute_container_mutex);

	list_for_each_entry(cont, &attribute_container_list, node) {

		if (cont->match(cont, dev))

			fn(cont, dev);

	}

	mutex_unlock(&attribute_container_mutex);

}



/**

 * attribute_container_add_attrs - add attributes

 *
@@ -458,24 +430,6 @@ attribute_container_add_class_device(struct device *classdev) 
	return attribute_container_add_attrs(classdev);

}



/**

 * attribute_container_add_class_device_adapter - simple adapter for triggers

 *

 * @cont: the container to register.

 * @dev:  the generic device to activate the trigger for

 * @classdev:	the class device to add

 *

 * This function is identical to attribute_container_add_class_device except

 * that it is designed to be called from the triggers

 */

int

attribute_container_add_class_device_adapter(struct attribute_container *cont,

					     struct device *dev,

					     struct device *classdev)

{

	return attribute_container_add_class_device(classdev);

}



/**

 * attribute_container_remove_attrs - remove any attribute files

 *

drivers/base/auxiliary.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ EXPORT_SYMBOL_GPL(__auxiliary_device_add); 
 */

struct auxiliary_device *auxiliary_find_device(struct device *start,

					       const void *data,

					       int (*match)(struct device *dev, const void *data))

					       device_match_t match)

{

	struct device *dev;

drivers/base/base.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void auxiliary_bus_init(void); 
static inline void auxiliary_bus_init(void) { }

#endif



struct kobject *virtual_device_parent(struct device *dev);

struct kobject *virtual_device_parent(void);



int bus_add_device(struct device *dev);

void bus_probe_device(struct device *dev);

drivers/base/bus.c

+14 −5
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ static ssize_t bus_attr_show(struct kobject *kobj, struct attribute *attr, 
{

	struct bus_attribute *bus_attr = to_bus_attr(attr);

	struct subsys_private *subsys_priv = to_subsys_private(kobj);

	ssize_t ret = 0;

	/* return -EIO for reading a bus attribute without show() */

	ssize_t ret = -EIO;



	if (bus_attr->show)

		ret = bus_attr->show(subsys_priv->bus, buf);
@@ -164,7 +165,8 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr, 
{

	struct bus_attribute *bus_attr = to_bus_attr(attr);

	struct subsys_private *subsys_priv = to_subsys_private(kobj);

	ssize_t ret = 0;

	/* return -EIO for writing a bus attribute without store() */

	ssize_t ret = -EIO;



	if (bus_attr->store)

		ret = bus_attr->store(subsys_priv->bus, buf, count);
@@ -389,7 +391,7 @@ EXPORT_SYMBOL_GPL(bus_for_each_dev); 
 */

struct device *bus_find_device(const struct bus_type *bus,

			       struct device *start, const void *data,

			       int (*match)(struct device *dev, const void *data))

			       device_match_t match)

{

	struct subsys_private *sp = bus_to_subsys(bus);

	struct klist_iter i;
@@ -920,6 +922,8 @@ int bus_register(const struct bus_type *bus) 
	bus_remove_file(bus, &bus_attr_uevent);

bus_uevent_fail:

	kset_unregister(&priv->subsys);

	/* Above kset_unregister() will kfree @priv */

	priv = NULL;

out:

	kfree(priv);

	return retval;
@@ -1294,7 +1298,7 @@ int subsys_virtual_register(const struct bus_type *subsys, 
{

	struct kobject *virtual_dir;



	virtual_dir = virtual_device_parent(NULL);

	virtual_dir = virtual_device_parent();

	if (!virtual_dir)

		return -ENOMEM;
@@ -1385,8 +1389,13 @@ int __init buses_init(void) 
		return -ENOMEM;



	system_kset = kset_create_and_add("system", NULL, &devices_kset->kobj);

	if (!system_kset)

	if (!system_kset) {

		/* Do error handling here as devices_init() do */

		kset_unregister(bus_kset);

		bus_kset = NULL;

		pr_err("%s: failed to create and add kset 'bus'\n", __func__);

		return -ENOMEM;

	}



	return 0;

}

drivers/base/class.c

+12 −2
Original line number Diff line number Diff line
@@ -183,6 +183,17 @@ int class_register(const struct class *cls) 


	pr_debug("device class '%s': registering\n", cls->name);



	if (cls->ns_type && !cls->namespace) {

		pr_err("%s: class '%s' does not have namespace\n",

		       __func__, cls->name);

		return -EINVAL;

	}

	if (!cls->ns_type && cls->namespace) {

		pr_err("%s: class '%s' does not have ns_type\n",

		       __func__, cls->name);

		return -EINVAL;

	}



	cp = kzalloc(sizeof(*cp), GFP_KERNEL);

	if (!cp)

		return -ENOMEM;
@@ -433,8 +444,7 @@ EXPORT_SYMBOL_GPL(class_for_each_device); 
 * code.  There's no locking restriction.

 */

struct device *class_find_device(const struct class *class, const struct device *start,

				 const void *data,

				 int (*match)(struct device *, const void *))

				 const void *data, device_match_t match)

{

	struct subsys_private *sp = class_to_subsys(class);

	struct class_dev_iter iter;