Merge branches 'release' and 'hp-cid' into release

[linux-2.6] / drivers / firewire / fw-device.h

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index c167d59da68adfe74e03b2541b23d1c1e35012b8..0854fe2bc11085943d0b7edcdef5884d8996c60c 100644 (file)
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -1,7 +1,4 @@
-/*                                             -*- c-basic-offset: 8 -*-
- *
- * fw-device.h - Device probing and sysfs code.
- *
+/*
  * Copyright (C) 2005-2006  Kristian Hoegsberg <krh@bitplanet.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,11 +35,24 @@ struct fw_attribute_group {
        struct attribute *attrs[11];
 };
 
+/*
+ * Note, fw_device.generation always has to be read before fw_device.node_id.
+ * Use SMP memory barriers to ensure this.  Otherwise requests will be sent
+ * to an outdated node_id if the generation was updated in the meantime due
+ * to a bus reset.
+ *
+ * Likewise, fw-core will take care to update .node_id before .generation so
+ * that whenever fw_device.generation is current WRT the actual bus generation,
+ * fw_device.node_id is guaranteed to be current too.
+ *
+ * The same applies to fw_device.card->node_id vs. fw_device.generation.
+ */
 struct fw_device {
        atomic_t state;
        struct fw_node *node;
        int node_id;
        int generation;
+       unsigned max_speed;
        struct fw_card *card;
        struct device device;
        struct list_head link;
@@ -102,11 +112,7 @@ fw_unit(struct device *dev)
 #define CSR_DEPENDENT_INFO     0x14
 #define CSR_MODEL              0x17
 #define CSR_INSTANCE           0x18
-
-#define SBP2_COMMAND_SET_SPECIFIER     0x38
-#define SBP2_COMMAND_SET               0x39
-#define SBP2_COMMAND_SET_REVISION      0x3b
-#define SBP2_FIRMWARE_REVISION         0x3c
+#define CSR_DIRECTORY_ID       0x20
 
 struct fw_csr_iterator {
        u32 *p;