Commit 975f9ce9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.6-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 changes for 5.6-rc1 for the driver core and
  some firmware subsystem changes.

  Included in here are:
   - device.h splitup like you asked for months ago
   - devtmpfs minor cleanups
   - firmware core minor changes
   - debugfs fix for lockdown mode
   - kernfs cleanup fix
   - cpu topology minor fix

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

* tag 'driver-core-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (22 commits)
  firmware: Rename FW_OPT_NOFALLBACK to FW_OPT_NOFALLBACK_SYSFS
  devtmpfs: factor out common tail of devtmpfs_{create,delete}_node
  devtmpfs: initify a bit
  devtmpfs: simplify initialization of mount_dev
  devtmpfs: factor out setup part of devtmpfsd()
  devtmpfs: fix theoretical stale pointer deref in devtmpfsd()
  driver core: platform: fix u32 greater or equal to zero comparison
  cpu-topology: Don't error on more than CONFIG_NR_CPUS CPUs in device tree
  debugfs: Return -EPERM when locked down
  driver core: Print device when resources present in really_probe()
  driver core: Fix test_async_driver_probe if NUMA is disabled
  driver core: platform: Prevent resouce overflow from causing infinite loops
  fs/kernfs/dir.c: Clean code by removing always true condition
  component: do not dereference opaque pointer in debugfs
  drivers/component: remove modular code
  debugfs: Fix warnings when building documentation
  device.h: move 'struct driver' stuff out to device/driver.h
  device.h: move 'struct class' stuff out to device/class.h
  device.h: move 'struct bus' stuff out to device/bus.h
  device.h: move dev_printk()-like functions to dev_printk.h
  ...
parents 7ba31c3f 85db1cde

drivers/base/arch_topology.c

+15 −5
Original line number Diff line number Diff line
@@ -248,6 +248,16 @@ core_initcall(free_raw_capacity); 
#endif



#if defined(CONFIG_ARM64) || defined(CONFIG_RISCV)

/*

 * This function returns the logic cpu number of the node.

 * There are basically three kinds of return values:

 * (1) logic cpu number which is > 0.

 * (2) -ENODEV when the device tree(DT) node is valid and found in the DT but

 * there is no possible logical CPU in the kernel to match. This happens

 * when CONFIG_NR_CPUS is configure to be smaller than the number of

 * CPU nodes in DT. We need to just ignore this case.

 * (3) -1 if the node does not exist in the device tree

 */

static int __init get_cpu_for_node(struct device_node *node)

{

	struct device_node *cpu_node;
@@ -261,7 +271,8 @@ static int __init get_cpu_for_node(struct device_node *node) 
	if (cpu >= 0)

		topology_parse_cpu_capacity(cpu_node, cpu);

	else

		pr_crit("Unable to find CPU node for %pOF\n", cpu_node);

		pr_info("CPU node for %pOF exist but the possible cpu range is :%*pbl\n",

			cpu_node, cpumask_pr_args(cpu_possible_mask));



	of_node_put(cpu_node);

	return cpu;
@@ -286,9 +297,8 @@ static int __init parse_core(struct device_node *core, int package_id, 
				cpu_topology[cpu].package_id = package_id;

				cpu_topology[cpu].core_id = core_id;

				cpu_topology[cpu].thread_id = i;

			} else {

				pr_err("%pOF: Can't get CPU for thread\n",

				       t);

			} else if (cpu != -ENODEV) {

				pr_err("%pOF: Can't get CPU for thread\n", t);

				of_node_put(t);

				return -EINVAL;

			}
@@ -307,7 +317,7 @@ static int __init parse_core(struct device_node *core, int package_id, 


		cpu_topology[cpu].package_id = package_id;

		cpu_topology[cpu].core_id = core_id;

	} else if (leaf) {

	} else if (leaf && cpu != -ENODEV) {

		pr_err("%pOF: Can't get CPU for leaf core\n", core);

		return -EINVAL;

	}

drivers/base/base.h

+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2001-2003 Patrick Mochel <mochel@osdl.org>

 * Copyright (c) 2004-2009 Greg Kroah-Hartman <gregkh@suse.de>

 * Copyright (c) 2008-2012 Novell Inc.

 * Copyright (c) 2012-2019 Greg Kroah-Hartman <gregkh@linuxfoundation.org>

 * Copyright (c) 2012-2019 Linux Foundation

 *

 * Core driver model functions and structures that should not be

 * shared outside of the drivers/base/ directory.

 *

 */

#include <linux/notifier.h>



/**
@@ -175,3 +186,11 @@ extern void device_links_unbind_consumers(struct device *dev); 


/* device pm support */

void device_pm_move_to_tail(struct device *dev);



#ifdef CONFIG_DEVTMPFS

int devtmpfs_create_node(struct device *dev);

int devtmpfs_delete_node(struct device *dev);

#else

static inline int devtmpfs_create_node(struct device *dev) { return 0; }

static inline int devtmpfs_delete_node(struct device *dev) { return 0; }

#endif

drivers/base/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/async.h>

#include <linux/device/bus.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/errno.h>

drivers/base/class.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright (c) 2003-2004 IBM Corp.

 */



#include <linux/device/class.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/init.h>

drivers/base/component.c

+4 −7
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/device.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/debugfs.h>
@@ -102,11 +101,11 @@ static int component_devices_show(struct seq_file *s, void *data) 
	seq_printf(s, "%-40s %20s\n", "device name", "status");

	seq_puts(s, "-------------------------------------------------------------\n");

	for (i = 0; i < match->num; i++) {

		struct device *d = (struct device *)match->compare[i].data;

		struct component *component = match->compare[i].component;



		seq_printf(s, "%-40s %20s\n", dev_name(d),

			   match->compare[i].component ?

			   "registered" : "not registered");

		seq_printf(s, "%-40s %20s\n",

			   component ? dev_name(component->dev) : "(unknown)",

			   component ? (component->bound ? "bound" : "not bound") : "not registered");

	}

	mutex_unlock(&component_mutex);
@@ -775,5 +774,3 @@ void component_del(struct device *dev, const struct component_ops *ops) 
	kfree(component);

}

EXPORT_SYMBOL_GPL(component_del);
 


MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE