isci: removing non-working ATAPI code (3d6e428c) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/scsi/isci/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -2,9 +2,6 @@
		#generation of silicon
		EXTRA_CFLAGS += -DSCIC_SDS_4_ENABLED

		#temporary until atapi support ready
		EXTRA_CFLAGS += -DDISABLE_ATAPI

		EXTRA_CFLAGS += -Idrivers/scsi/isci/core/ -Idrivers/scsi/isci/
		obj-$(CONFIG_SCSI_ISCI) += isci.o
		isci-objs := init.o phy.o request.o sata.o \
		@@ -17,7 +14,6 @@ isci-objs := init.o phy.o request.o sata.o \
		core/scic_sds_controller.o \
		core/scic_sds_request.o \
		core/scic_sds_stp_request.o \
		core/scic_sds_stp_packet_request.o \
		core/scic_sds_port.o \
		core/scic_sds_port_configuration_agent.o \
		core/scic_sds_phy.o \

drivers/scsi/isci/core/sati_device.h

deleted100644 → 0

+0 −156

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 _SATI_DEVICE_H_
		#define _SATI_DEVICE_H_

		/**
		* This file contains all of the defintions for the SATI remote device object.
		* Some translations require information to be remembered on a per device
		* basis. This information is stored in the object defined in this file.
		*
		*
		*/

		#include "sati_types.h"
		#include "intel_ata.h"

		/**
		* enum _SATI_DEVICE_STATE - This enumeration depicts the various states
		* possible for the a translation remote device object.
		*
		*
		*/
		enum sati_device_state {
		SATI_DEVICE_STATE_OPERATIONAL,
		SATI_DEVICE_STATE_STOPPED,
		SATI_DEVICE_STATE_STANDBY,
		SATI_DEVICE_STATE_IDLE,
		SATI_DEVICE_STATE_DEVICE_FAULT_OCCURRED,
		SATI_DEVICE_STATE_FORMAT_UNIT_IN_PROGRESS,
		SATI_DEVICE_STATE_SELF_TEST_IN_PROGRESS,
		SATI_DEVICE_STATE_SEQUENCE_INCOMPLETE,
		SATI_DEVICE_STATE_UNIT_ATTENTION_CONDITION

		};

		/**
		*
		*
		* SATI_DEVICE_CAPABILITIES These constants define the various capabilities
		* that a remote device may support for which there is an impact on translation.
		*/
		#define SATI_DEVICE_CAP_UDMA_ENABLE 0x00000001
		#define SATI_DEVICE_CAP_NCQ_REQUESTED_ENABLE 0x00000002
		#define SATI_DEVICE_CAP_NCQ_SUPPORTED_ENABLE 0x00000004
		#define SATI_DEVICE_CAP_48BIT_ENABLE 0x00000008
		#define SATI_DEVICE_CAP_DMA_FUA_ENABLE 0x00000010
		#define SATI_DEVICE_CAP_SMART_SUPPORT 0x00000020
		#define SATI_DEVICE_CAP_REMOVABLE_MEDIA 0x00000040
		#define SATI_DEVICE_CAP_SMART_ENABLE 0x00000080
		#define SATI_DEVICE_CAP_WRITE_UNCORRECTABLE_ENABLE 0x00000100
		#define SATI_DEVICE_CAP_MULTIPLE_SECTORS_PER_PHYSCIAL_SECTOR 0x00000200
		#define SATI_DEVICE_CAP_SMART_SELF_TEST_SUPPORT 0x00000400


		/**
		* struct sati_device - The SATI_DEVICE structure define the state of the
		* remote device with respect to translation.
		*
		*
		*/
		struct sati_device {
		/**
		* This field simply dictates the state of the SATI device.
		*/
		enum sati_device_state state;

		/**
		* This field indicates features supported by the remote device that
		* impact translation execution.
		*/
		u16 capabilities;

		/**
		* This field indicates the depth of the native command queue supported
		* by the device.
		*/
		u8 ncq_depth;

		/**
		* This field stores the additional sense code for a unit attention
		* condition.
		*/
		u8 unit_attention_asc;

		/**
		* This field indicates the additional sense code qualifier for a unit
		* attention condition.
		*/
		u8 unit_attention_ascq;

		};

		void sati_device_construct(
		struct sati_device *device,
		bool is_ncq_enabled,
		u8 max_ncq_depth);

		void sati_device_update_capabilities(
		struct sati_device *device,
		struct ata_identify_device_data *identify);

		#endif /* _SATI_TRANSLATOR_SEQUENCE_H_ */

