isci: add support for 2 more oem parmeters

1/ add OEM paramater support for mode_type (MPC vs APC)
2/ add OEM parameter support for max_number_concurrent_device_spin_up
3/ cleanup scic_sds_controller_start_next_phy

todo: hook up the amp control afe parameters into the afe init code

Signed-off-by: Henryk Dembkowski <henryk.dembkowski@intel.com>
Signed-off-by: Jacek Danecki <Jacek.Danecki@intel.com>
[cleaned up scic_sds_controller_start_next_phy]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

7 files changed, 176 insertions, 155 deletions

diff --git a/drivers/scsi/isci/core/scic_config_parameters.h b/drivers/scsi/isci/core/scic_config_parameters.h
index 5e1345daf014..f64f24fad5a3 100644
--- a/drivers/scsi/isci/core/scic_config_parameters.h
+++ b/drivers/scsi/isci/core/scic_config_parameters.h
@@ -224,6 +224,8 @@ union scic_user_parameters {
  */
 #define SCIC_SDS_PARM_PHY_MASK_MAX 0xF
 
+#define MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT 4
+
 /**
  * This structure/union specifies the various different OEM parameter sets
  *    available.  Each type is specific to a hardware controller version.
@@ -237,7 +239,6 @@ union scic_oem_parameters {
          * 1.
          */
         struct scic_sds_oem_params sds1;
-
 };
 
 /**
diff --git a/drivers/scsi/isci/core/scic_sds_controller.c b/drivers/scsi/isci/core/scic_sds_controller.c
index e7f3711b4afc..12b2ad5a28b0 100644
--- a/drivers/scsi/isci/core/scic_sds_controller.c
+++ b/drivers/scsi/isci/core/scic_sds_controller.c
@@ -293,6 +293,7 @@ void scic_sds_controller_initialize_power_control(
                 );
 
         this_controller->power_control.phys_waiting = 0;
+        this_controller->power_control.phys_granted_power = 0;
 }
 
 /* --------------------------------------------------------------------------- */
@@ -770,31 +771,6 @@ void scic_sds_controller_timeout_handler(
                         __func__);
 }
 
-/**
- * scic_sds_controller_get_port_configuration_mode
- * @this_controller: This is the controller to use to determine if we are using
- *    manual or automatic port configuration.
- *
- * SCIC_PORT_CONFIGURATION_MODE
- */
-enum SCIC_PORT_CONFIGURATION_MODE scic_sds_controller_get_port_configuration_mode(
-        struct scic_sds_controller *this_controller)
-{
-        u32 index;
-        enum SCIC_PORT_CONFIGURATION_MODE mode;
-
-        mode = SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE;
-
-        for (index = 0; index < SCI_MAX_PORTS; index++) {
-                if (this_controller->oem_parameters.sds1.ports[index].phy_mask != 0) {
-                        mode = SCIC_PORT_MANUAL_CONFIGURATION_MODE;
-                        break;
-                }
-        }
-
-        return mode;
-}
-
 enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller *scic)
 {
         u32 index;
@@ -859,7 +835,7 @@ void scic_sds_controller_phy_timer_stop(
 
 /**
  * This method is called internally by the controller object to start the next
- *    phy on the controller.  If all the phys have been starte, then this
+ *    phy on the controller.  If all the phys have been started, then this
  *    method will attempt to transition the controller to the READY state and
  *    inform the user (scic_cb_controller_start_complete()).
  * @this_controller: This parameter specifies the controller object for which
@@ -867,101 +843,88 @@ void scic_sds_controller_phy_timer_stop(
  *
  * enum sci_status
  */
-enum sci_status scic_sds_controller_start_next_phy(
-        struct scic_sds_controller *this_controller)
+enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_controller *scic)
 {
+        struct scic_sds_oem_params *oem = &scic->oem_parameters.sds1;
+        struct scic_sds_phy *sci_phy;
         enum sci_status status;
 
         status = SCI_SUCCESS;
 
-        if (this_controller->phy_startup_timer_pending == false) {
-                if (this_controller->next_phy_to_start == SCI_MAX_PHYS) {
-                        bool is_controller_start_complete = true;
-                        struct scic_sds_phy *the_phy;
-                        u8 index;
+        if (scic->phy_startup_timer_pending)
+                return status;
 
-                        for (index = 0; index < SCI_MAX_PHYS; index++) {
-                                the_phy = &this_controller->phy_table[index];
-
-                                if (scic_sds_phy_get_port(the_phy) != NULL) {
-                                        /**
-                                         * The controller start operation is complete if and only
-                                         * if:
-                                         * - all links have been given an opportunity to start
-                                         * - have no indication of a connected device
-                                         * - have an indication of a connected device and it has
-                                         *   finished the link training process.
-                                         */
-                                        if (
-                                                (
-                                                        (the_phy->is_in_link_training == false)
-                                                        && (the_phy->parent.state_machine.current_state_id
-                                                            == SCI_BASE_PHY_STATE_INITIAL)
-                                                )
-                                                || (
-                                                        (the_phy->is_in_link_training == false)
-                                                        && (the_phy->parent.state_machine.current_state_id
-                                                            == SCI_BASE_PHY_STATE_STOPPED)
-                                                        )
-                                                || (
-                                                        (the_phy->is_in_link_training == true)
-                                                        && (the_phy->parent.state_machine.current_state_id
-                                                            == SCI_BASE_PHY_STATE_STARTING)
-                                                        )
-                                                ) {
-                                                is_controller_start_complete = false;
-                                                break;
-                                        }
-                                }
-                        }
+        if (scic->next_phy_to_start >= SCI_MAX_PHYS) {
+                bool is_controller_start_complete = true;
+                u32 state;
+                u8 index;
 
-                        /*
-                         * The controller has successfully finished the start process.
-                         * Inform the SCI Core user and transition to the READY state. */
-                        if (is_controller_start_complete == true) {
-                                scic_sds_controller_transition_to_ready(
-                                        this_controller, SCI_SUCCESS
-                                        );
-                                scic_sds_controller_phy_timer_stop(this_controller);
+                for (index = 0; index < SCI_MAX_PHYS; index++) {
+                        sci_phy = &scic->phy_table[index];
+                        state = sci_phy->parent.state_machine.current_state_id;
+
+                        if (!scic_sds_phy_get_port(sci_phy))
+                                continue;
+
+                        /* The controller start operation is complete iff:
+                         * - all links have been given an opportunity to start
+                         * - have no indication of a connected device
+                         * - have an indication of a connected device and it has
+                         *   finished the link training process.
+                         */
+                        if ((sci_phy->is_in_link_training == false &&
+                             state == SCI_BASE_PHY_STATE_INITIAL) ||