isci: uplevel request infrastructure (f1f52e75) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/scsi/isci/Makefile

+3 −5

Original line number	Diff line number	Diff line
		@@ -7,11 +7,9 @@ isci-objs := init.o phy.o request.o sata.o \
		remote_node_context.o \
		remote_node_table.o \
		unsolicited_frame_control.o \
		core/scic_sds_request.o \
		core/scic_sds_stp_request.o \
		stp_request.o \
		ssp_request.o \
		smp_request.o \
		core/scic_sds_port.o \
		core/scic_sds_port_configuration_agent.o \
		core/scic_sds_phy.o \
		core/scic_sds_ssp_request.o \
		core/scic_sds_smp_request.o \
		core/sci_util.o

drivers/scsi/isci/core/sci_util.c

deleted100644 → 0

+0 −86

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.
		*/

		#include <linux/kernel.h>
		#include "sci_util.h"
		#include "request.h"

		void scic_request_get_virt_addr(struct scic_sds_request sci_req, dma_addr_t phys_addr)
		{
		struct isci_request *ireq = sci_req_to_ireq(sci_req);
		dma_addr_t offset;

		BUG_ON(phys_addr < ireq->request_daddr);

		offset = phys_addr - ireq->request_daddr;

		BUG_ON(offset >= sizeof(*ireq));

		return (char *)ireq + offset;
		}

		dma_addr_t scic_io_request_get_dma_addr(struct scic_sds_request *sds_request,
		void *virt_addr)
		{
		struct isci_request *isci_request = sci_req_to_ireq(sds_request);

		char requested_addr = (char )virt_addr;
		char base_addr = (char )isci_request;

		BUG_ON(requested_addr < base_addr);
		BUG_ON((requested_addr - base_addr) >= sizeof(*isci_request));

		return isci_request->request_daddr + (requested_addr - base_addr);
		}

drivers/scsi/isci/core/sci_util.h

deleted100644 → 0

+0 −97

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

		#include "scic_sds_request.h"

		#define SCIC_BUILD_DWORD(char_buffer) \
		(\
		((char_buffer)[0] << 24) \
		\| ((char_buffer)[1] << 16) \
		\| ((char_buffer)[2] << 8) \
		\| ((char_buffer)[3]) \
		)

		#define sci_cb_make_physical_address(physical_addr, addr_upper, addr_lower) \
		((physical_addr) = (addr_lower) \| ((u64)addr_upper) << 32)

		/**
		* sci_swab32_cpy - convert between scsi and scu-hardware byte format
		* @dest: receive the 4-byte endian swapped version of src
		* @src: word aligned source buffer
		*
		* scu hardware handles SSP/SMP control, response, and unidentified
		* frames in "big endian dword" order. Regardless of host endian this
		* is always a swab32()-per-dword conversion of the standard definition,
		* i.e. single byte fields swapped and multi-byte fields in little-
		* endian
		*/
		static inline void sci_swab32_cpy(void _dest, void _src, ssize_t word_cnt)
		{
		u32 dest = _dest, src = _src;

		while (--word_cnt >= 0)
		dest[word_cnt] = swab32(src[word_cnt]);
		}

		void scic_request_get_virt_addr(struct scic_sds_request sds_request,
		dma_addr_t phys_addr);

		dma_addr_t scic_io_request_get_dma_addr(struct scic_sds_request *sds_request,
		void *virt_addr);

		#endif /* _SCI_UTIL_H_ */

drivers/scsi/isci/core/scic_io_request.h

deleted100644 → 0