drivers/scsi/isci/core/sati_translator_sequence.h

deleted100644 → 0

+0 −304

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 _SATI_TRANSLATOR_SEQUENCE_H_
		#define _SATI_TRANSLATOR_SEQUENCE_H_

		/**
		* This file contains all of the defintions for the SATI translator sequence.
		* A translator sequence is simply a defintion for the various sequences of
		* commands that occur in this translator.
		*
		*
		*/

		#include "sati_device.h"

		/**
		* enum _sati_translator_sequence_type - This enumeration defines the possible
		* sequence types for the translator.
		*
		*
		*/
		enum sati_translator_sequence_type {
		/* SCSI Primary Command (SPC) sequences. */
		SATI_SEQUENCE_REPORT_LUNS,
		SATI_SEQUENCE_TEST_UNIT_READY,
		SATI_SEQUENCE_INQUIRY_STANDARD,
		SATI_SEQUENCE_INQUIRY_SUPPORTED_PAGES,
		SATI_SEQUENCE_INQUIRY_SERIAL_NUMBER,
		SATI_SEQUENCE_INQUIRY_DEVICE_ID,
		SATI_SEQUENCE_INQUIRY_BLOCK_DEVICE,
		SATI_SEQUENCE_MODE_SENSE_6_CACHING,
		SATI_SEQUENCE_MODE_SENSE_6_INFORMATIONAL_EXCP_CONTROL,
		SATI_SEQUENCE_MODE_SENSE_6_READ_WRITE_ERROR,
		SATI_SEQUENCE_MODE_SENSE_6_DISCONNECT_RECONNECT,
		SATI_SEQUENCE_MODE_SENSE_6_CONTROL,
		SATI_SEQUENCE_MODE_SENSE_6_ALL_PAGES,
		SATI_SEQUENCE_MODE_SENSE_10_CACHING,
		SATI_SEQUENCE_MODE_SENSE_10_INFORMATIONAL_EXCP_CONTROL,
		SATI_SEQUENCE_MODE_SENSE_10_READ_WRITE_ERROR,
		SATI_SEQUENCE_MODE_SENSE_10_DISCONNECT_RECONNECT,
		SATI_SEQUENCE_MODE_SENSE_10_CONTROL,
		SATI_SEQUENCE_MODE_SENSE_10_ALL_PAGES,
		SATI_SEQUENCE_MODE_SELECT_MODE_PAGE_CACHING,
		SATI_SEQUENCE_MODE_SELECT_MODE_POWER_CONDITION,
		SATI_SEQUENCE_MODE_SELECT_MODE_INFORMATION_EXCEPT_CONTROL,

		/* Log Sense Sequences */
		SATI_SEQUENCE_LOG_SENSE_SELF_TEST_LOG_PAGE,
		SATI_SEQUENCE_LOG_SENSE_EXTENDED_SELF_TEST_LOG_PAGE,
		SATI_SEQUENCE_LOG_SENSE_SUPPORTED_LOG_PAGE,
		SATI_SEQUENCE_LOG_SENSE_INFO_EXCEPTION_LOG_PAGE,

		/* SCSI Block Command (SBC) sequences. */

		SATI_SEQUENCE_READ_6,
		SATI_SEQUENCE_READ_10,
		SATI_SEQUENCE_READ_12,
		SATI_SEQUENCE_READ_16,

		SATI_SEQUENCE_READ_CAPACITY_10,
		SATI_SEQUENCE_READ_CAPACITY_16,

		SATI_SEQUENCE_SYNCHRONIZE_CACHE,

		SATI_SEQUENCE_VERIFY_10,
		SATI_SEQUENCE_VERIFY_12,
		SATI_SEQUENCE_VERIFY_16,

		SATI_SEQUENCE_WRITE_6,
		SATI_SEQUENCE_WRITE_10,
		SATI_SEQUENCE_WRITE_12,
		SATI_SEQUENCE_WRITE_16,

		SATI_SEQUENCE_START_STOP_UNIT,

		SATI_SEQUENCE_REASSIGN_BLOCKS,

		/* SCSI Task Requests sequences */

		SATI_SEQUENCE_LUN_RESET,

		SATI_SEQUENCE_REQUEST_SENSE_SMART_RETURN_STATUS,
		SATI_SEQUENCE_REQUEST_SENSE_CHECK_POWER_MODE,

		SATI_SEQUENCE_WRITE_LONG

		};

		#define SATI_SEQUENCE_TYPE_READ_MIN SATI_SEQUENCE_READ_6
		#define SATI_SEQUENCE_TYPE_READ_MAX SATI_SEQUENCE_READ_16

		/**
		*
		*
		* SATI_SEQUENCE_STATES These constants depict the various state values
		* associated with a translation sequence.
		*/
		#define SATI_SEQUENCE_STATE_INITIAL 0
		#define SATI_SEQUENCE_STATE_TRANSLATE_DATA 1
		#define SATI_SEQUENCE_STATE_AWAIT_RESPONSE 2
		#define SATI_SEQUENCE_STATE_FINAL 3
		#define SATI_SEQUENCE_STATE_INCOMPLETE 4

		/**
		*
		*
		* SATI_DATA_DIRECTIONS These constants depict the various types of data
		* directions for a translation sequence. Data can flow in/out (read/write) or
		* no data at all.
		*/
		#define SATI_DATA_DIRECTION_NONE 0
		#define SATI_DATA_DIRECTION_IN 1
		#define SATI_DATA_DIRECTION_OUT 2

		/**
		* struct SATI_MODE_SELECT_PROCESSING_STATE - This structure contains all of
		* the current processing states for processing mode select 6 and 10
		* commands' parameter fields.
		*
		*
		*/
		struct sati_mode_select_processing_state {
		u8 *mode_pages;
		u32 mode_page_offset;
		u32 mode_pages_size;
		u32 size_of_data_processed;
		u32 total_ata_command_sent;
		u32 ata_command_sent_for_cmp; /* cmp: current mode page */
		bool current_mode_page_processed;
		};


		enum sati_reassign_blocks_ata_command_status {
		SATI_REASSIGN_BLOCKS_READY_TO_SEND,
		SATI_REASSIGN_BLOCKS_COMMAND_FAIL,
		SATI_REASSIGN_BLOCKS_COMMAND_SUCCESS,
		};

		/**
		* struct sati_reassign_blocks_processing_state - This structure contains all
		* of the current processing states for processing reassign block command's
		* parameter fields.
		*
		*
		*/
		struct sati_reassign_blocks_processing_state {
		u32 lba_offset;
		u32 block_lists_size;
		u8 lba_size;
		u32 size_of_data_processed;
		u32 ata_command_sent_for_current_lba;
		bool current_lba_processed;
		enum sati_reassign_blocks_ata_command_status ata_command_status;

		};

		#define SATI_ATAPI_REQUEST_SENSE_CDB_LENGTH 12

		/**
		* struct sati_atapi_data - The SATI_ATAPI_DATA structure is for sati atapi IO
		* specific data.
		*
		*
		*/
		struct sati_atapi_data {
		u8 request_sense_cdb[SATI_ATAPI_REQUEST_SENSE_CDB_LENGTH];
		};

		/**
		* struct sati_translator_sequence - This structure contains all of the
		* translation information associated with a particular request.
		*
		*
		*/
		struct sati_translator_sequence {
		/**
		* This field contains the sequence type determined by the SATI.
		*/
		u8 type;

		/**
		* This field indicates the current state for the sequence.
		*/
		u8 state;

		/**
		* This field indicates the data direction (none, read, or write) for
		* the translated request.
		*/
		u8 data_direction;

		/**
		* This field contains the SATA/ATA protocol to be utilized during
		* the IO transfer.
		*/
		u8 protocol;

		/**
		* This field is utilized for sequences requiring data translation.
		* It specifies the amount of data requested by the caller from the
		* operation. It's necessary, because at times the user requests less
		* data than is available. Thus, we need to avoid overrunning the
		* buffer.
		*/
		u32 allocation_length;

		/**
		* This field specifies the amount of data that will actually be
		* transfered across the wire for this ATA request.
		*/
		u32 ata_transfer_length;

		/**
		* This field specifies the amount of data bytes that have been
		* set in a translation sequence. It will be incremented every time
		* a data byte has been set by a sati translation.
		*/
		u16 number_data_bytes_set;

		/**
		* This field indicates whether or not the sense response has been set
		* by the translation sequence.
		*/
		bool is_sense_response_set;

		/**
		* This field specifies the remote device context for which this
		* translator sequence is destined.
		*/
		struct sati_device *device;

		/**
		* This field is utilized to provide the translator with memory space
		* required for translations that utilize multiple requests.
		*/
		union {
		u32 translated_command;
		u32 move_sector_count;
		u32 scratch;
		struct sati_reassign_blocks_processing_state
		reassign_blocks_process_state;
		struct sati_mode_select_processing_state process_state;
		struct sati_atapi_data sati_atapi_data;
		} command_specific_data;

		};



		#endif /* _SATI_TRANSLATOR_SEQUENCE_H_ */

