2005-03-21 11:52:54 -07:00
|
|
|
/*
|
2008-01-24 23:50:12 -07:00
|
|
|
* drivers/base/dd.c - The core device/driver interactions.
|
2005-03-21 11:52:54 -07:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* This file contains the (sometimes tricky) code that controls the
|
|
|
|
* interactions between devices and drivers, which primarily includes
|
|
|
|
* driver binding and unbinding.
|
2005-03-21 11:52:54 -07:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* All of this code used to exist in drivers/base/bus.c, but was
|
|
|
|
* relocated to here in the name of compartmentalization (since it wasn't
|
|
|
|
* strictly code just for the 'struct bus_type'.
|
2005-03-21 11:52:54 -07:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Copyright (c) 2002-5 Patrick Mochel
|
|
|
|
* Copyright (c) 2002-3 Open Source Development Labs
|
2009-05-11 15:16:57 -06:00
|
|
|
* Copyright (c) 2007-2009 Greg Kroah-Hartman <gregkh@suse.de>
|
|
|
|
* Copyright (c) 2007-2009 Novell Inc.
|
2005-03-21 11:52:54 -07:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* This file is released under the GPLv2
|
2005-03-21 11:52:54 -07:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/device.h>
|
2009-02-13 17:59:06 -07:00
|
|
|
#include <linux/delay.h>
|
2005-03-21 11:52:54 -07:00
|
|
|
#include <linux/module.h>
|
2006-07-18 11:59:59 -06:00
|
|
|
#include <linux/kthread.h>
|
2006-10-27 12:42:37 -06:00
|
|
|
#include <linux/wait.h>
|
2009-02-13 17:59:06 -07:00
|
|
|
#include <linux/async.h>
|
2009-08-18 15:38:32 -06:00
|
|
|
#include <linux/pm_runtime.h>
|
drivers/pinctrl: grab default handles from device core
This makes the device core auto-grab the pinctrl handle and set
the "default" (PINCTRL_STATE_DEFAULT) state for every device
that is present in the device model right before probe. This will
account for the lion's share of embedded silicon devcies.
A modification of the semantics for pinctrl_get() is also done:
previously if the pinctrl handle for a certain device was already
taken, the pinctrl core would return an error. Now, since the
core may have already default-grabbed the handle and set its
state to "default", if the handle was already taken, this will
be disregarded and the located, previously instanitated handle
will be returned to the caller.
This way all code in drivers explicitly requesting their pinctrl
handlers will still be functional, and drivers that want to
explicitly retrieve and switch their handles can still do that.
But if the desired functionality is just boilerplate of this
type in the probe() function:
struct pinctrl *p;
p = devm_pinctrl_get_select_default(&dev);
if (IS_ERR(p)) {
if (PTR_ERR(p) == -EPROBE_DEFER)
return -EPROBE_DEFER;
dev_warn(&dev, "no pinctrl handle\n");
}
The discussion began with the addition of such boilerplate
to the omap4 keypad driver:
http://marc.info/?l=linux-input&m=135091157719300&w=2
A previous approach using notifiers was discussed:
http://marc.info/?l=linux-kernel&m=135263661110528&w=2
This failed because it could not handle deferred probes.
This patch alone does not solve the entire dilemma faced:
whether code should be distributed into the drivers or
if it should be centralized to e.g. a PM domain. But it
solves the immediate issue of the addition of boilerplate
to a lot of drivers that just want to grab the default
state. As mentioned, they can later explicitly retrieve
the handle and set different states, and this could as
well be done by e.g. PM domains as it is only related
to a certain struct device * pointer.
ChangeLog v4->v5 (Stephen):
- Simplified the devicecore grab code.
- Deleted a piece of documentation recommending that pins
be mapped to a device rather than hogged.
ChangeLog v3->v4 (Linus):
- Drop overzealous NULL checks.
- Move kref initialization to pinctrl_create().
- Seeking Tested-by from Stephen Warren so we do not disturb
the Tegra platform.
- Seeking ACK on this from Greg (and others who like it) so I
can merge it through the pinctrl subsystem.
ChangeLog v2->v3 (Linus):
- Abstain from using IS_ERR_OR_NULL() in the driver core,
Russell recently sent a patch to remove it. Handle the
NULL case explicitly even though it's a bogus case.
- Make sure we handle probe deferral correctly in the device
core file. devm_kfree() the container on error so we don't
waste memory for devices without pinctrl handles.
- Introduce reference counting into the pinctrl core using
<linux/kref.h> so that we don't release pinctrl handles
that have been obtained for two or more places.
ChangeLog v1->v2 (Linus):
- Only store a pointer in the device struct, and only allocate
this if it's really used by the device.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Mitch Bradley <wmb@firmworks.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Rickard Andersson <rickard.andersson@stericsson.com>
Cc: Russell King <linux@arm.linux.org.uk>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[swarren: fixed and simplified error-handling in pinctrl_bind_pins(), to
correctly handle deferred probe. Removed admonition from docs not to use
pinctrl hogs for devices]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-01-22 10:56:14 -07:00
|
|
|
#include <linux/pinctrl/devinfo.h>
|
2005-03-21 11:52:54 -07:00
|
|
|
|
|
|
|
#include "base.h"
|
|
|
|
#include "power/power.h"
|
|
|
|
|
2012-03-05 08:47:41 -07:00
|
|
|
/*
|
|
|
|
* Deferred Probe infrastructure.
|
|
|
|
*
|
|
|
|
* Sometimes driver probe order matters, but the kernel doesn't always have
|
|
|
|
* dependency information which means some drivers will get probed before a
|
|
|
|
* resource it depends on is available. For example, an SDHCI driver may
|
|
|
|
* first need a GPIO line from an i2c GPIO controller before it can be
|
|
|
|
* initialized. If a required resource is not available yet, a driver can
|
|
|
|
* request probing to be deferred by returning -EPROBE_DEFER from its probe hook
|
|
|
|
*
|
|
|
|
* Deferred probe maintains two lists of devices, a pending list and an active
|
|
|
|
* list. A driver returning -EPROBE_DEFER causes the device to be added to the
|
|
|
|
* pending list. A successful driver probe will trigger moving all devices
|
|
|
|
* from the pending to the active list so that the workqueue will eventually
|
|
|
|
* retry them.
|
|
|
|
*
|
|
|
|
* The deferred_probe_mutex must be held any time the deferred_probe_*_list
|
2012-03-08 13:17:22 -07:00
|
|
|
* of the (struct device*)->p->deferred_probe pointers are manipulated
|
2012-03-05 08:47:41 -07:00
|
|
|
*/
|
|
|
|
static DEFINE_MUTEX(deferred_probe_mutex);
|
|
|
|
static LIST_HEAD(deferred_probe_pending_list);
|
|
|
|
static LIST_HEAD(deferred_probe_active_list);
|
|
|
|
static struct workqueue_struct *deferred_wq;
|
2014-04-29 05:05:22 -06:00
|
|
|
static atomic_t deferred_trigger_count = ATOMIC_INIT(0);
|
2012-03-05 08:47:41 -07:00
|
|
|
|
2014-08-08 07:56:36 -06:00
|
|
|
/*
|
2012-03-05 08:47:41 -07:00
|
|
|
* deferred_probe_work_func() - Retry probing devices in the active list.
|
|
|
|
*/
|
|
|
|
static void deferred_probe_work_func(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct device *dev;
|
2012-03-08 13:17:22 -07:00
|
|
|
struct device_private *private;
|
2012-03-05 08:47:41 -07:00
|
|
|
/*
|
|
|
|
* This block processes every device in the deferred 'active' list.
|
|
|
|
* Each device is removed from the active list and passed to
|
|
|
|
* bus_probe_device() to re-attempt the probe. The loop continues
|
|
|
|
* until every device in the active list is removed and retried.
|
|
|
|
*
|
|
|
|
* Note: Once the device is removed from the list and the mutex is
|
|
|
|
* released, it is possible for the device get freed by another thread
|
|
|
|
* and cause a illegal pointer dereference. This code uses
|
|
|
|
* get/put_device() to ensure the device structure cannot disappear
|
|
|
|
* from under our feet.
|
|
|
|
*/
|
|
|
|
mutex_lock(&deferred_probe_mutex);
|
|
|
|
while (!list_empty(&deferred_probe_active_list)) {
|
2012-03-08 13:17:22 -07:00
|
|
|
private = list_first_entry(&deferred_probe_active_list,
|
|
|
|
typeof(*dev->p), deferred_probe);
|
|
|
|
dev = private->device;
|
|
|
|
list_del_init(&private->deferred_probe);
|
2012-03-05 08:47:41 -07:00
|
|
|
|
|
|
|
get_device(dev);
|
|
|
|
|
2012-03-08 13:20:37 -07:00
|
|
|
/*
|
|
|
|
* Drop the mutex while probing each device; the probe path may
|
|
|
|
* manipulate the deferred list
|
|
|
|
*/
|
2012-03-05 08:47:41 -07:00
|
|
|
mutex_unlock(&deferred_probe_mutex);
|
2012-07-05 07:04:44 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Force the device to the end of the dpm_list since
|
|
|
|
* the PM code assumes that the order we add things to
|
|
|
|
* the list is a good order for suspend but deferred
|
|
|
|
* probe makes that very unsafe.
|
|
|
|
*/
|
|
|
|
device_pm_lock();
|
|
|
|
device_pm_move_last(dev);
|
|
|
|
device_pm_unlock();
|
|
|
|
|
2012-03-05 08:47:41 -07:00
|
|
|
dev_dbg(dev, "Retrying from deferred list\n");
|
|
|
|
bus_probe_device(dev);
|
2012-07-05 07:04:44 -06:00
|
|
|
|
2012-03-05 08:47:41 -07:00
|
|
|
mutex_lock(&deferred_probe_mutex);
|
|
|
|
|
|
|
|
put_device(dev);
|
|
|
|
}
|
|
|
|
mutex_unlock(&deferred_probe_mutex);
|
|
|
|
}
|
|
|
|
static DECLARE_WORK(deferred_probe_work, deferred_probe_work_func);
|
|
|
|
|
|
|
|
static void driver_deferred_probe_add(struct device *dev)
|
|
|
|
{
|
|
|
|
mutex_lock(&deferred_probe_mutex);
|
2012-03-08 13:17:22 -07:00
|
|
|
if (list_empty(&dev->p->deferred_probe)) {
|
2012-03-05 08:47:41 -07:00
|
|
|
dev_dbg(dev, "Added to deferred list\n");
|
2012-05-29 19:46:06 -06:00
|
|
|
list_add_tail(&dev->p->deferred_probe, &deferred_probe_pending_list);
|
2012-03-05 08:47:41 -07:00
|
|
|
}
|
|
|
|
mutex_unlock(&deferred_probe_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
void driver_deferred_probe_del(struct device *dev)
|
|
|
|
{
|
|
|
|
mutex_lock(&deferred_probe_mutex);
|
2012-03-08 13:17:22 -07:00
|
|
|
if (!list_empty(&dev->p->deferred_probe)) {
|
2012-03-05 08:47:41 -07:00
|
|
|
dev_dbg(dev, "Removed from deferred list\n");
|
2012-03-08 13:17:22 -07:00
|
|
|
list_del_init(&dev->p->deferred_probe);
|
2012-03-05 08:47:41 -07:00
|
|
|
}
|
|
|
|
mutex_unlock(&deferred_probe_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool driver_deferred_probe_enable = false;
|
|
|
|
/**
|
|
|
|
* driver_deferred_probe_trigger() - Kick off re-probing deferred devices
|
|
|
|
*
|
|
|
|
* This functions moves all devices from the pending list to the active
|
|
|
|
* list and schedules the deferred probe workqueue to process them. It
|
|
|
|
* should be called anytime a driver is successfully bound to a device.
|
2014-04-29 05:05:22 -06:00
|
|
|
*
|
|
|
|
* Note, there is a race condition in multi-threaded probe. In the case where
|
|
|
|
* more than one device is probing at the same time, it is possible for one
|
|
|
|
* probe to complete successfully while another is about to defer. If the second
|
|
|
|
* depends on the first, then it will get put on the pending list after the
|
|
|
|
* trigger event has already occured and will be stuck there.
|
|
|
|
*
|
|
|
|
* The atomic 'deferred_trigger_count' is used to determine if a successful
|
|
|
|
* trigger has occurred in the midst of probing a driver. If the trigger count
|
|
|
|
* changes in the midst of a probe, then deferred processing should be triggered
|
|
|
|
* again.
|
2012-03-05 08:47:41 -07:00
|
|
|
*/
|
|
|
|
static void driver_deferred_probe_trigger(void)
|
|
|
|
{
|
|
|
|
if (!driver_deferred_probe_enable)
|
|
|
|
return;
|
|
|
|
|
2012-03-08 13:20:37 -07:00
|
|
|
/*
|
|
|
|
* A successful probe means that all the devices in the pending list
|
2012-03-05 08:47:41 -07:00
|
|
|
* should be triggered to be reprobed. Move all the deferred devices
|
2012-03-08 13:20:37 -07:00
|
|
|
* into the active list so they can be retried by the workqueue
|
|
|
|
*/
|
2012-03-05 08:47:41 -07:00
|
|
|
mutex_lock(&deferred_probe_mutex);
|
2014-04-29 05:05:22 -06:00
|
|
|
atomic_inc(&deferred_trigger_count);
|
2012-03-05 08:47:41 -07:00
|
|
|
list_splice_tail_init(&deferred_probe_pending_list,
|
|
|
|
&deferred_probe_active_list);
|
|
|
|
mutex_unlock(&deferred_probe_mutex);
|
|
|
|
|
2012-03-08 13:20:37 -07:00
|
|
|
/*
|
|
|
|
* Kick the re-probe thread. It may already be scheduled, but it is
|
|
|
|
* safe to kick it again.
|
|
|
|
*/
|
2012-03-05 08:47:41 -07:00
|
|
|
queue_work(deferred_wq, &deferred_probe_work);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* deferred_probe_initcall() - Enable probing of deferred devices
|
|
|
|
*
|
|
|
|
* We don't want to get in the way when the bulk of drivers are getting probed.
|
|
|
|
* Instead, this initcall makes sure that deferred probing is delayed until
|
|
|
|
* late_initcall time.
|
|
|
|
*/
|
|
|
|
static int deferred_probe_initcall(void)
|
|
|
|
{
|
|
|
|
deferred_wq = create_singlethread_workqueue("deferwq");
|
|
|
|
if (WARN_ON(!deferred_wq))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
driver_deferred_probe_enable = true;
|
|
|
|
driver_deferred_probe_trigger();
|
2013-02-14 11:14:27 -07:00
|
|
|
/* Sort as many dependencies as possible before exiting initcalls */
|
|
|
|
flush_workqueue(deferred_wq);
|
2012-03-05 08:47:41 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
late_initcall(deferred_probe_initcall);
|
2005-03-21 11:52:54 -07:00
|
|
|
|
2006-10-07 13:55:55 -06:00
|
|
|
static void driver_bound(struct device *dev)
|
2005-03-21 11:52:54 -07:00
|
|
|
{
|
2008-12-16 13:25:49 -07:00
|
|
|
if (klist_node_attached(&dev->p->knode_driver)) {
|
2006-08-14 23:43:20 -06:00
|
|
|
printk(KERN_WARNING "%s: device %s already bound\n",
|
2008-03-04 17:41:05 -07:00
|
|
|
__func__, kobject_name(&dev->kobj));
|
2006-10-07 13:55:55 -06:00
|
|
|
return;
|
2006-08-14 23:43:20 -06:00
|
|
|
}
|
2005-09-22 01:47:11 -06:00
|
|
|
|
2014-04-16 18:12:30 -06:00
|
|
|
pr_debug("driver: '%s': %s: bound to device '%s'\n", dev->driver->name,
|
|
|
|
__func__, dev_name(dev));
|
Driver core: add notification of bus events
I finally did as you suggested and added the notifier to the struct
bus_type itself. There are still problems to be expected is something
attaches to a bus type where the code can hook in different struct
device sub-classes (which is imho a big bogosity but I won't even try to
argue that case now) but it will solve nicely a number of issues I've
had so far.
That also means that clients interested in registering for such
notifications have to do it before devices are added and after bus types
are registered. Fortunately, most bus types that matter for the various
usage scenarios I have in mind are registerd at postcore_initcall time,
which means I have a really nice spot at arch_initcall time to add my
notifiers.
There are 4 notifications provided. Device being added (before hooked to
the bus) and removed (failure of previous case or after being unhooked
from the bus), along with driver being bound to a device and about to be
unbound.
The usage I have for these are:
- The 2 first ones are used to maintain a struct device_ext that is
hooked to struct device.firmware_data. This structure contains for now a
pointer to the Open Firmware node related to the device (if any), the
NUMA node ID (for quick access to it) and the DMA operations pointers &
iommu table instance for DMA to/from this device. For bus types I own
(like IBM VIO or EBUS), I just maintain that structure directly from the
bus code when creating the devices. But for bus types managed by generic
code like PCI or platform (actually, of_platform which is a variation of
platform linked to Open Firmware device-tree), I need this notifier.
- The other two ones have a completely different usage scenario. I have
cases where multiple devices and their drivers depend on each other. For
example, the IBM EMAC network driver needs to attach to a MAL DMA engine
which is a separate device, and a PHY interface which is also a separate
device. They are all of_platform_device's (well, about to be with my
upcoming patches) but there is no say in what precise order the core
will "probe" them and instanciate the various modules. The solution I
found for that is to have the drivers for emac to use multithread_probe,
and wait for a driver to be bound to the target MAL and PHY control
devices (the device-tree contains reference to the MAL and PHY interface
nodes, which I can then match to of_platform_devices). Right now, I've
been polling, but with that notifier, I can more cleanly wait (with a
timeout of course).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-10-24 21:44:59 -06:00
|
|
|
|
2010-03-06 09:50:14 -07:00
|
|
|
klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices);
|
|
|
|
|
2012-03-08 13:20:37 -07:00
|
|
|
/*
|
|
|
|
* Make sure the device is no longer in one of the deferred lists and
|
|
|
|
* kick off retrying all pending devices
|
|
|
|
*/
|
2012-03-05 08:47:41 -07:00
|
|
|
driver_deferred_probe_del(dev);
|
|
|
|
driver_deferred_probe_trigger();
|
|
|
|
|
Driver core: add notification of bus events
I finally did as you suggested and added the notifier to the struct
bus_type itself. There are still problems to be expected is something
attaches to a bus type where the code can hook in different struct
device sub-classes (which is imho a big bogosity but I won't even try to
argue that case now) but it will solve nicely a number of issues I've
had so far.
That also means that clients interested in registering for such
notifications have to do it before devices are added and after bus types
are registered. Fortunately, most bus types that matter for the various
usage scenarios I have in mind are registerd at postcore_initcall time,
which means I have a really nice spot at arch_initcall time to add my
notifiers.
There are 4 notifications provided. Device being added (before hooked to
the bus) and removed (failure of previous case or after being unhooked
from the bus), along with driver being bound to a device and about to be
unbound.
The usage I have for these are:
- The 2 first ones are used to maintain a struct device_ext that is
hooked to struct device.firmware_data. This structure contains for now a
pointer to the Open Firmware node related to the device (if any), the
NUMA node ID (for quick access to it) and the DMA operations pointers &
iommu table instance for DMA to/from this device. For bus types I own
(like IBM VIO or EBUS), I just maintain that structure directly from the
bus code when creating the devices. But for bus types managed by generic
code like PCI or platform (actually, of_platform which is a variation of
platform linked to Open Firmware device-tree), I need this notifier.
- The other two ones have a completely different usage scenario. I have
cases where multiple devices and their drivers depend on each other. For
example, the IBM EMAC network driver needs to attach to a MAL DMA engine
which is a separate device, and a PHY interface which is also a separate
device. They are all of_platform_device's (well, about to be with my
upcoming patches) but there is no say in what precise order the core
will "probe" them and instanciate the various modules. The solution I
found for that is to have the drivers for emac to use multithread_probe,
and wait for a driver to be bound to the target MAL and PHY control
devices (the device-tree contains reference to the MAL and PHY interface
nodes, which I can then match to of_platform_devices). Right now, I've
been polling, but with that notifier, I can more cleanly wait (with a
timeout of course).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-10-24 21:44:59 -06:00
|
|
|
if (dev->bus)
|
2007-11-01 20:41:16 -06:00
|
|
|
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
|
Driver core: add notification of bus events
I finally did as you suggested and added the notifier to the struct
bus_type itself. There are still problems to be expected is something
attaches to a bus type where the code can hook in different struct
device sub-classes (which is imho a big bogosity but I won't even try to
argue that case now) but it will solve nicely a number of issues I've
had so far.
That also means that clients interested in registering for such
notifications have to do it before devices are added and after bus types
are registered. Fortunately, most bus types that matter for the various
usage scenarios I have in mind are registerd at postcore_initcall time,
which means I have a really nice spot at arch_initcall time to add my
notifiers.
There are 4 notifications provided. Device being added (before hooked to
the bus) and removed (failure of previous case or after being unhooked
from the bus), along with driver being bound to a device and about to be
unbound.
The usage I have for these are:
- The 2 first ones are used to maintain a struct device_ext that is
hooked to struct device.firmware_data. This structure contains for now a
pointer to the Open Firmware node related to the device (if any), the
NUMA node ID (for quick access to it) and the DMA operations pointers &
iommu table instance for DMA to/from this device. For bus types I own
(like IBM VIO or EBUS), I just maintain that structure directly from the
bus code when creating the devices. But for bus types managed by generic
code like PCI or platform (actually, of_platform which is a variation of
platform linked to Open Firmware device-tree), I need this notifier.
- The other two ones have a completely different usage scenario. I have
cases where multiple devices and their drivers depend on each other. For
example, the IBM EMAC network driver needs to attach to a MAL DMA engine
which is a separate device, and a PHY interface which is also a separate
device. They are all of_platform_device's (well, about to be with my
upcoming patches) but there is no say in what precise order the core
will "probe" them and instanciate the various modules. The solution I
found for that is to have the drivers for emac to use multithread_probe,
and wait for a driver to be bound to the target MAL and PHY control
devices (the device-tree contains reference to the MAL and PHY interface
nodes, which I can then match to of_platform_devices). Right now, I've
been polling, but with that notifier, I can more cleanly wait (with a
timeout of course).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-10-24 21:44:59 -06:00
|
|
|
BUS_NOTIFY_BOUND_DRIVER, dev);
|
2006-10-07 13:55:55 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static int driver_sysfs_add(struct device *dev)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2010-07-23 04:56:18 -06:00
|
|
|
if (dev->bus)
|
|
|
|
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
|
|
|
|
BUS_NOTIFY_BIND_DRIVER, dev);
|
|
|
|
|
2007-11-28 16:59:15 -07:00
|
|
|
ret = sysfs_create_link(&dev->driver->p->kobj, &dev->kobj,
|
2005-03-21 11:52:54 -07:00
|
|
|
kobject_name(&dev->kobj));
|
2006-08-14 23:43:20 -06:00
|
|
|
if (ret == 0) {
|
2007-11-28 16:59:15 -07:00
|
|
|
ret = sysfs_create_link(&dev->kobj, &dev->driver->p->kobj,
|
2006-08-14 23:43:20 -06:00
|
|
|
"driver");
|
|
|
|
if (ret)
|
2007-11-28 16:59:15 -07:00
|
|
|
sysfs_remove_link(&dev->driver->p->kobj,
|
2006-08-14 23:43:20 -06:00
|
|
|
kobject_name(&dev->kobj));
|
|
|
|
}
|
|
|
|
return ret;
|
2005-03-21 11:52:54 -07:00
|
|
|
}
|
|
|
|
|
2006-10-07 13:55:55 -06:00
|
|
|
static void driver_sysfs_remove(struct device *dev)
|
|
|
|
{
|
|
|
|
struct device_driver *drv = dev->driver;
|
|
|
|
|
|
|
|
if (drv) {
|
2007-11-28 16:59:15 -07:00
|
|
|
sysfs_remove_link(&drv->p->kobj, kobject_name(&dev->kobj));
|
2006-10-07 13:55:55 -06:00
|
|
|
sysfs_remove_link(&dev->kobj, "driver");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-01-24 23:50:12 -07:00
|
|
|
* device_bind_driver - bind a driver to one device.
|
|
|
|
* @dev: device.
|
2006-10-07 13:55:55 -06:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Allow manual attachment of a driver to a device.
|
|
|
|
* Caller must have already set @dev->driver.
|
2006-10-07 13:55:55 -06:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Note that this does not modify the bus reference count
|
|
|
|
* nor take the bus's rwsem. Please verify those are accounted
|
|
|
|
* for before calling this. (It is ok to call with no other effort
|
|
|
|
* from a driver's probe() method.)
|
2006-10-07 13:55:55 -06:00
|
|
|
*
|
2010-02-17 11:57:05 -07:00
|
|
|
* This function must be called with the device lock held.
|
2006-10-07 13:55:55 -06:00
|
|
|
*/
|
|
|
|
int device_bind_driver(struct device *dev)
|
|
|
|
{
|
2006-11-27 02:35:12 -07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = driver_sysfs_add(dev);
|
|
|
|
if (!ret)
|
|
|
|
driver_bound(dev);
|
|
|
|
return ret;
|
2006-10-07 13:55:55 -06:00
|
|
|
}
|
2008-01-24 23:50:12 -07:00
|
|
|
EXPORT_SYMBOL_GPL(device_bind_driver);
|
2006-10-07 13:55:55 -06:00
|
|
|
|
2006-07-18 11:59:59 -06:00
|
|
|
static atomic_t probe_count = ATOMIC_INIT(0);
|
2006-10-27 12:42:37 -06:00
|
|
|
static DECLARE_WAIT_QUEUE_HEAD(probe_waitqueue);
|
|
|
|
|
2007-02-05 17:15:25 -07:00
|
|
|
static int really_probe(struct device *dev, struct device_driver *drv)
|
2005-03-21 11:52:54 -07:00
|
|
|
{
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
int ret = 0;
|
2014-04-29 05:05:22 -06:00
|
|
|
int local_trigger_count = atomic_read(&deferred_trigger_count);
|
2005-03-21 11:52:54 -07:00
|
|
|
|
2006-07-18 11:59:59 -06:00
|
|
|
atomic_inc(&probe_count);
|
2007-11-29 00:49:41 -07:00
|
|
|
pr_debug("bus: '%s': %s: probing driver %s with device %s\n",
|
2008-10-29 18:36:48 -06:00
|
|
|
drv->bus->name, __func__, drv->name, dev_name(dev));
|
devres: device resource management
Implement device resource management, in short, devres. A device
driver can allocate arbirary size of devres data which is associated
with a release function. On driver detach, release function is
invoked on the devres data, then, devres data is freed.
devreses are typed by associated release functions. Some devreses are
better represented by single instance of the type while others need
multiple instances sharing the same release function. Both usages are
supported.
devreses can be grouped using devres group such that a device driver
can easily release acquired resources halfway through initialization
or selectively release resources (e.g. resources for port 1 out of 4
ports).
This patch adds devres core including documentation and the following
managed interfaces.
* alloc/free : devm_kzalloc(), devm_kzfree()
* IO region : devm_request_region(), devm_release_region()
* IRQ : devm_request_irq(), devm_free_irq()
* DMA : dmam_alloc_coherent(), dmam_free_coherent(),
dmam_declare_coherent_memory(), dmam_pool_create(),
dmam_pool_destroy()
* PCI : pcim_enable_device(), pcim_pin_device(), pci_is_managed()
* iomap : devm_ioport_map(), devm_ioport_unmap(), devm_ioremap(),
devm_ioremap_nocache(), devm_iounmap(), pcim_iomap_table(),
pcim_iomap(), pcim_iounmap()
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2007-01-20 00:00:26 -07:00
|
|
|
WARN_ON(!list_empty(&dev->devres_head));
|
2005-03-21 11:52:54 -07:00
|
|
|
|
|
|
|
dev->driver = drv;
|
drivers/pinctrl: grab default handles from device core
This makes the device core auto-grab the pinctrl handle and set
the "default" (PINCTRL_STATE_DEFAULT) state for every device
that is present in the device model right before probe. This will
account for the lion's share of embedded silicon devcies.
A modification of the semantics for pinctrl_get() is also done:
previously if the pinctrl handle for a certain device was already
taken, the pinctrl core would return an error. Now, since the
core may have already default-grabbed the handle and set its
state to "default", if the handle was already taken, this will
be disregarded and the located, previously instanitated handle
will be returned to the caller.
This way all code in drivers explicitly requesting their pinctrl
handlers will still be functional, and drivers that want to
explicitly retrieve and switch their handles can still do that.
But if the desired functionality is just boilerplate of this
type in the probe() function:
struct pinctrl *p;
p = devm_pinctrl_get_select_default(&dev);
if (IS_ERR(p)) {
if (PTR_ERR(p) == -EPROBE_DEFER)
return -EPROBE_DEFER;
dev_warn(&dev, "no pinctrl handle\n");
}
The discussion began with the addition of such boilerplate
to the omap4 keypad driver:
http://marc.info/?l=linux-input&m=135091157719300&w=2
A previous approach using notifiers was discussed:
http://marc.info/?l=linux-kernel&m=135263661110528&w=2
This failed because it could not handle deferred probes.
This patch alone does not solve the entire dilemma faced:
whether code should be distributed into the drivers or
if it should be centralized to e.g. a PM domain. But it
solves the immediate issue of the addition of boilerplate
to a lot of drivers that just want to grab the default
state. As mentioned, they can later explicitly retrieve
the handle and set different states, and this could as
well be done by e.g. PM domains as it is only related
to a certain struct device * pointer.
ChangeLog v4->v5 (Stephen):
- Simplified the devicecore grab code.
- Deleted a piece of documentation recommending that pins
be mapped to a device rather than hogged.
ChangeLog v3->v4 (Linus):
- Drop overzealous NULL checks.
- Move kref initialization to pinctrl_create().
- Seeking Tested-by from Stephen Warren so we do not disturb
the Tegra platform.
- Seeking ACK on this from Greg (and others who like it) so I
can merge it through the pinctrl subsystem.
ChangeLog v2->v3 (Linus):
- Abstain from using IS_ERR_OR_NULL() in the driver core,
Russell recently sent a patch to remove it. Handle the
NULL case explicitly even though it's a bogus case.
- Make sure we handle probe deferral correctly in the device
core file. devm_kfree() the container on error so we don't
waste memory for devices without pinctrl handles.
- Introduce reference counting into the pinctrl core using
<linux/kref.h> so that we don't release pinctrl handles
that have been obtained for two or more places.
ChangeLog v1->v2 (Linus):
- Only store a pointer in the device struct, and only allocate
this if it's really used by the device.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Mitch Bradley <wmb@firmworks.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Rickard Andersson <rickard.andersson@stericsson.com>
Cc: Russell King <linux@arm.linux.org.uk>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[swarren: fixed and simplified error-handling in pinctrl_bind_pins(), to
correctly handle deferred probe. Removed admonition from docs not to use
pinctrl hogs for devices]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-01-22 10:56:14 -07:00
|
|
|
|
|
|
|
/* If using pinctrl, bind pins now before probing */
|
|
|
|
ret = pinctrl_bind_pins(dev);
|
|
|
|
if (ret)
|
|
|
|
goto probe_failed;
|
|
|
|
|
2006-10-07 13:55:55 -06:00
|
|
|
if (driver_sysfs_add(dev)) {
|
|
|
|
printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",
|
2008-10-29 18:36:48 -06:00
|
|
|
__func__, dev_name(dev));
|
2006-10-07 13:55:55 -06:00
|
|
|
goto probe_failed;
|
|
|
|
}
|
|
|
|
|
2006-01-05 07:29:51 -07:00
|
|
|
if (dev->bus->probe) {
|
|
|
|
ret = dev->bus->probe(dev);
|
2006-10-07 13:55:55 -06:00
|
|
|
if (ret)
|
2006-07-18 11:59:59 -06:00
|
|
|
goto probe_failed;
|
2006-01-05 07:29:51 -07:00
|
|
|
} else if (drv->probe) {
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
ret = drv->probe(dev);
|
2006-10-07 13:55:55 -06:00
|
|
|
if (ret)
|
2006-07-18 11:59:59 -06:00
|
|
|
goto probe_failed;
|
2006-08-14 23:43:20 -06:00
|
|
|
}
|
2006-10-07 13:55:55 -06:00
|
|
|
|
|
|
|
driver_bound(dev);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
ret = 1;
|
2007-11-29 00:49:41 -07:00
|
|
|
pr_debug("bus: '%s': %s: bound device %s to driver %s\n",
|
2008-10-29 18:36:48 -06:00
|
|
|
drv->bus->name, __func__, dev_name(dev), drv->name);
|
2006-07-18 11:59:59 -06:00
|
|
|
goto done;
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
|
2006-07-18 11:59:59 -06:00
|
|
|
probe_failed:
|
devres: device resource management
Implement device resource management, in short, devres. A device
driver can allocate arbirary size of devres data which is associated
with a release function. On driver detach, release function is
invoked on the devres data, then, devres data is freed.
devreses are typed by associated release functions. Some devreses are
better represented by single instance of the type while others need
multiple instances sharing the same release function. Both usages are
supported.
devreses can be grouped using devres group such that a device driver
can easily release acquired resources halfway through initialization
or selectively release resources (e.g. resources for port 1 out of 4
ports).
This patch adds devres core including documentation and the following
managed interfaces.
* alloc/free : devm_kzalloc(), devm_kzfree()
* IO region : devm_request_region(), devm_release_region()
* IRQ : devm_request_irq(), devm_free_irq()
* DMA : dmam_alloc_coherent(), dmam_free_coherent(),
dmam_declare_coherent_memory(), dmam_pool_create(),
dmam_pool_destroy()
* PCI : pcim_enable_device(), pcim_pin_device(), pci_is_managed()
* iomap : devm_ioport_map(), devm_ioport_unmap(), devm_ioremap(),
devm_ioremap_nocache(), devm_iounmap(), pcim_iomap_table(),
pcim_iomap(), pcim_iounmap()
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2007-01-20 00:00:26 -07:00
|
|
|
devres_release_all(dev);
|
2006-10-07 13:55:55 -06:00
|
|
|
driver_sysfs_remove(dev);
|
|
|
|
dev->driver = NULL;
|
2012-05-22 16:09:34 -06:00
|
|
|
dev_set_drvdata(dev, NULL);
|
2006-10-07 13:55:55 -06:00
|
|
|
|
2012-03-05 08:47:41 -07:00
|
|
|
if (ret == -EPROBE_DEFER) {
|
|
|
|
/* Driver requested deferred probing */
|
|
|
|
dev_info(dev, "Driver %s requests probe deferral\n", drv->name);
|
|
|
|
driver_deferred_probe_add(dev);
|
2014-04-29 05:05:22 -06:00
|
|
|
/* Did a trigger occur while probing? Need to re-trigger if yes */
|
|
|
|
if (local_trigger_count != atomic_read(&deferred_trigger_count))
|
|
|
|
driver_deferred_probe_trigger();
|
2012-03-05 08:47:41 -07:00
|
|
|
} else if (ret != -ENODEV && ret != -ENXIO) {
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
/* driver matched but the probe failed */
|
|
|
|
printk(KERN_WARNING
|
|
|
|
"%s: probe of %s failed with error %d\n",
|
2008-10-29 18:36:48 -06:00
|
|
|
drv->name, dev_name(dev), ret);
|
2011-09-20 11:41:17 -06:00
|
|
|
} else {
|
|
|
|
pr_debug("%s: probe of %s rejects match %d\n",
|
|
|
|
drv->name, dev_name(dev), ret);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
}
|
2006-11-27 02:35:10 -07:00
|
|
|
/*
|
|
|
|
* Ignore errors returned by ->probe so that the next driver can try
|
|
|
|
* its luck.
|
|
|
|
*/
|
|
|
|
ret = 0;
|
2006-07-18 11:59:59 -06:00
|
|
|
done:
|
|
|
|
atomic_dec(&probe_count);
|
2006-10-27 12:42:37 -06:00
|
|
|
wake_up(&probe_waitqueue);
|
2006-07-18 11:59:59 -06:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* driver_probe_done
|
|
|
|
* Determine if the probe sequence is finished or not.
|
|
|
|
*
|
|
|
|
* Should somehow figure out how to use a semaphore, not an atomic variable...
|
|
|
|
*/
|
|
|
|
int driver_probe_done(void)
|
|
|
|
{
|
2008-03-04 17:41:05 -07:00
|
|
|
pr_debug("%s: probe_count = %d\n", __func__,
|
2006-07-18 11:59:59 -06:00
|
|
|
atomic_read(&probe_count));
|
|
|
|
if (atomic_read(&probe_count))
|
|
|
|
return -EBUSY;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-02-13 17:59:06 -07:00
|
|
|
/**
|
|
|
|
* wait_for_device_probe
|
|
|
|
* Wait for device probing to be completed.
|
|
|
|
*/
|
2009-02-21 01:45:07 -07:00
|
|
|
void wait_for_device_probe(void)
|
2009-02-13 17:59:06 -07:00
|
|
|
{
|
|
|
|
/* wait for the known devices to complete their probing */
|
2009-02-21 01:45:07 -07:00
|
|
|
wait_event(probe_waitqueue, atomic_read(&probe_count) == 0);
|
2009-02-13 17:59:06 -07:00
|
|
|
async_synchronize_full();
|
|
|
|
}
|
2009-04-21 14:32:54 -06:00
|
|
|
EXPORT_SYMBOL_GPL(wait_for_device_probe);
|
2009-02-13 17:59:06 -07:00
|
|
|
|
2006-07-18 11:59:59 -06:00
|
|
|
/**
|
|
|
|
* driver_probe_device - attempt to bind device & driver together
|
|
|
|
* @drv: driver to bind a device to
|
|
|
|
* @dev: device to try to bind to the driver
|
|
|
|
*
|
2009-01-21 08:27:47 -07:00
|
|
|
* This function returns -ENODEV if the device is not registered,
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 08:09:05 -07:00
|
|
|
* 1 if the device is bound successfully and 0 otherwise.
|
2006-07-18 11:59:59 -06:00
|
|
|
*
|
2010-02-17 11:57:05 -07:00
|
|
|
* This function must be called with @dev lock held. When called for a
|
|
|
|
* USB interface, @dev->parent lock must be held as well.
|
2006-07-18 11:59:59 -06:00
|
|
|
*/
|
2008-01-24 23:50:12 -07:00
|
|
|
int driver_probe_device(struct device_driver *drv, struct device *dev)
|
2006-07-18 11:59:59 -06:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
2006-09-18 14:22:34 -06:00
|
|
|
if (!device_is_registered(dev))
|
|
|
|
return -ENODEV;
|
2006-07-18 11:59:59 -06:00
|
|
|
|
2007-11-29 00:49:41 -07:00
|
|
|
pr_debug("bus: '%s': %s: matched device %s with driver %s\n",
|
2008-10-29 18:36:48 -06:00
|
|
|
drv->bus->name, __func__, dev_name(dev), drv->name);
|
2006-07-18 11:59:59 -06:00
|
|
|
|
2009-08-18 15:38:32 -06:00
|
|
|
pm_runtime_barrier(dev);
|
2007-02-05 17:15:25 -07:00
|
|
|
ret = really_probe(dev, drv);
|
2013-04-10 09:00:48 -06:00
|
|
|
pm_request_idle(dev);
|
2006-07-18 11:59:59 -06:00
|
|
|
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
return ret;
|
2005-03-21 11:52:54 -07:00
|
|
|
}
|
|
|
|
|
2008-01-24 23:50:12 -07:00
|
|
|
static int __device_attach(struct device_driver *drv, void *data)
|
2005-03-24 11:50:24 -07:00
|
|
|
{
|
2008-01-24 23:50:12 -07:00
|
|
|
struct device *dev = data;
|
2009-01-21 08:27:47 -07:00
|
|
|
|
|
|
|
if (!driver_match_device(drv, dev))
|
|
|
|
return 0;
|
|
|
|
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
return driver_probe_device(drv, dev);
|
2005-03-24 11:50:24 -07:00
|
|
|
}
|
|
|
|
|
2005-03-21 11:52:54 -07:00
|
|
|
/**
|
2008-01-24 23:50:12 -07:00
|
|
|
* device_attach - try to attach device to a driver.
|
|
|
|
* @dev: device.
|
2005-03-21 11:52:54 -07:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Walk the list of drivers that the bus has and call
|
|
|
|
* driver_probe_device() for each pair. If a compatible
|
|
|
|
* pair is found, break out and return.
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Returns 1 if the device was bound to a driver;
|
2009-05-05 21:38:28 -06:00
|
|
|
* 0 if no matching driver was found;
|
2008-01-24 23:50:12 -07:00
|
|
|
* -ENODEV if the device is not registered.
|
[PATCH] Hold the device's parent's lock during probe and remove
This patch (as604) makes the driver core hold a device's parent's lock
as well as the device's lock during calls to the probe and remove
methods in a driver. This facility is needed by USB device drivers,
owing to the peculiar way USB devices work:
A device provides multiple interfaces, and drivers are bound
to interfaces rather than to devices;
Nevertheless a reset, reset-configuration, suspend, or resume
affects the entire device and requires the caller to hold the
lock for the device, not just a lock for one of the interfaces.
Since a USB driver's probe method is always called with the interface
lock held, the locking order rules (always lock parent before child)
prevent these methods from acquiring the device lock. The solution
provided here is to call all probe and remove methods, for all devices
(not just USB), with the parent lock already acquired.
Although currently only the USB subsystem requires these changes, people
have mentioned in prior discussion that the overhead of acquiring an
extra semaphore in all the prove/remove sequences is not overly large.
Up to now, the USB core has been using its own set of private
semaphores. A followup patch will remove them, relying entirely on the
device semaphores provided by the driver core.
The code paths affected by this patch are:
device_add and device_del: The USB core already holds the parent
lock, so no actual change is needed.
driver_register and driver_unregister: The driver core will now
lock both the parent and the device before probing or removing.
driver_bind and driver_unbind (in sysfs): These routines will
now lock both the parent and the device before binding or
unbinding.
bus_rescan_devices: The helper routine will lock the parent
before probing a device.
I have not tested this patch for conflicts with other subsystems. As
far as I can see, the only possibility of conflict would lie in the
bus_rescan_devices pathway, and it seems pretty remote. Nevertheless,
it would be good for this to get a lot of testing in -mm.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-17 14:54:12 -07:00
|
|
|
*
|
2010-02-17 11:57:05 -07:00
|
|
|
* When called for a USB interface, @dev->parent lock must be held.
|
2005-03-21 11:52:54 -07:00
|
|
|
*/
|
2008-01-24 23:50:12 -07:00
|
|
|
int device_attach(struct device *dev)
|
2005-03-21 11:52:54 -07:00
|
|
|
{
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
int ret = 0;
|
|
|
|
|
2010-02-17 11:57:05 -07:00
|
|
|
device_lock(dev);
|
2005-03-21 11:52:54 -07:00
|
|
|
if (dev->driver) {
|
2011-04-12 11:05:37 -06:00
|
|
|
if (klist_node_attached(&dev->p->knode_driver)) {
|
|
|
|
ret = 1;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2006-08-14 23:43:20 -06:00
|
|
|
ret = device_bind_driver(dev);
|
|
|
|
if (ret == 0)
|
|
|
|
ret = 1;
|
2007-02-05 17:15:26 -07:00
|
|
|
else {
|
|
|
|
dev->driver = NULL;
|
|
|
|
ret = 0;
|
|
|
|
}
|
2007-02-05 17:15:25 -07:00
|
|
|
} else {
|
2007-03-26 19:02:51 -06:00
|
|
|
ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
|
2013-04-10 09:00:48 -06:00
|
|
|
pm_request_idle(dev);
|
2007-02-05 17:15:25 -07:00
|
|
|
}
|
2011-04-12 11:05:37 -06:00
|
|
|
out_unlock:
|
2010-02-17 11:57:05 -07:00
|
|
|
device_unlock(dev);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
return ret;
|
2005-03-24 11:50:24 -07:00
|
|
|
}
|
2008-01-24 23:50:12 -07:00
|
|
|
EXPORT_SYMBOL_GPL(device_attach);
|
2005-03-24 11:50:24 -07:00
|
|
|
|
2008-01-24 23:50:12 -07:00
|
|
|
static int __driver_attach(struct device *dev, void *data)
|
2005-03-24 11:50:24 -07:00
|
|
|
{
|
2008-01-24 23:50:12 -07:00
|
|
|
struct device_driver *drv = data;
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Lock device and try to bind to it. We drop the error
|
|
|
|
* here and always return 0, because we need to keep trying
|
|
|
|
* to bind to devices and some drivers will return an error
|
|
|
|
* simply if it didn't support the device.
|
|
|
|
*
|
|
|
|
* driver_probe_device() will spit a warning if there
|
|
|
|
* is an error.
|
|
|
|
*/
|
|
|
|
|
2009-01-21 08:27:47 -07:00
|
|
|
if (!driver_match_device(drv, dev))
|
2008-09-14 09:32:06 -06:00
|
|
|
return 0;
|
|
|
|
|
[PATCH] Hold the device's parent's lock during probe and remove
This patch (as604) makes the driver core hold a device's parent's lock
as well as the device's lock during calls to the probe and remove
methods in a driver. This facility is needed by USB device drivers,
owing to the peculiar way USB devices work:
A device provides multiple interfaces, and drivers are bound
to interfaces rather than to devices;
Nevertheless a reset, reset-configuration, suspend, or resume
affects the entire device and requires the caller to hold the
lock for the device, not just a lock for one of the interfaces.
Since a USB driver's probe method is always called with the interface
lock held, the locking order rules (always lock parent before child)
prevent these methods from acquiring the device lock. The solution
provided here is to call all probe and remove methods, for all devices
(not just USB), with the parent lock already acquired.
Although currently only the USB subsystem requires these changes, people
have mentioned in prior discussion that the overhead of acquiring an
extra semaphore in all the prove/remove sequences is not overly large.
Up to now, the USB core has been using its own set of private
semaphores. A followup patch will remove them, relying entirely on the
device semaphores provided by the driver core.
The code paths affected by this patch are:
device_add and device_del: The USB core already holds the parent
lock, so no actual change is needed.
driver_register and driver_unregister: The driver core will now
lock both the parent and the device before probing or removing.
driver_bind and driver_unbind (in sysfs): These routines will
now lock both the parent and the device before binding or
unbinding.
bus_rescan_devices: The helper routine will lock the parent
before probing a device.
I have not tested this patch for conflicts with other subsystems. As
far as I can see, the only possibility of conflict would lie in the
bus_rescan_devices pathway, and it seems pretty remote. Nevertheless,
it would be good for this to get a lot of testing in -mm.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-17 14:54:12 -07:00
|
|
|
if (dev->parent) /* Needed for USB */
|
2010-02-17 11:57:05 -07:00
|
|
|
device_lock(dev->parent);
|
|
|
|
device_lock(dev);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
if (!dev->driver)
|
|
|
|
driver_probe_device(drv, dev);
|
2010-02-17 11:57:05 -07:00
|
|
|
device_unlock(dev);
|
[PATCH] Hold the device's parent's lock during probe and remove
This patch (as604) makes the driver core hold a device's parent's lock
as well as the device's lock during calls to the probe and remove
methods in a driver. This facility is needed by USB device drivers,
owing to the peculiar way USB devices work:
A device provides multiple interfaces, and drivers are bound
to interfaces rather than to devices;
Nevertheless a reset, reset-configuration, suspend, or resume
affects the entire device and requires the caller to hold the
lock for the device, not just a lock for one of the interfaces.
Since a USB driver's probe method is always called with the interface
lock held, the locking order rules (always lock parent before child)
prevent these methods from acquiring the device lock. The solution
provided here is to call all probe and remove methods, for all devices
(not just USB), with the parent lock already acquired.
Although currently only the USB subsystem requires these changes, people
have mentioned in prior discussion that the overhead of acquiring an
extra semaphore in all the prove/remove sequences is not overly large.
Up to now, the USB core has been using its own set of private
semaphores. A followup patch will remove them, relying entirely on the
device semaphores provided by the driver core.
The code paths affected by this patch are:
device_add and device_del: The USB core already holds the parent
lock, so no actual change is needed.
driver_register and driver_unregister: The driver core will now
lock both the parent and the device before probing or removing.
driver_bind and driver_unbind (in sysfs): These routines will
now lock both the parent and the device before binding or
unbinding.
bus_rescan_devices: The helper routine will lock the parent
before probing a device.
I have not tested this patch for conflicts with other subsystems. As
far as I can see, the only possibility of conflict would lie in the
bus_rescan_devices pathway, and it seems pretty remote. Nevertheless,
it would be good for this to get a lot of testing in -mm.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-17 14:54:12 -07:00
|
|
|
if (dev->parent)
|
2010-02-17 11:57:05 -07:00
|
|
|
device_unlock(dev->parent);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
|
2005-03-21 11:52:54 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-01-24 23:50:12 -07:00
|
|
|
* driver_attach - try to bind driver to devices.
|
|
|
|
* @drv: driver.
|
2005-03-21 11:52:54 -07:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Walk the list of devices that the bus has on it and try to
|
|
|
|
* match the driver with each one. If driver_probe_device()
|
|
|
|
* returns 0 and the @dev->driver is set, we've found a
|
|
|
|
* compatible pair.
|
2005-03-21 11:52:54 -07:00
|
|
|
*/
|
2008-01-24 23:50:12 -07:00
|
|
|
int driver_attach(struct device_driver *drv)
|
2005-03-21 11:52:54 -07:00
|
|
|
{
|
2006-08-14 23:43:20 -06:00
|
|
|
return bus_for_each_dev(drv->bus, NULL, drv, __driver_attach);
|
2005-03-21 11:52:54 -07:00
|
|
|
}
|
2008-01-24 23:50:12 -07:00
|
|
|
EXPORT_SYMBOL_GPL(driver_attach);
|
2005-03-21 11:52:54 -07:00
|
|
|
|
2007-06-17 03:02:12 -06:00
|
|
|
/*
|
2010-02-17 11:57:05 -07:00
|
|
|
* __device_release_driver() must be called with @dev lock held.
|
|
|
|
* When called for a USB interface, @dev->parent lock must be held as well.
|
2005-03-21 11:52:54 -07:00
|
|
|
*/
|
2008-01-24 23:50:12 -07:00
|
|
|
static void __device_release_driver(struct device *dev)
|
2005-03-21 11:52:54 -07:00
|
|
|
{
|
2008-01-24 23:50:12 -07:00
|
|
|
struct device_driver *drv;
|
2005-03-21 11:52:54 -07:00
|
|
|
|
2007-11-16 09:57:28 -07:00
|
|
|
drv = dev->driver;
|
2005-05-06 13:38:33 -06:00
|
|
|
if (drv) {
|
2011-04-28 16:33:45 -06:00
|
|
|
pm_runtime_get_sync(dev);
|
2009-08-18 15:38:32 -06:00
|
|
|
|
2006-10-07 13:55:55 -06:00
|
|
|
driver_sysfs_remove(dev);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
|
Driver core: add notification of bus events
I finally did as you suggested and added the notifier to the struct
bus_type itself. There are still problems to be expected is something
attaches to a bus type where the code can hook in different struct
device sub-classes (which is imho a big bogosity but I won't even try to
argue that case now) but it will solve nicely a number of issues I've
had so far.
That also means that clients interested in registering for such
notifications have to do it before devices are added and after bus types
are registered. Fortunately, most bus types that matter for the various
usage scenarios I have in mind are registerd at postcore_initcall time,
which means I have a really nice spot at arch_initcall time to add my
notifiers.
There are 4 notifications provided. Device being added (before hooked to
the bus) and removed (failure of previous case or after being unhooked
from the bus), along with driver being bound to a device and about to be
unbound.
The usage I have for these are:
- The 2 first ones are used to maintain a struct device_ext that is
hooked to struct device.firmware_data. This structure contains for now a
pointer to the Open Firmware node related to the device (if any), the
NUMA node ID (for quick access to it) and the DMA operations pointers &
iommu table instance for DMA to/from this device. For bus types I own
(like IBM VIO or EBUS), I just maintain that structure directly from the
bus code when creating the devices. But for bus types managed by generic
code like PCI or platform (actually, of_platform which is a variation of
platform linked to Open Firmware device-tree), I need this notifier.
- The other two ones have a completely different usage scenario. I have
cases where multiple devices and their drivers depend on each other. For
example, the IBM EMAC network driver needs to attach to a MAL DMA engine
which is a separate device, and a PHY interface which is also a separate
device. They are all of_platform_device's (well, about to be with my
upcoming patches) but there is no say in what precise order the core
will "probe" them and instanciate the various modules. The solution I
found for that is to have the drivers for emac to use multithread_probe,
and wait for a driver to be bound to the target MAL and PHY control
devices (the device-tree contains reference to the MAL and PHY interface
nodes, which I can then match to of_platform_devices). Right now, I've
been polling, but with that notifier, I can more cleanly wait (with a
timeout of course).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-10-24 21:44:59 -06:00
|
|
|
if (dev->bus)
|
2007-11-01 20:41:16 -06:00
|
|
|
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
|
Driver core: add notification of bus events
I finally did as you suggested and added the notifier to the struct
bus_type itself. There are still problems to be expected is something
attaches to a bus type where the code can hook in different struct
device sub-classes (which is imho a big bogosity but I won't even try to
argue that case now) but it will solve nicely a number of issues I've
had so far.
That also means that clients interested in registering for such
notifications have to do it before devices are added and after bus types
are registered. Fortunately, most bus types that matter for the various
usage scenarios I have in mind are registerd at postcore_initcall time,
which means I have a really nice spot at arch_initcall time to add my
notifiers.
There are 4 notifications provided. Device being added (before hooked to
the bus) and removed (failure of previous case or after being unhooked
from the bus), along with driver being bound to a device and about to be
unbound.
The usage I have for these are:
- The 2 first ones are used to maintain a struct device_ext that is
hooked to struct device.firmware_data. This structure contains for now a
pointer to the Open Firmware node related to the device (if any), the
NUMA node ID (for quick access to it) and the DMA operations pointers &
iommu table instance for DMA to/from this device. For bus types I own
(like IBM VIO or EBUS), I just maintain that structure directly from the
bus code when creating the devices. But for bus types managed by generic
code like PCI or platform (actually, of_platform which is a variation of
platform linked to Open Firmware device-tree), I need this notifier.
- The other two ones have a completely different usage scenario. I have
cases where multiple devices and their drivers depend on each other. For
example, the IBM EMAC network driver needs to attach to a MAL DMA engine
which is a separate device, and a PHY interface which is also a separate
device. They are all of_platform_device's (well, about to be with my
upcoming patches) but there is no say in what precise order the core
will "probe" them and instanciate the various modules. The solution I
found for that is to have the drivers for emac to use multithread_probe,
and wait for a driver to be bound to the target MAL and PHY control
devices (the device-tree contains reference to the MAL and PHY interface
nodes, which I can then match to of_platform_devices). Right now, I've
been polling, but with that notifier, I can more cleanly wait (with a
timeout of course).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-10-24 21:44:59 -06:00
|
|
|
BUS_NOTIFY_UNBIND_DRIVER,
|
|
|
|
dev);
|
|
|
|
|
2013-11-06 17:51:15 -07:00
|
|
|
pm_runtime_put_sync(dev);
|
2011-04-28 16:33:45 -06:00
|
|
|
|
2006-03-31 09:52:25 -07:00
|
|
|
if (dev->bus && dev->bus->remove)
|
2006-01-05 07:29:51 -07:00
|
|
|
dev->bus->remove(dev);
|
|
|
|
else if (drv->remove)
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
drv->remove(dev);
|
devres: device resource management
Implement device resource management, in short, devres. A device
driver can allocate arbirary size of devres data which is associated
with a release function. On driver detach, release function is
invoked on the devres data, then, devres data is freed.
devreses are typed by associated release functions. Some devreses are
better represented by single instance of the type while others need
multiple instances sharing the same release function. Both usages are
supported.
devreses can be grouped using devres group such that a device driver
can easily release acquired resources halfway through initialization
or selectively release resources (e.g. resources for port 1 out of 4
ports).
This patch adds devres core including documentation and the following
managed interfaces.
* alloc/free : devm_kzalloc(), devm_kzfree()
* IO region : devm_request_region(), devm_release_region()
* IRQ : devm_request_irq(), devm_free_irq()
* DMA : dmam_alloc_coherent(), dmam_free_coherent(),
dmam_declare_coherent_memory(), dmam_pool_create(),
dmam_pool_destroy()
* PCI : pcim_enable_device(), pcim_pin_device(), pci_is_managed()
* iomap : devm_ioport_map(), devm_ioport_unmap(), devm_ioremap(),
devm_ioremap_nocache(), devm_iounmap(), pcim_iomap_table(),
pcim_iomap(), pcim_iounmap()
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2007-01-20 00:00:26 -07:00
|
|
|
devres_release_all(dev);
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
dev->driver = NULL;
|
2012-05-22 16:09:34 -06:00
|
|
|
dev_set_drvdata(dev, NULL);
|
2008-12-16 13:25:49 -07:00
|
|
|
klist_remove(&dev->p->knode_driver);
|
2009-04-24 06:57:00 -06:00
|
|
|
if (dev->bus)
|
|
|
|
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
|
|
|
|
BUS_NOTIFY_UNBOUND_DRIVER,
|
|
|
|
dev);
|
2009-08-18 15:38:32 -06:00
|
|
|
|
[PATCH] Driver Core: fix bk-driver-core kills ppc64
There's no check to see if the device is already bound to a driver, which
could do bad things. The first thing to go wrong is that it will try to match
a driver with a device already bound to one. In some cases (it appears with
USB with drivers/usb/core/usb.c::usb_match_id()), some drivers will match a
device based on the class type, so it would be common (especially for HID
devices) to match a device that is already bound.
The fun comes when ->probe() is called, it fails, then
driver_probe_device() does this:
dev->driver = NULL;
Later on, that pointer could be be dereferenced without checking and cause
hell to break loose.
This problem could be nasty. It's very hardware dependent, since some
devices could have a different set of matching qualifiers than others.
Now, I don't quite see exactly where/how you were getting that crash.
You're dereferencing bad memory, but I'm not sure which pointer was bad
and where it came from, but it could have come from a couple of different
places.
The patch below will hopefully fix it all up for you. It's against
2.6.12-rc2-mm1, and does the following:
- Move logic to driver_probe_device() and comments uncommon returns:
1 - If device is bound
0 - If device not bound, and no error
error - If there was an error.
- Move locking to caller of that function, since we want to lock a
device for the entire time we're trying to bind it to a driver (to
prevent against a driver being loaded at the same time).
- Update __device_attach() and __driver_attach() to do that locking.
- Check if device is already bound in __driver_attach()
- Update the converse device_release_driver() so it locks the device
around all of the operations.
- Mark driver_probe_device() as static and remove export. It's an
internal function, it should stay that way, and there are no other
callers. If there is ever a need to export it, we can audit it as
necessary.
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-04-06 00:46:33 -06:00
|
|
|
}
|
2005-03-21 11:52:54 -07:00
|
|
|
}
|
|
|
|
|
2007-06-17 03:02:12 -06:00
|
|
|
/**
|
2008-01-24 23:50:12 -07:00
|
|
|
* device_release_driver - manually detach device from driver.
|
|
|
|
* @dev: device.
|
2007-06-17 03:02:12 -06:00
|
|
|
*
|
2008-01-24 23:50:12 -07:00
|
|
|
* Manually detach device from driver.
|
2010-02-17 11:57:05 -07:00
|
|
|
* When called for a USB interface, @dev->parent lock must be held.
|
2007-06-17 03:02:12 -06:00
|
|
|
*/
|
2008-01-24 23:50:12 -07:00
|
|
|
void device_release_driver(struct device *dev)
|
2005-03-21 13:25:36 -07:00
|
|
|
{
|
2005-05-06 13:38:33 -06:00
|
|
|
/*
|
|
|
|
* If anyone calls device_release_driver() recursively from
|
|
|
|
* within their ->remove callback for the same device, they
|
|
|
|
* will deadlock right here.
|
|
|
|
*/
|
2010-02-17 11:57:05 -07:00
|
|
|
device_lock(dev);
|
2005-05-06 13:38:33 -06:00
|
|
|
__device_release_driver(dev);
|
2010-02-17 11:57:05 -07:00
|
|
|
device_unlock(dev);
|
2005-03-21 13:25:36 -07:00
|
|
|
}
|
2008-01-24 23:50:12 -07:00
|
|
|
EXPORT_SYMBOL_GPL(device_release_driver);
|
2005-05-06 13:38:33 -06:00
|
|
|
|
2005-03-21 11:52:54 -07:00
|
|
|
/**
|
|
|
|
* driver_detach - detach driver from all devices it controls.
|
|
|
|
* @drv: driver.
|
|
|
|
*/
|
2008-01-24 23:50:12 -07:00
|
|
|
void driver_detach(struct device_driver *drv)
|
2005-03-21 11:52:54 -07:00
|
|
|
{
|
2008-12-16 13:25:49 -07:00
|
|
|
struct device_private *dev_prv;
|
2008-01-24 23:50:12 -07:00
|
|
|
struct device *dev;
|
2005-05-06 13:38:33 -06:00
|
|
|
|
|
|
|
for (;;) {
|
2007-11-28 16:59:15 -07:00
|
|
|
spin_lock(&drv->p->klist_devices.k_lock);
|
|
|
|
if (list_empty(&drv->p->klist_devices.k_list)) {
|
|
|
|
spin_unlock(&drv->p->klist_devices.k_lock);
|
2005-05-06 13:38:33 -06:00
|
|
|
break;
|
|
|
|
}
|
2008-12-16 13:25:49 -07:00
|
|
|
dev_prv = list_entry(drv->p->klist_devices.k_list.prev,
|
|
|
|
struct device_private,
|
|
|
|
knode_driver.n_node);
|
|
|
|
dev = dev_prv->device;
|
2005-05-06 13:38:33 -06:00
|
|
|
get_device(dev);
|
2007-11-28 16:59:15 -07:00
|
|
|
spin_unlock(&drv->p->klist_devices.k_lock);
|
2005-05-06 13:38:33 -06:00
|
|
|
|
[PATCH] Hold the device's parent's lock during probe and remove
This patch (as604) makes the driver core hold a device's parent's lock
as well as the device's lock during calls to the probe and remove
methods in a driver. This facility is needed by USB device drivers,
owing to the peculiar way USB devices work:
A device provides multiple interfaces, and drivers are bound
to interfaces rather than to devices;
Nevertheless a reset, reset-configuration, suspend, or resume
affects the entire device and requires the caller to hold the
lock for the device, not just a lock for one of the interfaces.
Since a USB driver's probe method is always called with the interface
lock held, the locking order rules (always lock parent before child)
prevent these methods from acquiring the device lock. The solution
provided here is to call all probe and remove methods, for all devices
(not just USB), with the parent lock already acquired.
Although currently only the USB subsystem requires these changes, people
have mentioned in prior discussion that the overhead of acquiring an
extra semaphore in all the prove/remove sequences is not overly large.
Up to now, the USB core has been using its own set of private
semaphores. A followup patch will remove them, relying entirely on the
device semaphores provided by the driver core.
The code paths affected by this patch are:
device_add and device_del: The USB core already holds the parent
lock, so no actual change is needed.
driver_register and driver_unregister: The driver core will now
lock both the parent and the device before probing or removing.
driver_bind and driver_unbind (in sysfs): These routines will
now lock both the parent and the device before binding or
unbinding.
bus_rescan_devices: The helper routine will lock the parent
before probing a device.
I have not tested this patch for conflicts with other subsystems. As
far as I can see, the only possibility of conflict would lie in the
bus_rescan_devices pathway, and it seems pretty remote. Nevertheless,
it would be good for this to get a lot of testing in -mm.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-17 14:54:12 -07:00
|
|
|
if (dev->parent) /* Needed for USB */
|
2010-02-17 11:57:05 -07:00
|
|
|
device_lock(dev->parent);
|
|
|
|
device_lock(dev);
|
2005-05-06 13:38:33 -06:00
|
|
|
if (dev->driver == drv)
|
|
|
|
__device_release_driver(dev);
|
2010-02-17 11:57:05 -07:00
|
|
|
device_unlock(dev);
|
[PATCH] Hold the device's parent's lock during probe and remove
This patch (as604) makes the driver core hold a device's parent's lock
as well as the device's lock during calls to the probe and remove
methods in a driver. This facility is needed by USB device drivers,
owing to the peculiar way USB devices work:
A device provides multiple interfaces, and drivers are bound
to interfaces rather than to devices;
Nevertheless a reset, reset-configuration, suspend, or resume
affects the entire device and requires the caller to hold the
lock for the device, not just a lock for one of the interfaces.
Since a USB driver's probe method is always called with the interface
lock held, the locking order rules (always lock parent before child)
prevent these methods from acquiring the device lock. The solution
provided here is to call all probe and remove methods, for all devices
(not just USB), with the parent lock already acquired.
Although currently only the USB subsystem requires these changes, people
have mentioned in prior discussion that the overhead of acquiring an
extra semaphore in all the prove/remove sequences is not overly large.
Up to now, the USB core has been using its own set of private
semaphores. A followup patch will remove them, relying entirely on the
device semaphores provided by the driver core.
The code paths affected by this patch are:
device_add and device_del: The USB core already holds the parent
lock, so no actual change is needed.
driver_register and driver_unregister: The driver core will now
lock both the parent and the device before probing or removing.
driver_bind and driver_unbind (in sysfs): These routines will
now lock both the parent and the device before binding or
unbinding.
bus_rescan_devices: The helper routine will lock the parent
before probing a device.
I have not tested this patch for conflicts with other subsystems. As
far as I can see, the only possibility of conflict would lie in the
bus_rescan_devices pathway, and it seems pretty remote. Nevertheless,
it would be good for this to get a lot of testing in -mm.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-17 14:54:12 -07:00
|
|
|
if (dev->parent)
|
2010-02-17 11:57:05 -07:00
|
|
|
device_unlock(dev->parent);
|
2005-05-06 13:38:33 -06:00
|
|
|
put_device(dev);
|
|
|
|
}
|
2005-03-21 11:52:54 -07:00
|
|
|
}
|