isci: simplify dma coherent allocation (bc5c9674) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/scsi/isci/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,5 @@ isci-objs := init.o phy.o request.o sata.o \
		core/scic_sds_smp_remote_device.o \
		core/scic_sds_remote_node_table.o \
		core/scic_sds_unsolicited_frame_control.o \
		core/sci_base_memory_descriptor_list.o \
		core/sci_base_state_machine.o \
		core/sci_util.o

drivers/scsi/isci/core/sci_base_memory_descriptor_list.c

deleted100644 → 0

+0 −159

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

		/**
		* This file contains the base implementation for the memory descriptor list.
		* This is currently comprised of MDL iterator methods.
		*
		*
		*/

		#include "sci_environment.h"
		#include "sci_base_memory_descriptor_list.h"

		/*
		* ******************************************************************************
		* * P U B L I C M E T H O D S
		* ****************************************************************************** */

		void sci_mdl_first_entry(
		struct sci_base_memory_descriptor_list *base_mdl)
		{
		base_mdl->next_index = 0;

		/*
		* If this MDL is managing another MDL, then recursively rewind that MDL
		* object as well. */
		if (base_mdl->next_mdl != NULL)
		sci_mdl_first_entry(base_mdl->next_mdl);
		}


		void sci_mdl_next_entry(
		struct sci_base_memory_descriptor_list *base_mdl)
		{
		/*
		* If there is at least one more entry left in the array, then change
		* the next pointer to it. */
		if (base_mdl->next_index < base_mdl->length)
		base_mdl->next_index++;
		else if (base_mdl->next_index == base_mdl->length) {
		/*
		* This MDL has exhausted it's set of entries. If this MDL is managing
		* another MDL, then start iterating through that MDL. */
		if (base_mdl->next_mdl != NULL)
		sci_mdl_next_entry(base_mdl->next_mdl);
		}
		}


		struct sci_physical_memory_descriptor *sci_mdl_get_current_entry(
		struct sci_base_memory_descriptor_list *base_mdl)
		{
		if (base_mdl->next_index < base_mdl->length)
		return &base_mdl->mde_array[base_mdl->next_index];
		else if (base_mdl->next_index == base_mdl->length) {
		/*
		* This MDL has exhausted it's set of entries. If this MDL is managing
		* another MDL, then return it's current entry. */
		if (base_mdl->next_mdl != NULL)
		return sci_mdl_get_current_entry(base_mdl->next_mdl);
		}

		return NULL;
		}

		/*
		* ******************************************************************************
		* * P R O T E C T E D M E T H O D S
		* ****************************************************************************** */

		void sci_base_mdl_construct(
		struct sci_base_memory_descriptor_list *mdl,
		struct sci_physical_memory_descriptor *mde_array,
		u32 mde_array_length,
		struct sci_base_memory_descriptor_list *next_mdl)
		{
		mdl->length = mde_array_length;
		mdl->mde_array = mde_array;
		mdl->next_index = 0;
		mdl->next_mdl = next_mdl;
		}

		/* --------------------------------------------------------------------------- */

		bool sci_base_mde_is_valid(
		struct sci_physical_memory_descriptor *mde,
		u32 alignment,
		u32 size,
		u16 attributes)
		{
		/* Only need the lower 32 bits to ensure alignment is met. */
		u32 physical_address = lower_32_bits(mde->physical_address);

		if (
		((((unsigned long)mde->virtual_address) & (alignment - 1)) != 0)
		\|\| ((physical_address & (alignment - 1)) != 0)
		\|\| (mde->constant_memory_alignment != alignment)
		\|\| (mde->constant_memory_size != size)
		\|\| (mde->virtual_address == NULL)
		\|\| (mde->constant_memory_attributes != attributes)
		) {
		return false;
		}

		return true;
		}

drivers/scsi/isci/core/sci_base_memory_descriptor_list.h

deleted100644 → 0

+0 −153

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_BASE_MEMORY_DESCRIPTOR_LIST_H_
		#define _SCI_BASE_MEMORY_DESCRIPTOR_LIST_H_

		/**
		* This file contains the protected interface structures, constants and
		* interface methods for the struct sci_base_memory_descriptor_list object.
		*
		*
		*/


		#include "sci_memory_descriptor_list.h"


		/**
		* struct sci_base_memory_descriptor_list - This structure contains all of the
		* fields necessary to implement a simple stack for managing the list of
		* available controller indices.
		*
		*
		*/
		struct sci_base_memory_descriptor_list {
		/**
		* This field indicates the length of the memory descriptor entry array.
		*/
		u32 length;

		/**
		* This field is utilized to provide iterator pattern functionality.
		* It indicates the index of the next memory descriptor in the iteration.
		*/
		u32 next_index;

		/**
		* This field will point to the list of memory descriptors.
		*/
		struct sci_physical_memory_descriptor *mde_array;

		/**
		* This field simply allows a user to chain memory descriptor lists
		* together if desired. This field will be initialized to NULL.
		*/
		struct sci_base_memory_descriptor_list *next_mdl;

		};

		/**
		* sci_base_mdl_construct() - This method is invoked to construct an memory
		* descriptor list. It initializes the fields of the MDL.
		* @mdl: This parameter specifies the memory descriptor list to be constructed.
		* @mde_array: This parameter specifies the array of memory descriptor entries
		* to be managed by this list.
		* @mde_array_length: This parameter specifies the size of the array of entries.
		* @next_mdl: This parameter specifies a subsequent MDL object to be managed by
		* this MDL object.
		*
		* none.
		*/
		void sci_base_mdl_construct(
		struct sci_base_memory_descriptor_list *mdl,
		struct sci_physical_memory_descriptor *mde_array,
		u32 mde_array_length,
		struct sci_base_memory_descriptor_list *next_mdl);

		/**
		* sci_base_mde_construct() -
		*
		* This macro constructs an memory descriptor entry with the given alignment
		* and size
		*/
		#define sci_base_mde_construct(mde, alignment, size, attributes) \
		{ \
		(mde)->constant_memory_alignment = (alignment); \
		(mde)->constant_memory_size = (size); \
		(mde)->constant_memory_attributes = (attributes); \
		}

		/**
		* sci_base_mde_is_valid() - This method validates that the memory descriptor
		* is correctly filled out by the SCI User
		* @mde: This parameter is the mde entry to validate
		* @alignment: This parameter specifies the expected alignment of the memory
		* for the mde.
		* @size: This parameter specifies the memory size expected for the mde its
		* value should not have been changed by the SCI User.
		* @attributes: This parameter specifies the attributes for the memory
		* descriptor provided.
		*
		* bool This method returns an indication as to whether the supplied MDE is
		* valid or not. true The MDE is valid. false The MDE is not valid.
		*/
		bool sci_base_mde_is_valid(
		struct sci_physical_memory_descriptor *mde,
		u32 alignment,
		u32 size,
		u16 attributes);

		#endif /* _SCI_BASE_MEMORY_DESCRIPTOR_LIST_H_ */