drivers/scsi/isci/core/sati_types.h

deleted100644 → 0

+0 −145

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 _SATI_TYPES_H_
		#define _SATI_TYPES_H_

		/**
		* This file contains various type definitions to be utilized with SCSI to ATA
		* Translation Implementation.
		*
		*
		*/

		/**
		* enum _SATI_STATUS - This enumeration defines the possible return values from
		* the SATI translation methods.
		*
		*
		*/
		enum sati_status {
		/**
		* This indicates that the translation was supported and occurred
		* without error.
		*/
		SATI_SUCCESS,

		/**
		* This indicates that the translation was supported, occurred without
		* error, and no additional translation is necessary. This is done in
		* conditions where the SCSI command doesn't require any interaction with
		* the remote device.
		*/
		SATI_COMPLETE,

		/**
		* This indicated everything SATI_COMPLETE does in addition to the response data
		* not using all the memory allocated by the OS.
		*/
		SATI_COMPLETE_IO_DONE_EARLY,

		/**
		* This indicates that translator sequence has finished some specific
		* command in the sequence, but additional commands are necessary.
		*/
		SATI_SEQUENCE_INCOMPLETE,

		/**
		* This indicates a general failure has occurred for which no further
		* specification information is available.
		*/
		SATI_FAILURE,

		/**
		* This indicates that the result of the IO request indicates a
		* failure. The caller should reference the corresponding response
		* data for further details.
		*/
		SATI_FAILURE_CHECK_RESPONSE_DATA,

		/**
		* This status indicates that the supplied sequence type doesn't map
		* to an existing definition.
		*/
		SATI_FAILURE_INVALID_SEQUENCE_TYPE,

		/**
		* This status indicates that the supplied sequence state doesn't match
		* the operation being requested by the user.
		*/
		SATI_FAILURE_INVALID_STATE

		};

		#if (!defined(DISABLE_SATI_MODE_SENSE) \
		\|\| !defined(DISABLE_SATI_MODE_SELECT) \
		\|\| !defined(DISABLE_SATI_REQUEST_SENSE)) \

		#if !defined(ENABLE_SATI_MODE_PAGES)
		/**
		*
		*
		* This macro enables the common mode page data structures and code. Currently,
		* MODE SENSE, MODE SELECT, and REQUEST SENSE all make reference to this common
		* code. As a result, enable the common mode page code if any of these 3 are
		* being translated.
		*/
		#define ENABLE_SATI_MODE_PAGES
		#endif /* !defined(ENABLE_SATI_MODE_PAGES) */

		#endif /* MODE_SENSE/SELECT/REQUEST_SENSE */

		#endif /* _SATI_TYPES_H_ */

