Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore config pending stuff, adjusted to avoid the race. 

Leave a note about what this code probably should look like for
anyone who comes rummaging around with the intent to really fix it.
I would do that myself if I had time and resources to test this at
the moment, and more comfort with our firewire stack, but I don't.
This commit is contained in:
riastradh 2012-08-05 02:36:16 +00:00
parent 57dd555999
commit 17be18e233
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/ieee1394/firewire.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: firewire.c,v 1.40 2012/08/04 03:55:43 riastradh Exp $ */
/* $NetBSD: firewire.c,v 1.41 2012/08/05 02:36:16 riastradh Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.40 2012/08/04 03:55:43 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.41 2012/08/05 02:36:16 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -255,6 +255,9 @@ firewireattach(device_t parent, device_t self, void *aux)
callout_schedule(&fc->timeout_callout, hz);
/* Tell config we will have started a thread to scan the bus. */
config_pending_incr();
/* create thread */
if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL, fw_bus_probe_thread,
fc, &fc->probe_thread, "fw%dprobe", device_unit(fc->bdev)))
@ -1943,6 +1946,22 @@ fw_bus_probe_thread(void *arg)
{
struct firewire_comm *fc = (struct firewire_comm *)arg;
/*
* Tell config we've scanned the bus.
*
* XXX This is not right -- we haven't actually scanned it. We
* probably ought to call this after the first bus exploration.
*
* bool once = false;
* ...
* fw_attach_dev(fc);
* if (!once) {
* config_pending_decr();
* once = true;
* }
*/
config_pending_decr();
mutex_enter(&fc->wait_lock);
while (fc->status != FWBUSDETACH) {
if (fc->status == FWBUSEXPLORE) {