Merge remote-tracking branch 'scsi/for-next'

[deliverable/linux.git] / drivers / scsi / hisi_sas / hisi_sas.h

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 4731d324132361f011221055b8516a58e94b9dab..ca55ec2974e0902a46ab5fca922086975fa2794e 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -23,7 +23,7 @@
 #include <scsi/sas_ata.h>
 #include <scsi/libsas.h>
 
-#define DRV_VERSION "v1.5"
+#define DRV_VERSION "v1.6"
 
 #define HISI_SAS_MAX_PHYS      9
 #define HISI_SAS_MAX_QUEUES    32
@@ -56,6 +56,11 @@ enum dev_status {
        HISI_SAS_DEV_EH,
 };
 
+enum {
+       HISI_SAS_INT_ABT_CMD = 0,
+       HISI_SAS_INT_ABT_DEV = 1,
+};
+
 enum hisi_sas_dev_type {
        HISI_SAS_DEV_TYPE_STP = 0,
        HISI_SAS_DEV_TYPE_SSP,
@@ -146,6 +151,9 @@ struct hisi_sas_hw {
                        struct hisi_sas_slot *slot);
        int (*prep_stp)(struct hisi_hba *hisi_hba,
                        struct hisi_sas_slot *slot);
+       int (*prep_abort)(struct hisi_hba *hisi_hba,
+                         struct hisi_sas_slot *slot,
+                         int device_id, int abort_flag, int tag_to_abort);
        int (*slot_complete)(struct hisi_hba *hisi_hba,
                             struct hisi_sas_slot *slot, int abort);
        void (*phy_enable)(struct hisi_hba *hisi_hba, int phy_no);