Commit 7ac1161c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull driver core / debugfs update from Greg KH:
 "Here is the "big" driver core and debugfs update for 5.12-rc1

  This set of driver core patches caused a bunch of problems in
  linux-next for the past few weeks, when Saravana tried to set
  fw_devlink=on as the default functionality. This caused a number of
  systems to stop booting, and lots of bugs were fixed in this area for
  almost all of the reported systems, but this option is not ready to be
  turned on just yet for the default operation based on this testing, so
  I've reverted that change at the very end so we don't have to worry
  about regressions in 5.12

  We will try to turn this on for 5.13 if testing goes better over the
  next few months.

  Other than the fixes caused by the fw_devlink testing in here, there's
  not much more:

   - debugfs fixes for invalid input into debugfs_lookup()

   - kerneldoc cleanups

   - warn message if platform drivers return an error on their remove
     callback (a futile effort, but good to catch).

  All of these have been in linux-next for a while now, and the
  regressions have gone away with the revert of the fw_devlink change"

* tag 'driver-core-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (35 commits)
  Revert "driver core: Set fw_devlink=on by default"
  of: property: fw_devlink: Ignore interrupts property for some configs
  debugfs: do not attempt to create a new file before the filesystem is initalized
  debugfs: be more robust at handling improper input in debugfs_lookup()
  driver core: auxiliary bus: Fix calling stage for auxiliary bus init
  of: irq: Fix the return value for of_irq_parse_one() stub
  of: irq: make a stub for of_irq_parse_one()
  clk: Mark fwnodes when their clock provider is added/removed
  PM: domains: Mark fwnodes when their powerdomain is added/removed
  irqdomain: Mark fwnodes when their irqdomain is added/removed
  driver core: fw_devlink: Handle suppliers that don't use driver core
  of: property: Add fw_devlink support for optional properties
  driver core: Add fw_devlink.strict kernel param
  of: property: Don't add links to absent suppliers
  driver core: fw_devlink: Detect supplier devices that will never be added
  driver core: platform: Emit a warning if a remove callback returned non-zero
  of: property: Fix fw_devlink handling of interrupts/interrupts-extended
  gpiolib: Don't probe gpio_device if it's not the primary device
  device.h: Remove bogus "the" in kerneldoc
  gpiolib: Bind gpio_device to a driver to enable fw_devlink=on by default
  ...
parents a4dec04c 3e4c982f

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,11 @@ 
				to enforce probe and suspend/resume ordering.

			rpm --	Like "on", but also use to order runtime PM.



	fw_devlink.strict=<bool>

			[KNL] Treat all inferred dependencies as mandatory

			dependencies. This only applies for fw_devlink=on|rpm.

			Format: <bool>



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

drivers/base/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ config HMEM_REPORTING 
	default n

	depends on NUMA

	help

	  Enable reporting for heterogenous memory access attributes under

	  Enable reporting for heterogeneous memory access attributes under

	  their non-uniform memory nodes.



source "drivers/base/test/Kconfig"

drivers/base/auxiliary.c

+3 −10
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/string.h>

#include <linux/auxiliary_bus.h>

#include "base.h"



static const struct auxiliary_device_id *auxiliary_match_id(const struct auxiliary_device_id *id,

							    const struct auxiliary_device *auxdev)
@@ -260,19 +261,11 @@ void auxiliary_driver_unregister(struct auxiliary_driver *auxdrv) 
}

EXPORT_SYMBOL_GPL(auxiliary_driver_unregister);



static int __init auxiliary_bus_init(void)

void __init auxiliary_bus_init(void)

{

	return bus_register(&auxiliary_bus_type);

	WARN_ON(bus_register(&auxiliary_bus_type));

}



static void __exit auxiliary_bus_exit(void)

{

	bus_unregister(&auxiliary_bus_type);

}



module_init(auxiliary_bus_init);

module_exit(auxiliary_bus_exit);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Auxiliary Bus");

MODULE_AUTHOR("David Ertman <david.m.ertman@intel.com>");

drivers/base/base.h

+5 −0
Original line number Diff line number Diff line
@@ -119,6 +119,11 @@ static inline int hypervisor_init(void) { return 0; } 
extern int platform_bus_init(void);

extern void cpu_dev_init(void);

extern void container_dev_init(void);

#ifdef CONFIG_AUXILIARY_BUS

extern void auxiliary_bus_init(void);

#else

static inline void auxiliary_bus_init(void) { }

#endif



struct kobject *virtual_device_parent(struct device *dev);

drivers/base/bus.c

+1 −18
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ int bus_add_driver(struct device_driver *drv) 
	error = driver_add_groups(drv, bus->drv_groups);

	if (error) {

		/* How the hell do we get out of this pickle? Give up */

		printk(KERN_ERR "%s: driver_create_groups(%s) failed\n",

		printk(KERN_ERR "%s: driver_add_groups(%s) failed\n",

			__func__, drv->name);

	}
@@ -729,23 +729,6 @@ int device_reprobe(struct device *dev) 
}

EXPORT_SYMBOL_GPL(device_reprobe);



/**

 * find_bus - locate bus by name.

 * @name: name of bus.

 *

 * Call kset_find_obj() to iterate over list of buses to

 * find a bus by name. Return bus if found.

 *

 * Note that kset_find_obj increments bus' reference count.

 */

#if 0

struct bus_type *find_bus(char *name)

{

	struct kobject *k = kset_find_obj(bus_kset, name);

	return k ? to_bus(k) : NULL;

}

#endif  /*  0  */



static int bus_add_groups(struct bus_type *bus,

			  const struct attribute_group **groups)

{