drivers/scsi/isci/core/scic_sds_request.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -73,10 +73,6 @@
		#include "scu_constants.h"
		#include "scu_task_context.h"

		#if !defined(DISABLE_ATAPI)
		#include "scic_sds_stp_packet_request.h"
		#endif

		/*
		* ****************************************************************************
		* * SCIC SDS IO REQUEST CONSTANTS
		@@ -670,16 +666,6 @@ static enum sci_status scic_io_request_construct_sata(struct scic_sds_request *s
		status = scic_sds_stp_ncq_request_construct(sci_req, len, dir);
		break;

		#if !defined(DISABLE_ATAPI)
		case SAT_PROTOCOL_PACKET_NON_DATA:
		case SAT_PROTOCOL_PACKET_DMA_DATA_IN:
		case SAT_PROTOCOL_PACKET_DMA_DATA_OUT:
		case SAT_PROTOCOL_PACKET_PIO_DATA_IN:
		case SAT_PROTOCOL_PACKET_PIO_DATA_OUT:
		status = scic_sds_stp_packet_request_construct(sci_req);
		break;
		#endif

		case SAT_PROTOCOL_DMA_QUEUED:
		case SAT_PROTOCOL_DMA:
		case SAT_PROTOCOL_DEVICE_DIAGNOSTIC: