aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-sbp2.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-01-25 12:57:41 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-01-30 16:22:27 -0500
commitb5d2a5e04e6a26cb3f77af8cbc31e74c361d706c (patch)
treecfc3b2dc141f643bcf6ef065cca802340b335799 /drivers/firewire/fw-sbp2.c
parentcf5a56ac8083dd04ffe8b9b2ec7895e9bcff44bc (diff)
firewire: enforce access order between generation and node ID, fix "giving up on config rom"
fw_device.node_id and fw_device.generation are accessed without mutexes. We have to ensure that all readers will get to see node_id updates before generation updates. Fixes an inability to recognize devices after "giving up on config rom", https://bugzilla.redhat.com/show_bug.cgi?id=429950 Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Reviewed by Nick Piggin <nickpiggin@yahoo.com.au>. Verified to fix 'giving up on config rom' issues on multiple system and drive combinations that were previously affected. Signed-off-by: Jarod Wilson <jwilson@redhat.com> Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Diffstat (limited to 'drivers/firewire/fw-sbp2.c')
-rw-r--r--drivers/firewire/fw-sbp2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index d406c34fd378..705a20ce6b4a 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -40,6 +40,7 @@
40#include <linux/stringify.h> 40#include <linux/stringify.h>
41#include <linux/timer.h> 41#include <linux/timer.h>
42#include <linux/workqueue.h> 42#include <linux/workqueue.h>
43#include <asm/system.h>
43 44
44#include <scsi/scsi.h> 45#include <scsi/scsi.h>
45#include <scsi/scsi_cmnd.h> 46#include <scsi/scsi_cmnd.h>
@@ -662,6 +663,7 @@ static void sbp2_login(struct work_struct *work)
662 int generation, node_id, local_node_id; 663 int generation, node_id, local_node_id;
663 664
664 generation = device->generation; 665 generation = device->generation;
666 smp_rmb(); /* node_id must not be older than generation */
665 node_id = device->node_id; 667 node_id = device->node_id;
666 local_node_id = device->card->node_id; 668 local_node_id = device->card->node_id;
667 669
@@ -912,6 +914,7 @@ static void sbp2_reconnect(struct work_struct *work)
912 int generation, node_id, local_node_id; 914 int generation, node_id, local_node_id;
913 915
914 generation = device->generation; 916 generation = device->generation;
917 smp_rmb(); /* node_id must not be older than generation */
915 node_id = device->node_id; 918 node_id = device->node_id;
916 local_node_id = device->card->node_id; 919 local_node_id = device->card->node_id;
917 920