redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

isci: uplevel state machine 

unify core/sci_base_state.h and core/sci_base_state_machine.[ch] into
state_machine.[ch]

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
hifive-unleashed-5.1
Dan Williams 2011-05-08 22:15:10 -07:00
parent 63a3a15fb0
commit 3bff9d54ec
15 changed files with 31 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/isci/Makefile
View File

@ -3,6 +3,7 @@ obj-$(CONFIG_SCSI_ISCI) += isci.o
isci-objs := init.o phy.o request.o sata.o \
remote_device.o port.o timers.o \
host.o task.o probe_roms.o \
state_machine.o \
remote_node_context.o \
remote_node_table.o \
unsolicited_frame_control.o \
@ -13,5 +14,4 @@ isci-objs := init.o phy.o request.o sata.o \
core/scic_sds_phy.o \
core/scic_sds_ssp_request.o \
core/scic_sds_smp_request.o \
core/sci_base_state_machine.o \
core/sci_util.o

84
drivers/scsi/isci/core/sci_base_state.h
View File

@ -1,84 +0,0 @@
/*
* 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_STATE_H_
#define _SCI_BASE_STATE_H_
typedef void (*sci_base_state_handler_t)(void);
typedef void (*sci_state_transition_t)(void *base_object);
/**
* struct sci_base_state - The base state object abstracts the fields common to
* all state objects defined in SCI.
*
*
*/
struct sci_base_state {
/**
* This field is a function pointer that defines the method to be
* invoked when the state is entered.
*/
sci_state_transition_t enter_state;
/**
* This field is a function pointer that defines the method to be
* invoked when the state is exited.
*/
sci_state_transition_t exit_state;
};
#endif /* _SCI_BASE_STATE_H_ */

3
drivers/scsi/isci/core/scic_sds_phy.c
View File

@ -56,8 +56,7 @@
#include <scsi/sas.h>
#include "sas.h"
#include "host.h"
#include "sci_base_state.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "scic_phy.h"
#include "scic_sds_phy.h"
#include "scic_sds_port.h"

2
drivers/scsi/isci/core/scic_sds_phy.h
View File

@ -59,7 +59,7 @@
#include "sas.h"
#include "scic_phy.h"
#include "registers.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include <scsi/libsas.h>
struct scic_sds_port;

2
drivers/scsi/isci/core/scic_sds_port.h
View File

@ -60,7 +60,7 @@
#include "isci.h"
#include "sas.h"
#include "registers.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
struct scic_sds_controller;
struct scic_sds_phy;

2
drivers/scsi/isci/core/scic_sds_request.h
View File

@ -58,7 +58,7 @@
#include "isci.h"
#include "scic_io_request.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "scu_task_context.h"
#include "scic_sds_stp_request.h"
#include "sas.h"

2
drivers/scsi/isci/core/scic_sds_smp_request.c
View File

@ -54,7 +54,7 @@
*/
#include <scsi/sas.h>
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "remote_device.h"
#include "scic_sds_request.h"
#include "scic_sds_smp_request.h"

2
drivers/scsi/isci/core/scic_sds_ssp_request.c
View File

@ -54,7 +54,7 @@
*/
#include "host.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "scic_sds_request.h"
#include "scu_completion_codes.h"
#include "scu_task_context.h"

1
drivers/scsi/isci/core/scic_sds_stp_pio_request.h
View File

@ -56,7 +56,6 @@
#ifndef _SCIC_SDS_SATA_PIO_REQUEST_H_
#define _SCIC_SDS_SATA_PIO_REQUEST_H_
#include "sci_base_state.h"
#include "scic_sds_request.h"
#include "scu_task_context.h"

3
drivers/scsi/isci/core/scic_sds_stp_request.c
View File

@ -55,8 +55,7 @@
#include <scsi/sas.h>
#include "sas.h"
#include "sci_base_state.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "scic_io_request.h"
#include "remote_device.h"
#include "scic_sds_request.h"

2
drivers/scsi/isci/host.h
View File

@ -59,7 +59,7 @@
#include "remote_device.h"
#include "phy.h"
#include "pool.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "remote_node_table.h"
#include "registers.h"
#include "scu_unsolicited_frame.h"

2
drivers/scsi/isci/remote_node_context.c
View File

@ -54,7 +54,7 @@
*/
#include "host.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
#include "scic_sds_port.h"
#include "remote_device.h"
#include "remote_node_context.h"

3
drivers/scsi/isci/remote_node_context.h
View File

@ -64,8 +64,7 @@
*
*/
#include "sci_base_state.h"
#include "sci_base_state_machine.h"
#include "state_machine.h"
/**
*

13
drivers/scsi/isci/core/sci_base_state_machine.c → drivers/scsi/isci/state_machine.c
View File

@ -60,7 +60,7 @@
*
*/
#include "sci_base_state_machine.h"
#include "state_machine.h"
static void sci_state_machine_exit_state(struct sci_base_state_machine *sm)
{
@ -121,9 +121,6 @@ void sci_base_state_machine_construct(struct sci_base_state_machine *sm,
void sci_base_state_machine_start(struct sci_base_state_machine *sm)
{
sm->current_state_id = sm->initial_state_id;
#if defined(SCI_BASE_ENABLE_SUBJECT_NOTIFICATION)
sci_base_subject_notify(&sm->parent);
#endif
sci_state_machine_enter_state(sm);
}
@ -137,9 +134,6 @@ void sci_base_state_machine_stop(
struct sci_base_state_machine *sm)
{
sci_state_machine_exit_state(sm);
#if defined(SCI_BASE_ENABLE_SUBJECT_NOTIFICATION)
sci_base_subject_notify(&sm->parent);
#endif
}
/**
@ -158,11 +152,6 @@ void sci_base_state_machine_change_state(
sm->previous_state_id = sm->current_state_id;
sm->current_state_id = next_state;
#if defined(SCI_BASE_ENABLE_SUBJECT_NOTIFICATION)
/* Notify of the state change prior to entering the state. */
sci_base_subject_notify(&sm->parent);
#endif
sci_state_machine_enter_state(sm);
}

24
drivers/scsi/isci/core/sci_base_state_machine.h → drivers/scsi/isci/state_machine.h
View File

@ -56,18 +56,32 @@
#ifndef _SCI_BASE_STATE_MACHINE_H_
#define _SCI_BASE_STATE_MACHINE_H_
#include <linux/string.h>
#include <linux/types.h>
typedef void (*sci_base_state_handler_t)(void);
typedef void (*sci_state_transition_t)(void *base_object);
/**
* This file contains all structures, constants, or method declarations common
* to all state machines defined in SCI.
* struct sci_base_state - The base state object abstracts the fields common to
* all state objects defined in SCI.
*
*
*/
struct sci_base_state {
/**
* This field is a function pointer that defines the method to be
* invoked when the state is entered.
*/
sci_state_transition_t enter_state;
/**
* This field is a function pointer that defines the method to be
* invoked when the state is exited.
*/
sci_state_transition_t exit_state;
#include "sci_base_state.h"
};
/**
* SET_STATE_HANDLER() -