[SCSI] libiscsi: allow drivers to modify the itt sent to the target

[safe/jmp/linux-2.6] / include / scsi / scsi_transport_sas.h

diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index e3c503c..61ad359 100644 (file)
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -4,35 +4,43 @@
 #include <linux/transport_class.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
+#include <scsi/sas.h>
 
 struct scsi_transport_template;
 struct sas_rphy;
-
+struct request;
 
 enum sas_device_type {
-       SAS_PHY_UNUSED,
-       SAS_END_DEVICE,
-       SAS_EDGE_EXPANDER_DEVICE,
-       SAS_FANOUT_EXPANDER_DEVICE,
+       SAS_PHY_UNUSED = 0,
+       SAS_END_DEVICE = 1,
+       SAS_EDGE_EXPANDER_DEVICE = 2,
+       SAS_FANOUT_EXPANDER_DEVICE = 3,
 };
 
-enum sas_protocol {
-       SAS_PROTOCOL_SATA               = 0x01,
-       SAS_PROTOCOL_SMP                = 0x02,
-       SAS_PROTOCOL_STP                = 0x04,
-       SAS_PROTOCOL_SSP                = 0x08,
-};
+static inline int sas_protocol_ata(enum sas_protocol proto)
+{
+       return ((proto & SAS_PROTOCOL_SATA) ||
+               (proto & SAS_PROTOCOL_STP))? 1 : 0;
+}
 
 enum sas_linkrate {
-       SAS_LINK_RATE_UNKNOWN,
-       SAS_PHY_DISABLED,
-       SAS_LINK_RATE_FAILED,
-       SAS_SATA_SPINUP_HOLD,
-       SAS_SATA_PORT_SELECTOR,
-       SAS_LINK_RATE_1_5_GBPS,
-       SAS_LINK_RATE_3_0_GBPS,
-       SAS_LINK_RATE_6_0_GBPS,
-       SAS_LINK_VIRTUAL,
+       /* These Values are defined in the SAS standard */
+       SAS_LINK_RATE_UNKNOWN = 0,
+       SAS_PHY_DISABLED = 1,
+       SAS_PHY_RESET_PROBLEM = 2,
+       SAS_SATA_SPINUP_HOLD = 3,
+       SAS_SATA_PORT_SELECTOR = 4,
+       SAS_PHY_RESET_IN_PROGRESS = 5,
+       SAS_LINK_RATE_1_5_GBPS = 8,
+       SAS_LINK_RATE_G1 = SAS_LINK_RATE_1_5_GBPS,
+       SAS_LINK_RATE_3_0_GBPS = 9,
+       SAS_LINK_RATE_G2 = SAS_LINK_RATE_3_0_GBPS,
+       SAS_LINK_RATE_6_0_GBPS = 10,
+       /* These are virtual to the transport class and may never
+        * be signalled normally since the standard defined field
+        * is only 4 bits */
+       SAS_LINK_RATE_FAILED = 0x10,
+       SAS_PHY_VIRTUAL = 0x11,
 };
 
 struct sas_identify {
@@ -46,6 +54,7 @@ struct sas_identify {
 struct sas_phy {
        struct device           dev;
        int                     number;
+       int                     enabled;
 
        /* phy identification */
        struct sas_identify     identify;
@@ -57,9 +66,6 @@ struct sas_phy {
        enum sas_linkrate       maximum_linkrate_hw;
        enum sas_linkrate       maximum_linkrate;
 
-       /* internal state */
-       unsigned int            local_attached : 1;
-
        /* link error statistics */
        u32                     invalid_dword_count;
        u32                     running_disparity_error_count;
@@ -68,26 +74,30 @@ struct sas_phy {
 
        /* for the list of phys belonging to a port */
        struct list_head        port_siblings;
+
+       struct work_struct      reset_work;
 };
 
 #define dev_to_phy(d) \
        container_of((d), struct sas_phy, dev)
-#define transport_class_to_phy(cdev) \
-       dev_to_phy((cdev)->dev)
+#define transport_class_to_phy(dev) \
+       dev_to_phy((dev)->parent)
 #define phy_to_shost(phy) \
        dev_to_shost((phy)->dev.parent)
 
+struct request_queue;
 struct sas_rphy {
        struct device           dev;
        struct sas_identify     identify;
        struct list_head        list;
+       struct request_queue    *q;
        u32                     scsi_target_id;
 };
 
 #define dev_to_rphy(d) \
        container_of((d), struct sas_rphy, dev)
-#define transport_class_to_rphy(cdev) \
-       dev_to_rphy((cdev)->dev)
+#define transport_class_to_rphy(dev) \
+       dev_to_rphy((dev)->parent)
 #define rphy_to_shost(rphy) \
        dev_to_shost((rphy)->dev.parent)
 #define target_to_rphy(targ) \
@@ -106,6 +116,7 @@ struct sas_end_device {
 
 struct sas_expander_device {
        int    level;
+       int    next_port_id;
 
        #define SAS_EXPANDER_VENDOR_ID_LEN      8
        char   vendor_id[SAS_EXPANDER_VENDOR_ID_LEN+1];
@@ -127,8 +138,10 @@ struct sas_expander_device {
 struct sas_port {
        struct device           dev;
 
-       u8                      port_identifier;
+       int                     port_identifier;
        int                     num_phys;
+       /* port flags */
+       unsigned int            is_backlink:1;
 
        /* the other end of the link */
        struct sas_rphy         *rphy;
@@ -139,8 +152,13 @@ struct sas_port {
 
 #define dev_to_sas_port(d) \
        container_of((d), struct sas_port, dev)
-#define transport_class_to_sas_port(cdev) \
-       dev_to_sas_port((cdev)->dev)
+#define transport_class_to_sas_port(dev) \
+       dev_to_sas_port((dev)->parent)
+
+struct sas_phy_linkrates {
+       enum sas_linkrate maximum_linkrate;
+       enum sas_linkrate minimum_linkrate;
+};
 
 /* The functions by which the transport class and the driver communicate */
 struct sas_function_template {
@@ -148,6 +166,9 @@ struct sas_function_template {
        int (*get_enclosure_identifier)(struct sas_rphy *, u64 *);
        int (*get_bay_identifier)(struct sas_rphy *);
        int (*phy_reset)(struct sas_phy *, int);
+       int (*phy_enable)(struct sas_phy *, int);
+       int (*set_phy_speed)(struct sas_phy *, struct sas_phy_linkrates *);
+       int (*smp_handler)(struct Scsi_Host *, struct sas_rphy *, struct request *);
 };
 
 
@@ -164,15 +185,18 @@ extern struct sas_rphy *sas_end_device_alloc(struct sas_port *);
 extern struct sas_rphy *sas_expander_alloc(struct sas_port *, enum sas_device_type);
 void sas_rphy_free(struct sas_rphy *);
 extern int sas_rphy_add(struct sas_rphy *);
+extern void sas_rphy_remove(struct sas_rphy *);
 extern void sas_rphy_delete(struct sas_rphy *);
 extern int scsi_is_sas_rphy(const struct device *);
 
 struct sas_port *sas_port_alloc(struct device *, int);
+struct sas_port *sas_port_alloc_num(struct device *);
 int sas_port_add(struct sas_port *);
 void sas_port_free(struct sas_port *);
 void sas_port_delete(struct sas_port *);
 void sas_port_add_phy(struct sas_port *, struct sas_phy *);
 void sas_port_delete_phy(struct sas_port *, struct sas_phy *);
+void sas_port_mark_backlink(struct sas_port *);
 int scsi_is_sas_port(const struct device *);
 
 extern struct scsi_transport_template *
@@ -191,4 +215,6 @@ scsi_is_sas_expander_device(struct device *dev)
                rphy->identify.device_type == SAS_EDGE_EXPANDER_DEVICE;
 }
 
+#define scsi_is_sas_phy_local(phy)     scsi_is_host_device((phy)->dev.parent)
+
 #endif /* SCSI_TRANSPORT_SAS_H */