---

yaml --- r: 254461 b: refs/heads/master c: e76d618 h: refs/heads/master i: 254459: ec41527 v: v3
git-mirror · Jul 3, 2011 · 20e13d6 · 20e13d6
1 parent 5cd2955
commit 20e13d6
Show file tree

Hide file tree

Showing 14 changed files with 281 additions and 1,181 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f300806fe186a6c45020a444667755edcce672
+refs/heads/master: e76d6180da436edf2cc3538cbed1f5b02b614613
diff --git a/trunk/drivers/scsi/isci/core/intel_ata.h b/trunk/drivers/scsi/isci/core/intel_ata.h
diff --git a/trunk/drivers/scsi/isci/core/intel_sas.h b/trunk/drivers/scsi/isci/core/intel_sas.h
@@ -62,8 +62,7 @@
  *
  *
  */
-
-#include "intel_sata.h"
+#include <linux/kernel.h>
 #include "intel_scsi.h"
 
 /**

diff --git a/trunk/drivers/scsi/isci/core/intel_sata.h b/trunk/drivers/scsi/isci/core/intel_sata.h
diff --git a/trunk/drivers/scsi/isci/core/scic_phy.h b/trunk/drivers/scsi/isci/core/scic_phy.h
@@ -67,7 +67,6 @@
 #include <scsi/sas.h>
 #include <scsi/libsas.h>
 #include "sci_status.h"
-#include "intel_sata.h"
 #include "intel_sas.h"
 
 struct scic_sds_phy;

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_phy.c b/trunk/drivers/scsi/isci/core/scic_sds_phy.c
@@ -54,8 +54,7 @@
  */
 
 #include <scsi/sas.h>
-#include "intel_ata.h"
-#include "intel_sata.h"
+#include "sas.h"
 #include "sci_base_state.h"
 #include "sci_base_state_machine.h"
 #include "scic_phy.h"
@@ -1279,34 +1278,30 @@ static enum sci_status scic_sds_phy_starting_substate_await_sig_fis_frame_handle
 	u32 frame_index)
 {
 	enum sci_status result;
-	u32 *frame_words;
-	struct sata_fis_header *fis_frame_header;
+	struct dev_to_host_fis *frame_header;
 	u32 *fis_frame_data;
 
 	result = scic_sds_unsolicited_frame_control_get_header(
 		&(scic_sds_phy_get_controller(sci_phy)->uf_control),
 		frame_index,
-		(void **)&frame_words);
+		(void **)&frame_header);
 
-	if (result != SCI_SUCCESS) {
+	if (result != SCI_SUCCESS)
 		return result;
-	}
-
-	fis_frame_header = (struct sata_fis_header *)frame_words;
 
-	if ((fis_frame_header->fis_type == SATA_FIS_TYPE_REGD2H) &&
-	    !(fis_frame_header->status & ATA_STATUS_REG_BSY_BIT)) {
+	if ((frame_header->fis_type == FIS_REGD2H) &&
+	    !(frame_header->status & ATA_BUSY)) {
 		scic_sds_unsolicited_frame_control_get_buffer(
 			&(scic_sds_phy_get_controller(sci_phy)->uf_control),
 			frame_index,
 			(void **)&fis_frame_data);
 
 		scic_sds_controller_copy_sata_response(
 			&sci_phy->phy_type.sata.signature_fis_buffer,
-			frame_words,
+			frame_header,
 			fis_frame_data);
 
-		/* We got the IAF we can now go to the await spinup semaphore state */
+		/* got IAF we can now go to the await spinup semaphore state */
 		sci_base_state_machine_change_state(&sci_phy->starting_substate_machine,
 						    SCIC_SDS_PHY_STARTING_SUBSTATE_FINAL);
 
@@ -1318,7 +1313,7 @@ static enum sci_status scic_sds_phy_starting_substate_await_sig_fis_frame_handle
 			 __func__,
 			 frame_index);
 
-	/* Regardless of the result release this frame since we are done with it */
+	/* Regardless of the result we are done with this frame with it */
 	scic_sds_controller_release_frame(scic_sds_phy_get_controller(sci_phy),
 					  frame_index);
 

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_phy.h b/trunk/drivers/scsi/isci/core/scic_sds_phy.h
@@ -56,7 +56,6 @@
 #ifndef _SCIC_SDS_PHY_H_
 #define _SCIC_SDS_PHY_H_
 
-#include "intel_sata.h"
 #include "intel_sas.h"
 #include "scu_registers.h"
 #include "sci_base_state_machine.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,8 +62,7 @@ @@
      *
      *
      */
-    #include "intel_sata.h"
+    #include <linux/kernel.h>
     #include "intel_scsi.h"
     /**
@@ Expand Down @@