[SCSI] libsas: fix warnings when checking sata/stp protocol

[firefly-linux-kernel-4.4.55.git] / include / scsi / sas.h

diff --git a/include/scsi/sas.h b/include/scsi/sas.h
index 2f4b6afa34fc3ae20015c0e18a29aa982a45bfc3..cfdbe9501593f4037fde241f211e9e2f9ffa0185 100644 (file)
--- a/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@ -102,13 +102,13 @@ enum sas_dev_type {
        SATA_PM_PORT= 8,
 };
 
-/* Partly from IDENTIFY address frame. */
-enum sas_proto {
-       SATA_PROTO    = 1,
-       SAS_PROTO_SMP = 2,        /* protocol */
-       SAS_PROTO_STP = 4,        /* protocol */
-       SAS_PROTO_SSP = 8,        /* protocol */
-       SAS_PROTO_ALL = 0xE,
+enum sas_protocol {
+       SAS_PROTOCOL_SATA               = 0x01,
+       SAS_PROTOCOL_SMP                = 0x02,
+       SAS_PROTOCOL_STP                = 0x04,
+       SAS_PROTOCOL_SSP                = 0x08,
+       SAS_PROTOCOL_ALL                = 0x0E,
+       SAS_PROTOCOL_STP_ALL            = SAS_PROTOCOL_STP|SAS_PROTOCOL_SATA,
 };
 
 /* From the spec; local phys only */
@@ -196,6 +196,14 @@ enum sas_open_rej_reason {
        SAS_OREJ_RSVD_RETRY = 18,
 };
 
+enum sas_gpio_reg_type {
+       SAS_GPIO_REG_CFG   = 0,
+       SAS_GPIO_REG_RX    = 1,
+       SAS_GPIO_REG_RX_GP = 2,
+       SAS_GPIO_REG_TX    = 3,
+       SAS_GPIO_REG_TX_GP = 4,
+};
+
 struct  dev_to_host_fis {
        u8     fis_type;          /* 0x34 */
        u8     flags;
@@ -342,7 +350,12 @@ struct report_general_resp {
 
        u8      conf_route_table:1;
        u8      configuring:1;
-       u8      _r_b:6;
+       u8      config_others:1;
+       u8      orej_retry_supp:1;
+       u8      stp_cont_awt:1;
+       u8      self_config:1;
+       u8      zone_config:1;
+       u8      t2t_supp:1;
 
        u8      _r_c;
 
@@ -529,7 +542,12 @@ struct report_general_resp {
        u8      _r_a;
        u8      num_phys;
 
-       u8      _r_b:6;
+       u8      t2t_supp:1;
+       u8      zone_config:1;
+       u8      self_config:1;
+       u8      stp_cont_awt:1;
+       u8      orej_retry_supp:1;
+       u8      config_others:1;
        u8      configuring:1;
        u8      conf_route_table:1;