isci: add support for 2 more oem parmeters

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / isci / core / scic_sds_controller.h

diff --git a/drivers/scsi/isci/core/scic_sds_controller.h b/drivers/scsi/isci/core/scic_sds_controller.h
index 9b8e55d62910ea91b2672299d0c589678ae15c78..6386a64896c0703f6bad4bad7df18fcf2a76a408 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_controller.h
+++ b/drivers/scsi/isci/core/scic_sds_controller.h
@@ -121,23 +121,6 @@ enum SCIC_SDS_CONTROLLER_MEMORY_DESCRIPTORS {
 };
 
 
-/**
- *
- *
- * Allowed PORT configuration modes APC Automatic PORT configuration mode is
- * defined by the OEM configuration parameters providing no PHY_MASK parameters
- * for any PORT. i.e. There are no phys assigned to any of the ports at start.
- * MPC Manual PORT configuration mode is defined by the OEM configuration
- * parameters providing a PHY_MASK value for any PORT.  It is assumed that any
- * PORT with no PHY_MASK is an invalid port and not all PHYs must be assigned.
- * A PORT_PHY mask that assigns just a single PHY to a port and no other PHYs
- * being assigned is sufficient to declare manual PORT configuration.
- */
-enum SCIC_PORT_CONFIGURATION_MODE {
-       SCIC_PORT_MANUAL_CONFIGURATION_MODE,
-       SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE
-};
-
 /**
  * struct scic_power_control -
  *
@@ -163,6 +146,11 @@ struct scic_power_control {
         */
        u8 phys_waiting;
 
+       /**
+        * This field is used to keep track of how many phys have been granted to consume power
+        */
+       u8 phys_granted_power;
+
        /**
         * This field is an array of phys that we are waiting on. The phys are direct
         * mapped into requesters via struct scic_sds_phy.phy_index
@@ -560,14 +548,6 @@ u32 scic_sds_controller_get_object_size(void);
 
 /* --------------------------------------------------------------------------- */
 
-
-/* --------------------------------------------------------------------------- */
-
-enum SCIC_PORT_CONFIGURATION_MODE scic_sds_controller_get_port_configuration_mode(
-       struct scic_sds_controller *this_controller);
-
-/* --------------------------------------------------------------------------- */
-
 void scic_sds_controller_post_request(
        struct scic_sds_controller *this_controller,
        u32 request);