scsi: pm80xx: redefine sas_identify_frame structure

sas_identify structure defined by pm80xx doesn't have CRC field.  So
added a new sas_identify structure without CRC.

Signed-off-by: Raj Dinesh <Raj.Dinesh@microsemi.com>
Signed-off-by: Viswas G <Viswas.G@microsemi.com>
Acked-by: Jack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.h b/drivers/scsi/pm8001/pm80xx_hwi.h
index 7a443ba..82b8cf5 100644 (file)
--- a/drivers/scsi/pm8001/pm80xx_hwi.h
+++ b/drivers/scsi/pm8001/pm80xx_hwi.h
@@ -229,6 +229,102 @@
 #define IT_NEXUS_TIMEOUT       0x7D0
 #define PORT_RECOVERY_TIMEOUT  ((IT_NEXUS_TIMEOUT/100) + 30)
 
+#ifdef __LITTLE_ENDIAN_BITFIELD
+struct sas_identify_frame_local {
+       /* Byte 0 */
+       u8  frame_type:4;
+       u8  dev_type:3;
+       u8  _un0:1;
+
+       /* Byte 1 */
+       u8  _un1;
+
+       /* Byte 2 */
+       union {
+               struct {
+                       u8  _un20:1;
+                       u8  smp_iport:1;
+                       u8  stp_iport:1;
+                       u8  ssp_iport:1;
+                       u8  _un247:4;
+               };
+               u8 initiator_bits;
+       };
+
+       /* Byte 3 */
+       union {
+               struct {
+                       u8  _un30:1;
+                       u8 smp_tport:1;
+                       u8 stp_tport:1;
+                       u8 ssp_tport:1;
+                       u8 _un347:4;
+               };
+               u8 target_bits;
+       };
+
+       /* Byte 4 - 11 */
+       u8 _un4_11[8];
+
+       /* Byte 12 - 19 */
+       u8 sas_addr[SAS_ADDR_SIZE];
+
+       /* Byte 20 */
+       u8 phy_id;
+
+       u8 _un21_27[7];
+
+} __packed;
+
+#elif defined(__BIG_ENDIAN_BITFIELD)
+struct sas_identify_frame_local {
+       /* Byte 0 */
+       u8  _un0:1;
+       u8  dev_type:3;
+       u8  frame_type:4;
+
+       /* Byte 1 */
+       u8  _un1;
+
+       /* Byte 2 */
+       union {
+               struct {
+                       u8  _un247:4;
+                       u8  ssp_iport:1;
+                       u8  stp_iport:1;
+                       u8  smp_iport:1;
+                       u8  _un20:1;
+               };
+               u8 initiator_bits;
+       };
+
+       /* Byte 3 */
+       union {
+               struct {
+                       u8 _un347:4;
+                       u8 ssp_tport:1;
+                       u8 stp_tport:1;
+                       u8 smp_tport:1;
+                       u8 _un30:1;
+               };
+               u8 target_bits;
+       };
+
+       /* Byte 4 - 11 */
+       u8 _un4_11[8];
+
+       /* Byte 12 - 19 */
+       u8 sas_addr[SAS_ADDR_SIZE];
+
+       /* Byte 20 */
+       u8 phy_id;
+
+       u8 _un21_27[7];
+} __packed;
+#else
+#error "Bitfield order not defined!"
+#endif
+
 struct mpi_msg_hdr {
        __le32  header; /* Bits [11:0] - Message operation code */
        /* Bits [15:12] - Message Category */
@@ -248,7 +344,7 @@ struct mpi_msg_hdr {
 struct phy_start_req {
        __le32  tag;
        __le32  ase_sh_lm_slr_phyid;
-       struct sas_identify_frame sas_identify; /* 28 Bytes */
+       struct sas_identify_frame_local sas_identify; /* 28 Bytes */
        __le32 spasti;
        u32     reserved[21];
 } __attribute__((packed, aligned(4)));