scsi: hisi_sas: update PHY linkrate after a controller reset

[linux-2.6-microblaze.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 e7fd287..4410538 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -137,7 +137,6 @@ struct hisi_sas_phy {
        struct asd_sas_phy      sas_phy;
        struct sas_identify     identify;
        u64             port_id; /* from hw */
-       u64             dev_sas_addr;
        u64             frame_rcvd_size;
        u8              frame_rcvd[32];
        u8              phy_attached;
@@ -174,8 +173,6 @@ struct hisi_sas_device {
        struct completion *completion;
        struct hisi_sas_dq      *dq;
        struct list_head        list;
-       u64 attached_phy;
-       atomic64_t running_req;
        enum sas_device_type    dev_type;
        int device_id;
        int sata_idx;
@@ -199,6 +196,7 @@ struct hisi_sas_slot {
        dma_addr_t cmd_hdr_dma;
        struct work_struct abort_slot;
        struct timer_list internal_abort_timer;
+       bool is_internal;
 };
 
 struct hisi_sas_tmf_task {
@@ -412,7 +410,7 @@ struct hisi_sas_command_table_ssp {
        union {
                struct {
                        struct ssp_command_iu task;
-                       u32 prot[6];
+                       u32 prot[7];
                };
                struct ssp_tmf_iu ssp_task;
                struct xfer_rdy_iu xfer_rdy;
@@ -441,7 +439,6 @@ extern struct scsi_transport_template *hisi_sas_stt;
 extern struct scsi_host_template *hisi_sas_sht;
 
 extern void hisi_sas_stop_phys(struct hisi_hba *hisi_hba);
-extern void hisi_sas_init_add(struct hisi_hba *hisi_hba);
 extern int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost);
 extern void hisi_sas_free(struct hisi_hba *hisi_hba);
 extern u8 hisi_sas_get_ata_protocol(struct host_to_dev_fis *fis,
@@ -466,4 +463,5 @@ extern void hisi_sas_kill_tasklets(struct hisi_hba *hisi_hba);
 extern bool hisi_sas_notify_phy_event(struct hisi_sas_phy *phy,
                                enum hisi_sas_phy_event event);
 extern void hisi_sas_release_tasks(struct hisi_hba *hisi_hba);
+extern u8 hisi_sas_get_prog_phy_linkrate_mask(enum sas_linkrate max);
 #endif