isci: merge stp request substates into primary state machine (5dec6f4e) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/scsi/isci/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -6,5 +6,4 @@ isci-objs := init.o phy.o request.o sata.o \
		remote_node_context.o \
		remote_node_table.o \
		unsolicited_frame_control.o \
		stp_request.o \
		port_config.o \

drivers/scsi/isci/request.c

+1498 −151

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/isci/request.h

+95 −18

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@
		#include "isci.h"
		#include "host.h"
		#include "scu_task_context.h"
		#include "stp_request.h"

		/**
		* struct isci_request_status - This enum defines the possible states of an I/O
		@@ -90,6 +89,63 @@ enum sci_request_protocol {
		SCIC_STP_PROTOCOL
		}; /* XXX remove me, use sas_task.{dev\|task_proto} instead */;

		struct scic_sds_stp_request {
		union {
		u32 ncq;

		u32 udma;

		struct scic_sds_stp_pio_request {
		/**
		* Total transfer for the entire PIO request recorded at request constuction
		* time.
		*
		* @todo Should we just decrement this value for each byte of data transitted
		* or received to elemenate the current_transfer_bytes field?
		*/
		u32 total_transfer_bytes;

		/**
		* Total number of bytes received/transmitted in data frames since the start
		* of the IO request. At the end of the IO request this should equal the
		* total_transfer_bytes.
		*/
		u32 current_transfer_bytes;

		/**
		* The number of bytes requested in the in the PIO setup.
		*/
		u32 pio_transfer_bytes;

		/**
		* PIO Setup ending status value to tell us if we need to wait for another FIS
		* or if the transfer is complete. On the receipt of a D2H FIS this will be
		* the status field of that FIS.
		*/
		u8 ending_status;

		/**
		* On receipt of a D2H FIS this will be the ending error field if the
		* ending_status has the SATA_STATUS_ERR bit set.
		*/
		u8 ending_error;

		struct scic_sds_request_pio_sgl {
		struct scu_sgl_element_pair *sgl_pair;
		u8 sgl_set;
		u32 sgl_offset;
		} request_current;
		} pio;

		struct {
		/**
		* The number of bytes requested in the PIO setup before CDB data frame.
		*/
		u32 device_preferred_cdb_length;
		} packet;
		} type;
		};

		struct scic_sds_request {
		/**
		* This field contains the information for the base request state machine.
		@@ -158,12 +214,6 @@ struct scic_sds_request {
		*/
		bool is_task_management_request;

		/**
		* This field indicates that this request contains an initialized started
		* substate machine.
		*/
		bool has_started_substate_machine;

		/**
		* This field is a pointer to the stored rx frame data. It is used in STP
		* internal requests and SMP response frames. If this field is non-NULL the
		@@ -173,12 +223,6 @@ struct scic_sds_request {
		*/
		u32 saved_rx_frame_index;

		/**
		* This field specifies the data necessary to manage the sub-state
		* machine executed while in the SCI_BASE_REQUEST_STATE_STARTED state.
		*/
		struct sci_base_state_machine started_substate_machine;

		/**
		* This field specifies the current state handlers in place for this
		* IO Request object. This field is updated each time the request
		@@ -295,6 +339,41 @@ enum sci_base_request_states {
		*/
		SCI_BASE_REQUEST_STATE_STARTED,

		SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_TC_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_D2H_REG_FIS_SUBSTATE,

		SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_H2D_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_D2H_SUBSTATE,

		SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_ASSERTED_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_DIAGNOSTIC_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_D2H_RESPONSE_FRAME_SUBSTATE,

		/**
		* While in this state the IO request object is waiting for the TC completion
		* notification for the H2D Register FIS
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_AWAIT_H2D_COMPLETION_SUBSTATE,

		/**
		* While in this state the IO request object is waiting for either a PIO Setup
		* FIS or a D2H register FIS. The type of frame received is based on the
		* result of the prior frame and line conditions.
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_AWAIT_FRAME_SUBSTATE,

		/**
		* While in this state the IO request object is waiting for a DATA frame from
		* the device.
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_DATA_IN_AWAIT_DATA_SUBSTATE,

		/**
		* While in this state the IO request object is waiting to transmit the next data
		* frame to the device.
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_DATA_OUT_TRANSMIT_DATA_SUBSTATE,

		/**
		* The AWAIT_TC_COMPLETION sub-state indicates that the started raw
		* task management request is waiting for the transmission of the
		@@ -383,8 +462,6 @@ struct scic_sds_io_request_state_handler {

		};

		extern const struct sci_base_state scic_sds_io_request_started_task_mgmt_substate_table[];

		/**
		* scic_sds_request_get_controller() -
		*
		@@ -473,7 +550,6 @@ scic_sds_io_request_tc_completion(struct scic_sds_request *request, u32 completi
		(scu_sge).address_modifier = 0; \
		}

		void scic_sds_request_build_sgl(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_request_start(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_io_request_terminate(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_io_request_event_handler(struct scic_sds_request *sci_req,
		@@ -481,8 +557,6 @@ enum sci_status scic_sds_io_request_event_handler(struct scic_sds_request *sci_r
		enum sci_status scic_sds_io_request_frame_handler(struct scic_sds_request *sci_req,
		u32 frame_index);
		enum sci_status scic_sds_task_request_terminate(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_request_started_state_abort_handler(struct scic_sds_request *sci_req);


		/* XXX open code in caller */
		static inline void scic_request_get_virt_addr(struct scic_sds_request sci_req,
		@@ -778,6 +852,9 @@ enum sci_status scic_task_request_construct(struct scic_sds_controller *scic,
		struct scic_sds_request *sci_req);
		enum sci_status scic_task_request_construct_ssp(struct scic_sds_request *sci_req);
		enum sci_status scic_task_request_construct_sata(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_stp_udma_request_construct(struct scic_sds_request *sci_req,
		u32 transfer_length,
		enum dma_data_direction dir);
		void scic_stp_io_request_set_ncq_tag(struct scic_sds_request *sci_req, u16 ncq_tag);
		void scic_sds_smp_request_copy_response(struct scic_sds_request *sci_req);
		#endif /* !defined(_ISCI_REQUEST_H_) */

drivers/scsi/isci/stp_request.c

deleted100644 → 0

+0 −1584

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/scsi/isci/stp_request.h

deleted100644 → 0

+0 −195

Original line number	Diff line number	Diff line
		/*
		* 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 _SCIC_SDS_STP_REQUEST_T_
		#define _SCIC_SDS_STP_REQUEST_T_

		#include <linux/dma-mapping.h>
		#include <scsi/sas.h>

		struct scic_sds_stp_request {
		union {
		u32 ncq;

		u32 udma;

		struct scic_sds_stp_pio_request {
		/**
		* Total transfer for the entire PIO request recorded at request constuction
		* time.
		*
		* @todo Should we just decrement this value for each byte of data transitted
		* or received to elemenate the current_transfer_bytes field?
		*/
		u32 total_transfer_bytes;

		/**
		* Total number of bytes received/transmitted in data frames since the start
		* of the IO request. At the end of the IO request this should equal the
		* total_transfer_bytes.
		*/
		u32 current_transfer_bytes;

		/**
		* The number of bytes requested in the in the PIO setup.
		*/
		u32 pio_transfer_bytes;

		/**
		* PIO Setup ending status value to tell us if we need to wait for another FIS
		* or if the transfer is complete. On the receipt of a D2H FIS this will be
		* the status field of that FIS.
		*/
		u8 ending_status;

		/**
		* On receipt of a D2H FIS this will be the ending error field if the
		* ending_status has the SATA_STATUS_ERR bit set.
		*/
		u8 ending_error;

		struct scic_sds_request_pio_sgl {
		struct scu_sgl_element_pair *sgl_pair;
		u8 sgl_set;
		u32 sgl_offset;
		} request_current;
		} pio;

		struct {
		/**
		* The number of bytes requested in the PIO setup before CDB data frame.
		*/
		u32 device_preferred_cdb_length;
		} packet;
		} type;
		};

		/**
		* enum scic_sds_stp_request_started_udma_substates - This enumeration depicts
		* the various sub-states associated with a SATA/STP UDMA protocol operation.
		*
		*
		*/
		enum scic_sds_stp_request_started_udma_substates {
		SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_TC_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_D2H_REG_FIS_SUBSTATE,
		};

		/**
		* enum scic_sds_stp_request_started_non_data_substates - This enumeration
		* depicts the various sub-states associated with a SATA/STP non-data
		* protocol operation.
		*
		*
		*/
		enum scic_sds_stp_request_started_non_data_substates {
		SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_H2D_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_D2H_SUBSTATE,
		};

		/**
		* enum scic_sds_stp_request_started_soft_reset_substates - THis enumeration
		* depicts the various sub-states associated with a SATA/STP soft reset
		* operation.
		*
		*
		*/
		enum scic_sds_stp_request_started_soft_reset_substates {
		SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_ASSERTED_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_DIAGNOSTIC_COMPLETION_SUBSTATE,
		SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_D2H_RESPONSE_FRAME_SUBSTATE,
		};

		/* This is the enumeration of the SATA PIO DATA IN started substate machine. */
		enum _scic_sds_stp_request_started_pio_substates {
		/**
		* While in this state the IO request object is waiting for the TC completion
		* notification for the H2D Register FIS
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_AWAIT_H2D_COMPLETION_SUBSTATE,

		/**
		* While in this state the IO request object is waiting for either a PIO Setup
		* FIS or a D2H register FIS. The type of frame received is based on the
		* result of the prior frame and line conditions.
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_AWAIT_FRAME_SUBSTATE,

		/**
		* While in this state the IO request object is waiting for a DATA frame from
		* the device.
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_DATA_IN_AWAIT_DATA_SUBSTATE,

		/**
		* While in this state the IO request object is waiting to transmit the next data
		* frame to the device.
		*/
		SCIC_SDS_STP_REQUEST_STARTED_PIO_DATA_OUT_TRANSMIT_DATA_SUBSTATE,
		};

		struct scic_sds_request;

		enum sci_status scic_sds_stp_pio_request_construct(struct scic_sds_request *sci_req,
		bool copy_rx_frame);
		enum sci_status scic_sds_stp_udma_request_construct(struct scic_sds_request *sci_req,
		u32 transfer_length,
		enum dma_data_direction dir);
		enum sci_status scic_sds_stp_non_data_request_construct(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_stp_soft_reset_request_construct(struct scic_sds_request *sci_req);
		enum sci_status scic_sds_stp_ncq_request_construct(struct scic_sds_request *sci_req,
		u32 transfer_length,
		enum dma_data_direction dir);
		#endif /* _SCIC_SDS_STP_REQUEST_T_ */