drivers/scsi/isci/core/sci_memory_descriptor_list.h

deleted100644 → 0

+0 −168

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_MEMORY_DESCRIPTOR_LIST_H_
		#define _SCI_MEMORY_DESCRIPTOR_LIST_H_

		/**
		* This file contains all of the basic data types utilized by an SCI user or
		* implementor.
		*
		*
		*/



		struct sci_base_memory_descriptor_list;

		/**
		*
		*
		* SCI_MDE_ATTRIBUTES These constants depict memory attributes for the Memory
		* Descriptor Entries (MDEs) contained in the MDL.
		*/
		#define SCI_MDE_ATTRIBUTE_CACHEABLE 0x0001
		#define SCI_MDE_ATTRIBUTE_PHYSICALLY_CONTIGUOUS 0x0002

		/**
		* struct sci_physical_memory_descriptor - This structure defines a description
		* of a memory location for the SCI implementation.
		*
		*
		*/
		struct sci_physical_memory_descriptor {
		/**
		* This field contains the virtual address associated with this descriptor
		* element. This field shall be zero when the descriptor is retrieved from
		* the SCI implementation. The user shall set this field prior
		* sci_controller_start()
		*/
		void *virtual_address;

		/**
		* This field contains the physical address associated with this desciptor
		* element. This field shall be zero when the descriptor is retrieved from
		* the SCI implementation. The user shall set this field prior
		* sci_controller_start()
		*/
		dma_addr_t physical_address;

		/**
		* This field contains the size requirement for this memory descriptor.
		* A value of zero for this field indicates the end of the descriptor
		* list. The value should be treated as read only for an SCI user.
		*/
		u32 constant_memory_size;

		/**
		* This field contains the alignment requirement for this memory
		* descriptor. A value of zero for this field indicates the end of the
		* descriptor list. All other values indicate the number of bytes to
		* achieve the necessary alignment. The value should be treated as
		* read only for an SCI user.
		*/
		u32 constant_memory_alignment;

		/**
		* This field contains an indication regarding the desired memory
		* attributes for this memory descriptor entry.
		* Notes:
		* - If the cacheable attribute is set, the user can allocate
		* memory that is backed by cache for better performance. It
		* is not required that the memory be backed by cache.
		* - If the physically contiguous attribute is set, then the
		* entire memory must be physically contiguous across all
		* page boundaries.
		*/
		u16 constant_memory_attributes;

		};

		/**
		* sci_mdl_first_entry() - This method simply rewinds the MDL iterator back to
		* the first memory descriptor entry in the list.
		* @mdl: This parameter specifies the memory descriptor list that is to be
		* rewound.
		*
		*/
		void sci_mdl_first_entry(
		struct sci_base_memory_descriptor_list *mdl);

		/**
		* sci_mdl_next_entry() - This method simply updates the "current" pointer to
		* the next sequential memory descriptor.
		* @mdl: This parameter specifies the memory descriptor list for which to
		* return the next memory descriptor entry in the list.
		*
		* none.
		*/
		void sci_mdl_next_entry(
		struct sci_base_memory_descriptor_list *mdl);

		/**
		* sci_mdl_get_current_entry() - This method simply returns the current memory
		* descriptor entry.
		* @mdl: This parameter specifies the memory descriptor list for which to
		* return the current memory descriptor entry.
		*
		* This method returns a pointer to the current physical memory descriptor in
		* the MDL. NULL This value is returned if there are no descriptors in the list.
		*/
		struct sci_physical_memory_descriptor *sci_mdl_get_current_entry(
		struct sci_base_memory_descriptor_list *mdl);


		#endif /* _SCI_MEMORY_DESCRIPTOR_LIST_H_ */

drivers/scsi/isci/core/scic_controller.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -144,4 +144,5 @@ enum sci_status scic_controller_free_io_tag(

		struct device;
		struct scic_sds_controller scic_controller_alloc(struct device dev);
		int scic_controller_mem_init(struct scic_sds_controller *scic);
		#endif /* _SCIC_CONTROLLER_H_ */