isci: renaming sas_capabilities to scic_phy_cap

This seems to be a data structure that represents the phy capabilities
register from the hardware and has nothing to do with SAS data structs.
Moving and fixup

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/scsi/isci/core/intel_sas.h b/drivers/scsi/isci/core/intel_sas.h
index 61a5ececdd528ea9bf3ee87e5076eb29c223b697..91c30cfee21d316410212940e38d086bdcf3999d 100644 (file)
--- a/drivers/scsi/isci/core/intel_sas.h
+++ b/drivers/scsi/isci/core/intel_sas.h
@@ -111,42 +111,6 @@ struct sci_sas_identify_address_frame_protocols {
 
 };
 
-/**
- * struct sas_capabilities - This structure depicts the various SAS
- *    capabilities supported by the directly attached target device.  For
- *    specific information on each of these individual fields please reference
- *    the SAS specification Phy layer section on speed negotiation windows.
- *
- *
- */
-struct sas_capabilities {
-       union {
-               struct {
-                       /**
-                        * The SAS specification indicates the start bit shall always be set to
-                        * 1.  This implementation will have the start bit set to 0 if the
-                        * PHY CAPABILITIES were either not received or speed negotiation failed.
-                        */
-                       u32 start:1;
-                       u32 tx_ssc_type:1;
-                       u32 reserved1:2;
-                       u32 requested_logical_link_rate:4;
-
-                       u32 gen1_without_ssc_supported:1;
-                       u32 gen1_with_ssc_supported:1;
-                       u32 gen2_without_ssc_supported:1;
-                       u32 gen2_with_ssc_supported:1;
-                       u32 gen3_without_ssc_supported:1;
-                       u32 gen3_with_ssc_supported:1;
-                       u32 reserved2:17;
-                       u32 parity:1;
-               } bits;
-
-               u32 all;
-       } u;
-
-};
-
 /**
  * enum _SCI_SAS_TASK_ATTRIBUTE - This enumeration depicts the SAM/SAS
  *    specification defined task attribute values for a command information

diff --git a/drivers/scsi/isci/core/scic_phy.h b/drivers/scsi/isci/core/scic_phy.h
index 4e4a6b1f9953ed418239cfc6f94cd5f738a2ebb8..8fcd3a4c57445c9d2a8f4791ab32da3fdcb1d8e6 100644 (file)
--- a/drivers/scsi/isci/core/scic_phy.h
+++ b/drivers/scsi/isci/core/scic_phy.h
@@ -75,6 +75,34 @@ struct scic_sds_port;
 
 enum sas_linkrate sci_phy_linkrate(struct scic_sds_phy *sci_phy);
 
+struct scic_phy_cap {
+       union {
+               struct {
+                       /*
+                        * The SAS specification indicates the start bit shall
+                        * always be set to
+                        * 1.  This implementation will have the start bit set
+                        * to 0 if the PHY CAPABILITIES were either not
+                        * received or speed negotiation failed.
+                        */
+                       u8 start:1;
+                       u8 tx_ssc_type:1;
+                       u8 res1:2;
+                       u8 req_logical_linkrate:4;
+
+                       u32 gen1_no_ssc:1;
+                       u32 gen1_ssc:1;
+                       u32 gen2_no_ssc:1;
+                       u32 gen2_ssc:1;
+                       u32 gen3_no_ssc:1;
+                       u32 gen3_ssc:1;
+                       u32 res2:17;
+                       u32 parity:1;
+               };
+               u32 all;
+       };
+}  __packed;
+
 /**
  * struct scic_phy_properties - This structure defines the properties common to
  *    all phys that can be retrieved.
@@ -125,7 +153,7 @@ struct scic_sas_phy_properties {
         * This field delineates the Phy capabilities structure received
         * from the remote end point.
         */
-       struct sas_capabilities received_capabilities;
+       struct scic_phy_cap rcvd_cap;
 
 };
 

