[SCSI] iscsi_tcp: make padbuf non-static

[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 87de518..61ad359 100644 (file)
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -4,24 +4,24 @@
 #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 {
        /* These Values are defined in the SAS standard */
@@ -54,6 +54,7 @@ struct sas_identify {
 struct sas_phy {
        struct device           dev;
        int                     number;
+       int                     enabled;
 
        /* phy identification */
        struct sas_identify     identify;
@@ -73,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) \
@@ -147,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 {
@@ -156,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 *);
 };
 
 
@@ -172,6 +185,7 @@ 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 *);