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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

drivers/scsi/isci/Makefile

@@ -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

@@ -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

@@ -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

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

drivers/scsi/isci/core/scic_sds_phy.c

@@ -55,14 +55,13 @@
 
 #include <scsi/sas.h>
 #include "sas.h"
+#include "host.h"
 #include "sci_base_state.h"
 #include "sci_base_state_machine.h"
 #include "scic_phy.h"
-#include "scic_sds_controller.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port.h"
 #include "remote_node_context.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_event_codes.h"
 #include "timers.h"

drivers/scsi/isci/core/scic_sds_port.c

@@ -53,16 +53,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "scic_controller.h"
+#include "host.h"
 #include "scic_phy.h"
 #include "scic_port.h"
-#include "scic_sds_controller.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port.h"
 #include "remote_device.h"
 #include "remote_node_context.h"
 #include "scic_sds_request.h"
-#include "sci_environment.h"
 #include "scu_registers.h"
 #include "timers.h"
 

drivers/scsi/isci/core/scic_sds_port.h

@@ -57,6 +57,7 @@
 #define _SCIC_SDS_PORT_H_
 
 #include <linux/kernel.h>
+#include "isci.h"
 #include "sas.h"
 #include "scu_registers.h"
 #include "sci_base_state_machine.h"

drivers/scsi/isci/core/scic_sds_port_configuration_agent.c

@@ -53,9 +53,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sci_environment.h"
-#include "scic_controller.h"
-#include "scic_sds_controller.h"
+#include "host.h"
 #include "scic_sds_port_configuration_agent.h"
 #include "timers.h"
 

drivers/scsi/isci/core/scic_sds_request.c

@@ -54,9 +54,7 @@
  */
 
 #include <scsi/sas.h>
-#include "scic_controller.h"
 #include "scic_io_request.h"
-#include "scic_sds_controller.h"
 #include "scu_registers.h"
 #include "scic_sds_port.h"
 #include "remote_device.h"
@@ -64,7 +62,6 @@
 #include "scic_sds_smp_request.h"
 #include "scic_sds_stp_request.h"
 #include "scic_sds_unsolicited_frame_control.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_task_context.h"

drivers/scsi/isci/core/scic_sds_smp_request.c

@@ -55,15 +55,13 @@
 
 #include <scsi/sas.h>
 #include "sci_base_state_machine.h"
-#include "scic_controller.h"
-#include "scic_sds_controller.h"
 #include "remote_device.h"
 #include "scic_sds_request.h"
 #include "scic_sds_smp_request.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_task_context.h"
