git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
ieee1394
/
ieee1394_core.c
diff --git
a/drivers/ieee1394/ieee1394_core.c
b/drivers/ieee1394/ieee1394_core.c
index
f43739c
..
be6854e
100644
(file)
--- a/
drivers/ieee1394/ieee1394_core.c
+++ b/
drivers/ieee1394/ieee1394_core.c
@@
-20,6
+20,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/string.h>
@@
-32,7
+33,6
@@
#include <linux/kdev_t.h>
#include <linux/skbuff.h>
#include <linux/suspend.h>
#include <linux/kdev_t.h>
#include <linux/skbuff.h>
#include <linux/suspend.h>
-#include <linux/kthread.h>
#include <asm/byteorder.h>
#include <asm/semaphore.h>
#include <asm/byteorder.h>
#include <asm/semaphore.h>
@@
-285,9
+285,9
@@
static int check_selfids(struct hpsb_host *host)
static void build_speed_map(struct hpsb_host *host, int nodecount)
{
static void build_speed_map(struct hpsb_host *host, int nodecount)
{
+ u8 speedcap[nodecount];
u8 cldcnt[nodecount];
u8 *map = host->speed_map;
u8 cldcnt[nodecount];
u8 *map = host->speed_map;
- u8 *speedcap = host->speed;
struct selfid *sid;
struct ext_selfid *esid;
int i, j, n;
struct selfid *sid;
struct ext_selfid *esid;
int i, j, n;
@@
-354,11
+354,6
@@
static void build_speed_map(struct hpsb_host *host, int nodecount)
}
}
}
}
}
}
-
- /* assume maximum speed for 1394b PHYs, nodemgr will correct it */
- for (n = 0; n < nodecount; n++)
- if (speedcap[n] == 3)
- speedcap[n] = IEEE1394_SPEED_MAX;
}
}
@@
-559,10
+554,11
@@
int hpsb_send_packet(struct hpsb_packet *packet)
return 0;
}
return 0;
}
- if (packet->type == hpsb_async &&
- NODEID_TO_NODE(packet->node_id) != ALL_NODES)
+ if (packet->type == hpsb_async && packet->node_id != ALL_NODES) {
packet->speed_code =
packet->speed_code =
- host->speed[NODEID_TO_NODE(packet->node_id)];
+ host->speed_map[NODEID_TO_NODE(host->node_id) * 64
+ + NODEID_TO_NODE(packet->node_id)];
+ }
dump_packet("send packet", packet->header, packet->header_size, packet->speed_code);
dump_packet("send packet", packet->header, packet->header_size, packet->speed_code);
@@
-1001,8
+997,11
@@
void abort_timedouts(unsigned long __opaque)
* packets that have a "complete" function are sent here. This way, the
* completion is run out of kernel context, and doesn't block the rest of
* the stack. */
* packets that have a "complete" function are sent here. This way, the
* completion is run out of kernel context, and doesn't block the rest of
* the stack. */
-static struct task_struct *khpsbpkt_thread;
+static int khpsbpkt_pid = -1, khpsbpkt_kill;
+static DECLARE_COMPLETION(khpsbpkt_complete);
static struct sk_buff_head hpsbpkt_queue;
static struct sk_buff_head hpsbpkt_queue;
+static DECLARE_MUTEX_LOCKED(khpsbpkt_sig);
+
static void queue_packet_complete(struct hpsb_packet *packet)
{
static void queue_packet_complete(struct hpsb_packet *packet)
{
@@
-1012,7
+1011,9
@@
static void queue_packet_complete(struct hpsb_packet *packet)
}
if (packet->complete_routine != NULL) {
skb_queue_tail(&hpsbpkt_queue, packet->skb);
}
if (packet->complete_routine != NULL) {
skb_queue_tail(&hpsbpkt_queue, packet->skb);
- wake_up_process(khpsbpkt_thread);
+
+ /* Signal the kernel thread to handle this */
+ up(&khpsbpkt_sig);
}
return;
}
}
return;
}
@@
-1024,9
+1025,19
@@
static int hpsbpkt_thread(void *__hi)
void (*complete_routine)(void*);
void *complete_data;
void (*complete_routine)(void*);
void *complete_data;
+ daemonize("khpsbpkt");
+
current->flags |= PF_NOFREEZE;
current->flags |= PF_NOFREEZE;
- while (!kthread_should_stop()) {
+ while (1) {
+ if (down_interruptible(&khpsbpkt_sig)) {
+ printk("khpsbpkt: received unexpected signal?!\n" );
+ break;
+ }
+
+ if (khpsbpkt_kill)
+ break;
+
while ((skb = skb_dequeue(&hpsbpkt_queue)) != NULL) {
packet = (struct hpsb_packet *)skb->data;
while ((skb = skb_dequeue(&hpsbpkt_queue)) != NULL) {
packet = (struct hpsb_packet *)skb->data;
@@
-1037,13
+1048,9
@@
static int hpsbpkt_thread(void *__hi)
complete_routine(complete_data);
}
complete_routine(complete_data);
}
-
- set_current_state(TASK_INTERRUPTIBLE);
- if (!skb_peek(&hpsbpkt_queue))
- schedule();
- __set_current_state(TASK_RUNNING);
}
}
- return 0;
+
+ complete_and_exit(&khpsbpkt_complete, 0);
}
static int __init ieee1394_init(void)
}
static int __init ieee1394_init(void)
@@
-1058,10
+1065,10
@@
static int __init ieee1394_init(void)
HPSB_ERR("Some features may not be available\n");
}
HPSB_ERR("Some features may not be available\n");
}
- khpsbpkt_
thread = kthread_run(hpsbpkt_thread, NULL, "khpsbpkt"
);
- if (
IS_ERR(khpsbpkt_thread)
) {
+ khpsbpkt_
pid = kernel_thread(hpsbpkt_thread, NULL, CLONE_KERNEL
);
+ if (
khpsbpkt_pid < 0
) {
HPSB_ERR("Failed to start hpsbpkt thread!\n");
HPSB_ERR("Failed to start hpsbpkt thread!\n");
- ret =
PTR_ERR(khpsbpkt_thread)
;
+ ret =
-ENOMEM
;
goto exit_cleanup_config_roms;
}
goto exit_cleanup_config_roms;
}
@@
-1141,7
+1148,10
@@
release_all_bus:
release_chrdev:
unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
exit_release_kernel_thread:
release_chrdev:
unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
exit_release_kernel_thread:
- kthread_stop(khpsbpkt_thread);
+ if (khpsbpkt_pid >= 0) {
+ kill_proc(khpsbpkt_pid, SIGTERM, 1);
+ wait_for_completion(&khpsbpkt_complete);
+ }
exit_cleanup_config_roms:
hpsb_cleanup_config_roms();
return ret;
exit_cleanup_config_roms:
hpsb_cleanup_config_roms();
return ret;
@@
-1162,7
+1172,12
@@
static void __exit ieee1394_cleanup(void)
bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]);
bus_unregister(&ieee1394_bus_type);
bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]);
bus_unregister(&ieee1394_bus_type);
- kthread_stop(khpsbpkt_thread);
+ if (khpsbpkt_pid >= 0) {
+ khpsbpkt_kill = 1;
+ mb();
+ up(&khpsbpkt_sig);
+ wait_for_completion(&khpsbpkt_complete);
+ }
hpsb_cleanup_config_roms();
hpsb_cleanup_config_roms();