isci: removing intel_*.h headers

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

drivers/scsi/isci/core/intel_sas.h

-/*
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * BSD LICENSE
- *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Intel Corporation nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _INTEL_SAS_H_
-#define _INTEL_SAS_H_
-
-/**
- * This file contains all of the definitions relating to structures, constants,
- *    etc. defined by the SAS specification.
- *
- *
- */
-#include <linux/kernel.h>
-#include "intel_scsi.h"
-
-/**
- * struct sci_sas_address - This structure depicts how a SAS address is
- *    represented by SCI.
- *
- *
- */
-struct sci_sas_address {
-	/**
-	 * This member contains the higher 32-bits of the SAS address.
-	 */
-	u32 high;
-
-	/**
-	 * This member contains the lower 32-bits of the SAS address.
-	 */
-	u32 low;
-
-};
-
-/**
- * enum _SCI_SAS_TASK_ATTRIBUTE - This enumeration depicts the SAM/SAS
- *    specification defined task attribute values for a command information
- *    unit.
- *
- *
- */
-enum sci_sas_task_attribute {
-	SCI_SAS_SIMPLE_ATTRIBUTE = 0,
-	SCI_SAS_HEAD_OF_QUEUE_ATTRIBUTE = 1,
-	SCI_SAS_ORDERED_ATTRIBUTE = 2,
-	SCI_SAS_ACA_ATTRIBUTE = 4,
-};
-
-/**
- * enum _SCI_SAS_TASK_MGMT_FUNCTION - This enumeration depicts the SAM/SAS
- *    specification defined task management functions.
- *
- * This HARD_RESET function listed here is not actually defined as a task
- * management function in the industry standard.
- */
-enum sci_sas_task_mgmt_function {
-	SCI_SAS_ABORT_TASK = SCSI_TASK_REQUEST_ABORT_TASK,
-	SCI_SAS_ABORT_TASK_SET = SCSI_TASK_REQUEST_ABORT_TASK_SET,
-	SCI_SAS_CLEAR_TASK_SET = SCSI_TASK_REQUEST_CLEAR_TASK_SET,
-	SCI_SAS_LOGICAL_UNIT_RESET = SCSI_TASK_REQUEST_LOGICAL_UNIT_RESET,
-	SCI_SAS_I_T_NEXUS_RESET = SCSI_TASK_REQUEST_I_T_NEXUS_RESET,
-	SCI_SAS_CLEAR_ACA = SCSI_TASK_REQUEST_CLEAR_ACA,
-	SCI_SAS_QUERY_TASK = SCSI_TASK_REQUEST_QUERY_TASK,
-	SCI_SAS_QUERY_TASK_SET = SCSI_TASK_REQUEST_QUERY_TASK_SET,
-	SCI_SAS_QUERY_ASYNCHRONOUS_EVENT = SCSI_TASK_REQUEST_QUERY_UNIT_ATTENTION,
-	SCI_SAS_HARD_RESET = 0xFF
-};
-
-
-/**
- * enum _SCI_SAS_FRAME_TYPE - This enumeration depicts the SAS specification
- *    defined SSP frame types.
- *
- *
- */
-enum sci_sas_frame_type {
-	SCI_SAS_DATA_FRAME = 0x01,
-	SCI_SAS_XFER_RDY_FRAME = 0x05,
-	SCI_SAS_COMMAND_FRAME = 0x06,
-	SCI_SAS_RESPONSE_FRAME = 0x07,
-	SCI_SAS_TASK_FRAME = 0x16
-};
-
-#define PHY_OPERATION_NOP               0x00
-#define PHY_OPERATION_LINK_RESET        0x01
-#define PHY_OPERATION_HARD_RESET        0x02
-#define PHY_OPERATION_DISABLE           0x03
-#define PHY_OPERATION_CLEAR_ERROR_LOG   0x05
-#define PHY_OPERATION_CLEAR_AFFILIATION 0x06
-
-#define NPLR_PHY_ENABLED_UNK_LINK_RATE 0x00
-#define NPLR_PHY_DISABLED     0x01
-#define NPLR_PHY_ENABLED_SPD_NEG_FAILED   0x02
-#define NPLR_PHY_ENABLED_SATA_HOLD  0x03
-#define NPLR_PHY_ENABLED_1_5G    0x08
-#define NPLR_PHY_ENABLED_3_0G    0x09
-
-/* SMP Function Result values. */
-#define SMP_RESULT_FUNCTION_ACCEPTED              0x00
-#define SMP_RESULT_UNKNOWN_FUNCTION               0x01
-#define SMP_RESULT_FUNCTION_FAILED                0x02
-#define SMP_RESULT_INVALID_REQUEST_FRAME_LEN      0x03
-#define SMP_RESULT_INAVALID_EXPANDER_CHANGE_COUNT 0x04
-#define SMP_RESULT_BUSY                           0x05
-#define SMP_RESULT_INCOMPLETE_DESCRIPTOR_LIST     0x06
-#define SMP_RESULT_PHY_DOES_NOT_EXIST             0x10
-#define SMP_RESULT_INDEX_DOES_NOT_EXIST           0x11
-#define SMP_RESULT_PHY_DOES_NOT_SUPPORT_SATA      0x12
-#define SMP_RESULT_UNKNOWN_PHY_OPERATION          0x13
-#define SMP_RESULT_UNKNOWN_PHY_TEST_FUNCTION      0x14
-#define SMP_RESULT_PHY_TEST_IN_PROGRESS           0x15
-#define SMP_RESULT_PHY_VACANT                     0x16
-
-/* Attached Device Types */
-#define SMP_NO_DEVICE_ATTACHED      0
-#define SMP_END_DEVICE_ONLY         1
-#define SMP_EDGE_EXPANDER_DEVICE    2
-#define SMP_FANOUT_EXPANDER_DEVICE  3
-
-/* Expander phy routine attribute */
-#define DIRECT_ROUTING_ATTRIBUTE        0
-#define SUBTRACTIVE_ROUTING_ATTRIBUTE   1
-#define TABLE_ROUTING_ATTRIBUTE         2
-
-#endif /* _INTEL_SAS_H_ */
-

