Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc9203bf authored by Dan Williams's avatar Dan Williams
Browse files

isci: move core/controller to host 



Now that the data structures are unified unify the implementation in
host.[ch] and cleanup namespace pollution.

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ce2b3261

drivers/scsi/isci/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ isci-objs := init.o phy.o request.o sata.o \ 
	     host.o task.o probe_roms.o \

	     remote_node_context.o \

	     remote_node_table.o \

	     core/scic_sds_controller.o  \

	     core/scic_sds_request.o \

	     core/scic_sds_stp_request.o \

	     core/scic_sds_port.o \

drivers/scsi/isci/core/sci_util.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 


#include <linux/kernel.h>

#include "sci_util.h"

#include "sci_environment.h"

#include "request.h"



void *scic_request_get_virt_addr(struct scic_sds_request *sci_req, dma_addr_t phys_addr)

drivers/scsi/isci/core/scic_config_parameters.h

+0 −38
Original line number Diff line number Diff line
@@ -229,44 +229,6 @@ union scic_oem_parameters { 
	struct scic_sds_oem_params sds1;

};



/**

 * scic_user_parameters_set() - This method allows the user to attempt to

 *    change the user parameters utilized by the controller.

 * @controller: This parameter specifies the controller on which to set the

 *    user parameters.

 * @user_parameters: This parameter specifies the USER_PARAMETERS object

 *    containing the potential new values.

 *

 * Indicate if the update of the user parameters was successful. SCI_SUCCESS

 * This value is returned if the operation succeeded. SCI_FAILURE_INVALID_STATE

 * This value is returned if the attempt to change the user parameter failed,

 * because changing one of the parameters is not currently allowed.

 * SCI_FAILURE_INVALID_PARAMETER_VALUE This value is returned if the user

 * supplied an invalid interrupt coalescence time, spin up delay interval, etc.

 */

enum sci_status scic_user_parameters_set(

	struct scic_sds_controller *controller,

	union scic_user_parameters *user_parameters);



/**

 * scic_oem_parameters_set() - This method allows the user to attempt to change

 *    the OEM parameters utilized by the controller.

 * @controller: This parameter specifies the controller on which to set the

 *    user parameters.

 * @oem_parameters: This parameter specifies the OEM parameters object

 *    containing the potential new values.

 *

 * Indicate if the update of the user parameters was successful. SCI_SUCCESS

 * This value is returned if the operation succeeded. SCI_FAILURE_INVALID_STATE

 * This value is returned if the attempt to change the user parameter failed,

 * because changing one of the parameters is not currently allowed.

 * SCI_FAILURE_INVALID_PARAMETER_VALUE This value is returned if the user

 * supplied an unsupported value for one of the OEM parameters.

 */

enum sci_status scic_oem_parameters_set(

	struct scic_sds_controller *controller,

	union scic_oem_parameters *oem_parameters);



int scic_oem_parameters_validate(struct scic_sds_oem_params *oem);



/**

drivers/scsi/isci/core/scic_controller.h

deleted100644 → 0
+0 −130
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_CONTROLLER_H_

#define _SCIC_CONTROLLER_H_



#include "scic_config_parameters.h"



struct scic_sds_request;

struct scic_sds_phy;

struct scic_sds_port;

struct scic_sds_remote_device;



enum sci_status scic_controller_construct(struct scic_sds_controller *c,

					  void __iomem *scu_base,

					  void __iomem *smu_base);



void scic_controller_enable_interrupts(

	struct scic_sds_controller *controller);



void scic_controller_disable_interrupts(

	struct scic_sds_controller *controller);



enum sci_status scic_controller_initialize(

	struct scic_sds_controller *controller);



u32 scic_controller_get_suggested_start_timeout(

	struct scic_sds_controller *controller);



enum sci_status scic_controller_start(

	struct scic_sds_controller *controller,

	u32 timeout);



enum sci_status scic_controller_stop(

	struct scic_sds_controller *controller,

	u32 timeout);



enum sci_status scic_controller_reset(

	struct scic_sds_controller *controller);



enum sci_status scic_controller_start_io(

	struct scic_sds_controller *controller,

	struct scic_sds_remote_device *remote_device,

	struct scic_sds_request *io_request,

	u16 io_tag);



enum sci_task_status scic_controller_start_task(

	struct scic_sds_controller *controller,

	struct scic_sds_remote_device *remote_device,

	struct scic_sds_request *task_request,

	u16 io_tag);



enum sci_status scic_controller_terminate_request(

	struct scic_sds_controller *controller,

	struct scic_sds_remote_device *remote_device,

	struct scic_sds_request *request);



enum sci_status scic_controller_complete_io(

	struct scic_sds_controller *controller,

	struct scic_sds_remote_device *remote_device,

	struct scic_sds_request *io_request);



enum sci_status scic_controller_get_phy_handle(

	struct scic_sds_controller *controller,

	u8 phy_index,

	struct scic_sds_phy **phy_handle);



u16 scic_controller_allocate_io_tag(

	struct scic_sds_controller *controller);



enum sci_status scic_controller_free_io_tag(

	struct scic_sds_controller *controller,

	u16 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_ */