4 files changed, 13 insertions, 2 deletions

diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h
index 013c7d881948..22027e7946f7 100644
--- a/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/drivers/message/fusion/lsi/mpi_cnfg.h
@@ -2593,6 +2593,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 #define MPI_SAS_IOUNIT0_RATE_SATA_OOB_COMPLETE              (0x03)
 #define MPI_SAS_IOUNIT0_RATE_1_5                            (0x08)
 #define MPI_SAS_IOUNIT0_RATE_3_0                            (0x09)
+#define MPI_SAS_IOUNIT0_RATE_6_0                            (0x0A)
 
 /* see mpi_sas.h for values for SAS IO Unit Page 0 ControllerPhyDeviceInfo values */
 
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h
index 8faa4fab7b89..fd6222882a0e 100644
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
@@ -841,6 +841,7 @@ typedef struct _EVENT_DATA_SAS_PHY_LINK_STATUS
 #define MPI_EVENT_SAS_PLS_LR_RATE_SATA_OOB_COMPLETE         (0x03)
 #define MPI_EVENT_SAS_PLS_LR_RATE_1_5                       (0x08)
 #define MPI_EVENT_SAS_PLS_LR_RATE_3_0                       (0x09)
+#define MPI_EVENT_SAS_PLS_LR_RATE_6_0                       (0x0A)
 
 /* SAS Discovery Event data */
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 3358c0af3466..ec8080c98081 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -7418,7 +7418,12 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply)
                 case MPI_EVENT_SAS_PLS_LR_RATE_3_0:
                         snprintf(evStr, EVENT_DESCR_STR_SZ,
                            "SAS PHY Link Status: Phy=%d:"
-                           " Rate 3.0 Gpbs",PhyNumber);
+                           " Rate 3.0 Gbps", PhyNumber);
+                        break;
+                case MPI_EVENT_SAS_PLS_LR_RATE_6_0:
+                        snprintf(evStr, EVENT_DESCR_STR_SZ,
+                           "SAS PHY Link Status: Phy=%d:"
+                           " Rate 6.0 Gbps", PhyNumber);
                         break;
                 default:
                         snprintf(evStr, EVENT_DESCR_STR_SZ,
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 8aefb1829fcd..518cfcaaaa4e 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -3063,6 +3063,9 @@ static int mptsas_probe_one_phy(struct device *dev,
         case MPI_SAS_IOUNIT0_RATE_3_0:
                 phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS;
                 break;
+        case MPI_SAS_IOUNIT0_RATE_6_0:
+                phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS;
+                break;
         case MPI_SAS_IOUNIT0_RATE_SATA_OOB_COMPLETE:
         case MPI_SAS_IOUNIT0_RATE_UNKNOWN:
         default:
@@ -3691,7 +3694,8 @@ mptsas_send_link_status_event(struct fw_event_work *fw_event)
         }
 
         if (link_rate == MPI_SAS_IOUNIT0_RATE_1_5 ||
-            link_rate == MPI_SAS_IOUNIT0_RATE_3_0) {
+            link_rate == MPI_SAS_IOUNIT0_RATE_3_0 ||
+            link_rate == MPI_SAS_IOUNIT0_RATE_6_0) {
 
                 if (!port_info) {
                         if (ioc->old_sas_discovery_protocal) {