drivers/scsi/isci/core/scic_config_parameters.h

@@ -66,7 +66,6 @@
 
 
 #include "sci_status.h"
-#include "intel_sas.h"
 #include "sci_controller_constants.h"
 #include "probe_roms.h"
 

drivers/scsi/isci/core/scic_io_request.h

@@ -63,9 +63,8 @@
  * Determine the failure situations and return values.
  */
 
-
+#include <linux/kernel.h>
 #include "sci_status.h"
-#include "intel_sas.h"
 
 struct scic_sds_request;
 struct scic_sds_remote_device;
@@ -110,8 +109,7 @@ typedef enum {
  *
  * Return the size of the SCI IO request object.
  */
-u32 scic_io_request_get_object_size(
-	void);
+u32 scic_io_request_get_object_size(void);
 
 /**
  * scic_io_request_construct() - This method is called by the SCI user to

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_sas.h"
 
 struct scic_sds_phy;
 struct scic_sds_port;

drivers/scsi/isci/core/scic_port.h

@@ -56,9 +56,9 @@
 #ifndef _SCIC_PORT_H_
 #define _SCIC_PORT_H_
 
+#include "sas.h"
 #include "sci_status.h"
 #include "scic_phy.h"
-#include "intel_sas.h"
 
 struct scic_sds_port;
 

drivers/scsi/isci/core/scic_sds_phy.h

@@ -56,7 +56,7 @@
 #ifndef _SCIC_SDS_PHY_H_
 #define _SCIC_SDS_PHY_H_
 
-#include "intel_sas.h"
+#include "sas.h"
 #include "scic_phy.h"
 #include "scu_registers.h"
 #include "sci_base_state_machine.h"

drivers/scsi/isci/core/scic_sds_port.c

@@ -53,8 +53,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sas.h"
-#include "intel_sas.h"
 #include "scic_controller.h"
 #include "scic_phy.h"
 #include "scic_port.h"

drivers/scsi/isci/core/scic_sds_port.h

@@ -57,8 +57,8 @@
 #define _SCIC_SDS_PORT_H_
 
 #include <linux/kernel.h>
+#include "sas.h"
 #include "sci_controller_constants.h"
-#include "intel_sas.h"
 #include "scu_registers.h"
 
 #define SCIC_SDS_DUMMY_PORT   0xFF

drivers/scsi/isci/core/scic_sds_request.c

@@ -54,8 +54,6 @@
  */
 
 #include <scsi/sas.h>
-#include "sas.h"
-#include "intel_sas.h"
 #include "scic_controller.h"
 #include "scic_io_request.h"
 #include "scic_sds_controller.h"
@@ -503,7 +501,7 @@ static void scu_ssp_io_request_construct_task_context(
 
 	task_context->ssp_command_iu_length =
 		sizeof(struct ssp_cmd_iu) / sizeof(u32);
-	task_context->type.ssp.frame_type = SCI_SAS_COMMAND_FRAME;
+	task_context->type.ssp.frame_type = SSP_COMMAND;
 
 	switch (dir) {
 	case DMA_FROM_DEVICE:
@@ -573,7 +571,7 @@ static void scu_ssp_task_request_construct_task_context(
 	task_context->priority                     = SCU_TASK_PRIORITY_HIGH;
 	task_context->task_type                    = SCU_TASK_TYPE_RAW_FRAME;
 	task_context->transfer_length_bytes        = 0;
-	task_context->type.ssp.frame_type          = SCI_SAS_TASK_FRAME;
+	task_context->type.ssp.frame_type          = SSP_TASK;
 	task_context->ssp_command_iu_length =
 		sizeof(struct ssp_task_iu) / sizeof(u32);
 }

drivers/scsi/isci/core/scic_sds_request.h

@@ -66,7 +66,6 @@
 #include "scic_io_request.h"
 #include "sci_base_state_machine.h"
 #include "scu_task_context.h"
-#include "intel_sas.h"
 
 struct scic_sds_controller;
 struct scic_sds_remote_device;

drivers/scsi/isci/core/scic_sds_smp_request.c

@@ -54,8 +54,6 @@
  */
 
 #include <scsi/sas.h>
-#include "sas.h"
-#include "intel_sas.h"
 #include "sci_base_state_machine.h"
 #include "scic_controller.h"
 #include "scic_sds_controller.h"

drivers/scsi/isci/core/scic_sds_smp_request.h

@@ -55,7 +55,6 @@
 #ifndef _SCIC_SDS_SMP_REQUEST_T_
 #define _SCIC_SDS_SMP_REQUEST_T_
 
-#include "intel_sas.h"
 #include "scic_sds_request.h"
 
 

drivers/scsi/isci/core/scic_sds_ssp_request.c

@@ -53,7 +53,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "intel_sas.h"
 #include "sci_base_state_machine.h"
 #include "scic_controller.h"
 #include "scic_sds_controller.h"

drivers/scsi/isci/core/scic_sds_stp_packet_request.h

@@ -55,7 +55,6 @@
 #ifndef _SCIC_SDS_STP_PACKET_REQUEST_H_
 #define _SCIC_SDS_STP_PACKET_REQUEST_H_
 
-#include "intel_sas.h"
 #include "scic_sds_stp_request.h"
 
 /**

drivers/scsi/isci/remote_device.c

@@ -53,8 +53,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <scsi/sas.h>
-#include "intel_sas.h"
-#include "sas.h"
 #include "isci.h"
 #include "port.h"
 #include "remote_device.h"

drivers/scsi/isci/remote_device.h

@@ -57,7 +57,6 @@
 #define _ISCI_REMOTE_DEVICE_H_
 #include <scsi/libsas.h>
 #include "sci_status.h"
-#include "intel_sas.h"
 #include "scu_remote_node_context.h"
 #include "remote_node_context.h"
 #include "port.h"

drivers/scsi/isci/sas.h

@@ -215,4 +215,14 @@ struct smp_req {
 
 #define SMP_RESP_HDR_SZ	4
 
+/*
+ * struct sci_sas_address - This structure depicts how a SAS address is
+ *    represented by SCI.
+ * XXX convert this to u8 [SAS_ADDR_SIZE] like the rest of libsas
+ *
+ */
+struct sci_sas_address {
+	u32 high;
+	u32 low;
+};
 #endif