+0 −226

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_IO_REQUEST_H_
		#define _SCIC_IO_REQUEST_H_

		#include <linux/kernel.h>

		struct scic_sds_request;
		struct scic_sds_remote_device;
		struct scic_sds_controller;

		/**
		* This enumeration specifies the transport protocol utilized for the request.
		*
		*
		*/
		typedef enum {
		/**
		* This enumeration constant indicates that no protocol has yet been
		* set.
		*/
		SCIC_NO_PROTOCOL,

		/**
		* This enumeration constant indicates that the protocol utilized
		* is the Serial Management Protocol.
		*/
		SCIC_SMP_PROTOCOL,

		/**
		* This enumeration constant indicates that the protocol utilized
		* is the Serial SCSI Protocol.
		*/
		SCIC_SSP_PROTOCOL,

		/**
		* This enumeration constant indicates that the protocol utilized
		* is the Serial-ATA Tunneling Protocol.
		*/
		SCIC_STP_PROTOCOL

		} SCIC_TRANSPORT_PROTOCOL;

		enum sci_status scic_io_request_construct(
		struct scic_sds_controller *scic_controller,
		struct scic_sds_remote_device *scic_remote_device,
		u16 io_tag, struct scic_sds_request *sci_req);

		/**
		* scic_io_request_construct_basic_ssp() - This method is called by the SCI
		* user to build an SSP IO request.
		* @scic_io_request: This parameter specifies the handle to the io request
		* object to be built.
		*
		* - The user must have previously called scic_io_request_construct() on the
		* supplied IO request. Indicate if the controller successfully built the IO
		* request. SCI_SUCCESS This value is returned if the IO request was
		* successfully built. SCI_FAILURE_UNSUPPORTED_PROTOCOL This value is returned
		* if the remote_device does not support the SSP protocol.
		* SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
		* properly set the association between the SCIC IO request and the user's IO
		* request.
		*/
		enum sci_status scic_io_request_construct_basic_ssp(
		struct scic_sds_request *scic_io_request);





		/**
		* scic_io_request_construct_basic_sata() - This method is called by the SCI
		* Core user to build an STP IO request.
		* @scic_io_request: This parameter specifies the handle to the io request
		* object to be built.
		*
		* - The user must have previously called scic_io_request_construct() on the
		* supplied IO request. Indicate if the controller successfully built the IO
		* request. SCI_SUCCESS This value is returned if the IO request was
		* successfully built. SCI_FAILURE_UNSUPPORTED_PROTOCOL This value is returned
		* if the remote_device does not support the STP protocol.
		* SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
		* properly set the association between the SCIC IO request and the user's IO
		* request.
		*/
		enum sci_status scic_io_request_construct_basic_sata(
		struct scic_sds_request *scic_io_request);




		/**
		* scic_io_request_construct_smp() - This method is called by the SCI user to
		* build an SMP IO request.
		* @scic_io_request: This parameter specifies the handle to the io request
		* object to be built.
		*
		* - The user must have previously called scic_io_request_construct() on the
		* supplied IO request. Indicate if the controller successfully built the IO
		* request. SCI_SUCCESS This value is returned if the IO request was
		* successfully built. SCI_FAILURE_UNSUPPORTED_PROTOCOL This value is returned
		* if the remote_device does not support the SMP protocol.
		* SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
		* properly set the association between the SCIC IO request and the user's IO
		* request.
		*/
		enum sci_status scic_io_request_construct_smp(
		struct scic_sds_request *scic_io_request);



		/**
		* scic_request_get_controller_status() - This method returns the controller
		* specific IO/Task request status. These status values are unique to the
		* specific controller being managed by the SCIC.
		* @io_request: the handle to the IO or task management request object for
		* which to retrieve the status.
		*
		* This method returns a value indicating the controller specific request
		* status.
		*/
		u32 scic_request_get_controller_status(
		struct scic_sds_request *io_request);

		/**
		* scic_io_request_get_io_tag() - This method will return the IO tag utilized
		* by the IO request.
		* @scic_io_request: This parameter specifies the handle to the io request
		* object for which to return the IO tag.
		*
		* An unsigned integer representing the IO tag being utilized.
		* SCI_CONTROLLER_INVALID_IO_TAG This value is returned if the IO does not
		* currently have an IO tag allocated to it. All return other values indicate a
		* legitimate tag.
		*/
		u16 scic_io_request_get_io_tag(
		struct scic_sds_request *scic_io_request);


		/**
		* scic_stp_io_request_set_ncq_tag() - This method will assign an NCQ tag to
		* the io request object. The caller of this function must make sure that
		* only valid NCQ tags are assigned to the io request object.
		* @scic_io_request: This parameter specifies the handle to the io request
		* object to which to assign the ncq tag.
		* @ncq_tag: This parameter specifies the NCQ tag to be utilized for the
		* supplied core IO request. It is up to the user to make sure that this is
		* a valid NCQ tag.
		*
		* none This function is only valid for SATA NCQ requests.
		*/
		void scic_stp_io_request_set_ncq_tag(
		struct scic_sds_request *scic_io_request,
		u16 ncq_tag);

		/**
		* scic_io_request_get_number_of_bytes_transferred() - This method will return
		* the number of bytes transferred from the SCU
		* @scic_io_request: This parameter specifies the handle to the io request
		* whose data length was not eqaul to the data length specified in the
		* request. When the driver gets an early io completion status from the
		* hardware, this routine should be called to get the actual number of bytes
		* transferred
		*
		* The return is the number of bytes transferred when the data legth is not
		* equal to the specified length in the io request
		*/
		u32 scic_io_request_get_number_of_bytes_transferred(
		struct scic_sds_request *scic_io_request);


		#endif /* _SCIC_IO_REQUEST_H_ */

drivers/scsi/isci/core/scic_sds_phy.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@
		#include "scic_sds_phy.h"
		#include "scic_sds_port.h"
		#include "remote_node_context.h"
		#include "sci_util.h"
		#include "scu_event_codes.h"
		#include "timers.h"