diff --git a/drivers/scsi/isci/core/scic_sds_phy.c b/drivers/scsi/isci/core/scic_sds_phy.c
index 0e381cff25a940f21b10831194e87d40ed1b81ad..bd2b3058770383e90ca584761318ee790444ba4d 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_phy.c
+++ b/drivers/scsi/isci/core/scic_sds_phy.c
@@ -122,12 +122,15 @@ static enum sci_status
 scic_sds_phy_link_layer_initialization(struct scic_sds_phy *sci_phy,
                                       struct scu_link_layer_registers __iomem *link_layer_registers)
 {
-       struct scic_sds_controller *scic = sci_phy->owning_port->owning_controller;
+       struct scic_sds_controller *scic =
+               sci_phy->owning_port->owning_controller;
        int phy_idx = sci_phy->phy_index;
-       struct sci_phy_user_params *phy_user = &scic->user_parameters.sds1.phys[phy_idx];
-       struct sci_phy_oem_params *phy_oem = &scic->oem_parameters.sds1.phys[phy_idx];
+       struct sci_phy_user_params *phy_user =
+               &scic->user_parameters.sds1.phys[phy_idx];
+       struct sci_phy_oem_params *phy_oem =
+               &scic->oem_parameters.sds1.phys[phy_idx];
        u32 phy_configuration;
-       struct sas_capabilities phy_capabilities;
+       struct scic_phy_cap phy_cap;
        u32 parity_check = 0;
        u32 parity_count = 0;
        u32 llctl, link_rate;
@@ -146,7 +149,8 @@ scic_sds_phy_link_layer_initialization(struct scic_sds_phy *sci_phy,
               &sci_phy->link_layer_registers->transmit_identification);
 
        /* Write the device SAS Address */
-       writel(0xFEDCBA98, &sci_phy->link_layer_registers->sas_device_name_high);
+       writel(0xFEDCBA98,
+              &sci_phy->link_layer_registers->sas_device_name_high);
        writel(phy_idx, &sci_phy->link_layer_registers->sas_device_name_low);
 
        /* Write the source SAS Address */
@@ -170,21 +174,21 @@ scic_sds_phy_link_layer_initialization(struct scic_sds_phy *sci_phy,
                &sci_phy->link_layer_registers->phy_configuration);
 
        /* Configure the SNW capabilities */
-       phy_capabilities.u.all = 0;
-       phy_capabilities.u.bits.start                      = 1;
-       phy_capabilities.u.bits.gen3_without_ssc_supported = 1;
-       phy_capabilities.u.bits.gen2_without_ssc_supported = 1;
-       phy_capabilities.u.bits.gen1_without_ssc_supported = 1;
+       phy_cap.all = 0;
+       phy_cap.start = 1;
+       phy_cap.gen3_no_ssc = 1;
+       phy_cap.gen2_no_ssc = 1;
+       phy_cap.gen1_no_ssc = 1;
        if (scic->oem_parameters.sds1.controller.do_enable_ssc == true) {
-               phy_capabilities.u.bits.gen3_with_ssc_supported = 1;
-               phy_capabilities.u.bits.gen2_with_ssc_supported = 1;
-               phy_capabilities.u.bits.gen1_with_ssc_supported = 1;
+               phy_cap.gen3_ssc = 1;
+               phy_cap.gen2_ssc = 1;
+               phy_cap.gen1_ssc = 1;
        }
 
        /*
         * The SAS specification indicates that the phy_capabilities that
         * are transmitted shall have an even parity.  Calculate the parity. */
-       parity_check = phy_capabilities.u.all;
+       parity_check = phy_cap.all;
        while (parity_check != 0) {
                if (parity_check & 0x1)
                        parity_count++;
@@ -195,10 +199,9 @@ scic_sds_phy_link_layer_initialization(struct scic_sds_phy *sci_phy,
         * If parity indicates there are an odd number of bits set, then
         * set the parity bit to 1 in the phy capabilities. */
        if ((parity_count % 2) != 0)
-               phy_capabilities.u.bits.parity = 1;
+               phy_cap.parity = 1;
 
-       writel(phy_capabilities.u.all,
-               &sci_phy->link_layer_registers->phy_capabilities);
+       writel(phy_cap.all, &sci_phy->link_layer_registers->phy_capabilities);
 
        /* Set the enable spinup period but disable the ability to send
         * notify enable spinup
@@ -561,7 +564,7 @@ enum sci_status scic_sas_phy_get_properties(
                       &sci_phy->phy_type.sas_id_frame,
                       sizeof(struct sas_identify_frame));
 
-               properties->received_capabilities.u.all =
+               properties->rcvd_cap.all =
                        readl(&sci_phy->link_layer_registers->receive_phycap);
 
                return SCI_SUCCESS;