linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / scsi / scsi_transport_sas.h

diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 6cc2314..b91400b 100644 (file)
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -3,7 +3,6 @@
 
 #include <linux/transport_class.h>
 #include <linux/types.h>
-#include <linux/mutex.h>
 
 struct scsi_transport_template;
 struct sas_rphy;
@@ -31,7 +30,6 @@ enum sas_linkrate {
        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,
 };
 
@@ -56,6 +54,7 @@ struct sas_phy {
        enum sas_linkrate       minimum_linkrate;
        enum sas_linkrate       maximum_linkrate_hw;
        enum sas_linkrate       maximum_linkrate;
+       u8                      port_identifier;
 
        /* internal state */
        unsigned int            local_attached : 1;
@@ -66,8 +65,8 @@ struct sas_phy {
        u32                     loss_of_dword_sync_count;
        u32                     phy_reset_problem_count;
 
-       /* for the list of phys belonging to a port */
-       struct list_head        port_siblings;
+       /* the other end of the link */
+       struct sas_rphy         *rphy;
 };
 
 #define dev_to_phy(d) \
@@ -90,71 +89,15 @@ struct sas_rphy {
        dev_to_rphy((cdev)->dev)
 #define rphy_to_shost(rphy) \
        dev_to_shost((rphy)->dev.parent)
-#define target_to_rphy(targ) \
-       dev_to_rphy((targ)->dev.parent)
-
-struct sas_end_device {
-       struct sas_rphy         rphy;
-       /* flags */
-       unsigned                ready_led_meaning:1;
-       /* parameters */
-       u16                     I_T_nexus_loss_timeout;
-       u16                     initiator_response_timeout;
-};
-#define rphy_to_end_device(r) \
-       container_of((r), struct sas_end_device, rphy)
-
-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];
-       #define SAS_EXPANDER_PRODUCT_ID_LEN     16
-       char   product_id[SAS_EXPANDER_PRODUCT_ID_LEN+1];
-       #define SAS_EXPANDER_PRODUCT_REV_LEN    4
-       char   product_rev[SAS_EXPANDER_PRODUCT_REV_LEN+1];
-       #define SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN    8
-       char   component_vendor_id[SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN+1];
-       u16    component_id;
-       u8     component_revision_id;
-
-       struct sas_rphy         rphy;
-
-};
-#define rphy_to_expander_device(r) \
-       container_of((r), struct sas_expander_device, rphy)
-
-struct sas_port {
-       struct device           dev;
 
-       int                     port_identifier;
-       int                     num_phys;
-       /* port flags */
-       unsigned int            is_backlink:1;
-
-       /* the other end of the link */
-       struct sas_rphy         *rphy;
-
-       struct mutex            phy_list_mutex;
-       struct list_head        phy_list;
-};
-
-#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)
 
 /* The functions by which the transport class and the driver communicate */
 struct sas_function_template {
        int (*get_linkerrors)(struct sas_phy *);
-       int (*get_enclosure_identifier)(struct sas_rphy *, u64 *);
-       int (*get_bay_identifier)(struct sas_rphy *);
        int (*phy_reset)(struct sas_phy *, int);
 };
 
 
-void sas_remove_children(struct device *);
 extern void sas_remove_host(struct Scsi_Host *);
 
 extern struct sas_phy *sas_phy_alloc(struct device *, int);
@@ -163,37 +106,14 @@ extern int sas_phy_add(struct sas_phy *);
 extern void sas_phy_delete(struct sas_phy *);
 extern int scsi_is_sas_phy(const struct device *);
 
-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);
+extern struct sas_rphy *sas_rphy_alloc(struct sas_phy *);
 void sas_rphy_free(struct sas_rphy *);
 extern int sas_rphy_add(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 *
 sas_attach_transport(struct sas_function_template *);
 extern void sas_release_transport(struct scsi_transport_template *);
-int sas_read_port_mode_page(struct scsi_device *);
-
-static inline int
-scsi_is_sas_expander_device(struct device *dev)
-{
-       struct sas_rphy *rphy;
-       if (!scsi_is_sas_rphy(dev))
-               return 0;
-       rphy = dev_to_rphy(dev);
-       return rphy->identify.device_type == SAS_FANOUT_EXPANDER_DEVICE ||
-               rphy->identify.device_type == SAS_EDGE_EXPANDER_DEVICE;
-}
 
 #endif /* SCSI_TRANSPORT_SAS_H */