+#include "host.h"
 
 static void scu_smp_request_construct_task_context(
 	struct scic_sds_request *sci_req,

drivers/scsi/isci/core/scic_sds_ssp_request.c

@@ -53,11 +53,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "host.h"
 #include "sci_base_state_machine.h"
-#include "scic_controller.h"
-#include "scic_sds_controller.h"
 #include "scic_sds_request.h"
-#include "sci_environment.h"
 #include "scu_completion_codes.h"
 #include "scu_task_context.h"
 

drivers/scsi/isci/core/scic_sds_stp_request.c

@@ -58,13 +58,11 @@
 #include "sci_base_state.h"
 #include "sci_base_state_machine.h"
 #include "scic_io_request.h"
-#include "scic_sds_controller.h"
 #include "remote_device.h"
 #include "scic_sds_request.h"
 #include "scic_sds_stp_pio_request.h"
 #include "scic_sds_stp_request.h"
 #include "scic_sds_unsolicited_frame_control.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_event_codes.h"

drivers/scsi/isci/core/scic_sds_unsolicited_frame_control.c

@@ -53,19 +53,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**
- * This file contains the implementation of the
- *    struct scic_sds_unsolicited_frame_control object and it's public, protected, and
- *    private methods.
- *
- *
- */
-
+#include "host.h"
 #include "scic_sds_unsolicited_frame_control.h"
 #include "scu_registers.h"
-#include "scic_sds_controller.h"
 #include "sci_util.h"
-#include "sci_environment.h"
 
 /**
  * This method will program the unsolicited frames (UFs) into the UF address

drivers/scsi/isci/init.c

@@ -61,9 +61,7 @@
 #include <asm/string.h>
 #include "isci.h"
 #include "task.h"
-#include "sci_environment.h"
 #include "probe_roms.h"
-#include "scic_controller.h"
 
 static struct scsi_transport_template *isci_transport_template;
 

drivers/scsi/isci/isci.h

@@ -532,10 +532,4 @@ extern unsigned char max_concurr_spinup;
 irqreturn_t isci_msix_isr(int vec, void *data);
 irqreturn_t isci_intx_isr(int vec, void *data);
 irqreturn_t isci_error_isr(int vec, void *data);
-
-struct scic_sds_controller;
-bool scic_sds_controller_isr(struct scic_sds_controller *scic);
-void scic_sds_controller_completion_handler(struct scic_sds_controller *scic);
-bool scic_sds_controller_error_isr(struct scic_sds_controller *scic);
-void scic_sds_controller_error_handler(struct scic_sds_controller *scic);
 #endif  /* __ISCI_H__ */

drivers/scsi/isci/port.c

@@ -53,13 +53,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**
- * This file contains the isci port implementation.
- *
- *
- */
-
-
 #include <linux/workqueue.h>
 #include "isci.h"
 #include "scic_io_request.h"
@@ -68,7 +61,6 @@
 #include "scic_port.h"
 #include "port.h"
 #include "request.h"
-#include "core/scic_sds_controller.h"
 
 static void isci_port_change_state(struct isci_port *iport, enum isci_status status)
 {

drivers/scsi/isci/probe_roms.c

@@ -32,7 +32,6 @@
 
 #include "isci.h"
 #include "task.h"
-#include "sci_environment.h"
 #include "probe_roms.h"
 
 struct efi_variable {

drivers/scsi/isci/remote_device.c

@@ -57,16 +57,13 @@
 #include "port.h"
 #include "remote_device.h"
 #include "request.h"
-#include "scic_controller.h"
 #include "scic_io_request.h"
 #include "scic_phy.h"
 #include "scic_port.h"
-#include "scic_sds_controller.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port.h"
 #include "remote_node_context.h"
 #include "scic_sds_request.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_event_codes.h"
 #include "task.h"

drivers/scsi/isci/remote_node_context.c

@@ -53,12 +53,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "host.h"
 #include "sci_base_state_machine.h"
-#include "scic_sds_controller.h"
 #include "scic_sds_port.h"
 #include "remote_device.h"
 #include "remote_node_context.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_event_codes.h"
 #include "scu_task_context.h"

drivers/scsi/isci/remote_node_table.c

@@ -60,7 +60,6 @@
  *
  */
 #include "sci_util.h"
-#include "sci_environment.h"
 #include "remote_node_table.h"
 #include "remote_node_context.h"
 

drivers/scsi/isci/request.c

@@ -62,7 +62,6 @@
 #include "sata.h"
 #include "scu_completion_codes.h"
 #include "scic_sds_request.h"
-#include "scic_controller.h"
 #include "sas.h"
 
 static enum sci_status isci_request_ssp_request_construct(

drivers/scsi/isci/sci_environment.h

-/*
- * 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_ENVIRONMENT_H_
-#define _SCI_ENVIRONMENT_H_
-
-#include "host.h"
-
-
-static inline struct device *scic_to_dev(struct scic_sds_controller *scic)
-{
-	return &scic_to_ihost(scic)->pdev->dev;
-}
-
-static inline struct device *sciphy_to_dev(struct scic_sds_phy *sci_phy)
-{
-	struct isci_phy *iphy = sci_phy_to_iphy(sci_phy);
-
-	if (!iphy || !iphy->isci_port || !iphy->isci_port->isci_host)
-		return NULL;
-
-	return &iphy->isci_port->isci_host->pdev->dev;
-}
-
-static inline struct device *sciport_to_dev(struct scic_sds_port *sci_port)
-{
-	struct isci_port *iport = sci_port_to_iport(sci_port);
-
-	if (!iport || !iport->isci_host)
-		return NULL;
-
-	return &iport->isci_host->pdev->dev;
-}
-
-static inline struct device *scirdev_to_dev(
-		struct scic_sds_remote_device *sci_dev)
-{
-	struct isci_remote_device *idev =
-			container_of(sci_dev, typeof(*idev), sci);
-
-	if (!idev || !idev->isci_port || !idev->isci_port->isci_host)
-		return NULL;
-
-	return &idev->isci_port->isci_host->pdev->dev;
-}
-
-enum {
-	ISCI_SI_REVA0,
-	ISCI_SI_REVA2,
-	ISCI_SI_REVB0,
-};
-
-extern int isci_si_rev;
-
-static inline bool is_a0(void)
-{
-	return isci_si_rev == ISCI_SI_REVA0;
-}
-
-static inline bool is_a2(void)
-{
-	return isci_si_rev == ISCI_SI_REVA2;
-}
-
-static inline bool is_b0(void)
-{
-	return isci_si_rev > ISCI_SI_REVA2;
-}
-
-#endif

drivers/scsi/isci/task.c

@@ -65,7 +65,6 @@
 #include "sata.h"
 #include "task.h"
 #include "scic_sds_request.h"
-#include "scic_controller.h"
 #include "timers.h"
 
 /**