isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.h (4e4dca3d) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/scsi/isci/host.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@
		#include "registers.h"
		#include "scu_remote_node_context.h"
		#include "scu_task_context.h"
		#include "scu_unsolicited_frame.h"

		#define SCU_CONTEXT_RAM_INIT_STALL_TIME 200

drivers/scsi/isci/host.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@
		#include "isci.h"
		#include "remote_node_table.h"
		#include "registers.h"
		#include "scu_unsolicited_frame.h"
		#include "unsolicited_frame_control.h"
		#include "probe_roms.h"

drivers/scsi/isci/scu_unsolicited_frame.h

deleted100644 → 0

+0 −117

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 field defines the SCU format of an unsolicited frame (UF). A UF is a
		* frame received by the SCU for which there is no known corresponding task
		* context (TC).
		*
		*
		*/

		#ifndef _SCU_UNSOLICITED_FRAME_H_
		#define _SCU_UNSOLICITED_FRAME_H_

		#include <linux/string.h>

		/**
		*
		*
		* This constant defines the number of DWORDS found the unsolicited frame
		* header data member.
		*/
		#define SCU_UNSOLICITED_FRAME_HEADER_DATA_DWORDS 15

		/**
		* struct scu_unsolicited_frame_header -
		*
		* This structure delineates the format of an unsolicited frame header. The
		* first DWORD are UF attributes defined by the silicon architecture. The data
		* depicts actual header information received on the link.
		*/
		struct scu_unsolicited_frame_header {
		/**
		* This field indicates if there is an Initiator Index Table entry with
		* which this header is associated.
		*/
		u32 iit_exists:1;

		/**
		* This field simply indicates the protocol type (i.e. SSP, STP, SMP).
		*/
		u32 protocol_type:3;

		/**
		* This field indicates if the frame is an address frame (IAF or OAF)
		* or if it is a information unit frame.
		*/
		u32 is_address_frame:1;

		/**
		* This field simply indicates the connection rate at which the frame
		* was received.
		*/
		u32 connection_rate:4;

		u32 reserved:23;

		/**
		* This field represents the actual header data received on the link.
		*/
		u32 data[SCU_UNSOLICITED_FRAME_HEADER_DATA_DWORDS];

		};

		#endif /* _SCU_UNSOLICITED_FRAME_H_ */

drivers/scsi/isci/unsolicited_frame_control.h

+44 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,50 @@
		#define _SCIC_SDS_UNSOLICITED_FRAME_CONTROL_H_

		#include "isci.h"
		#include "scu_unsolicited_frame.h"

		#define SCU_UNSOLICITED_FRAME_HEADER_DATA_DWORDS 15

		/**
		* struct scu_unsolicited_frame_header -
		*
		* This structure delineates the format of an unsolicited frame header. The
		* first DWORD are UF attributes defined by the silicon architecture. The data
		* depicts actual header information received on the link.
		*/
		struct scu_unsolicited_frame_header {
		/**
		* This field indicates if there is an Initiator Index Table entry with
		* which this header is associated.
		*/
		u32 iit_exists:1;

		/**
		* This field simply indicates the protocol type (i.e. SSP, STP, SMP).
		*/
		u32 protocol_type:3;

		/**
		* This field indicates if the frame is an address frame (IAF or OAF)
		* or if it is a information unit frame.
		*/
		u32 is_address_frame:1;

		/**
		* This field simply indicates the connection rate at which the frame
		* was received.
		*/
		u32 connection_rate:4;

		u32 reserved:23;

		/**
		* This field represents the actual header data received on the link.
		*/
		u32 data[SCU_UNSOLICITED_FRAME_HEADER_DATA_DWORDS];

		};



		/**
		* enum unsolicited_frame_state -