svn commit: r280276 - in stable/10/sys/dev: ahci ata mvs siis

[Alexander Motin]

Author: mav
Date: Fri Mar 20 08:28:11 2015
New Revision: 280276
URL: https://svnweb.freebsd.org/changeset/base/280276

Log:
  MFC r279963: Fix SATA Gen3 speed constants.

Modified:
  stable/10/sys/dev/ahci/ahci.h
  stable/10/sys/dev/ata/ata-all.h
  stable/10/sys/dev/mvs/mvs.h
  stable/10/sys/dev/siis/siis.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ahci/ahci.h
==============================================================================
--- stable/10/sys/dev/ahci/ahci.h	Fri Mar 20 07:12:02 2015	(r280275)
+++ stable/10/sys/dev/ahci/ahci.h	Fri Mar 20 08:28:11 2015	(r280276)
@@ -93,7 +93,7 @@
 #define         ATA_SS_SPD_NO_SPEED     0x00000000
 #define         ATA_SS_SPD_GEN1         0x00000010
 #define         ATA_SS_SPD_GEN2         0x00000020
-#define         ATA_SS_SPD_GEN3         0x00000040
+#define         ATA_SS_SPD_GEN3         0x00000030
 
 #define         ATA_SS_IPM_MASK         0x00000f00
 #define         ATA_SS_IPM_NO_DEVICE    0x00000000
@@ -131,7 +131,7 @@
 #define         ATA_SC_SPD_NO_SPEED     0x00000000
 #define         ATA_SC_SPD_SPEED_GEN1   0x00000010
 #define         ATA_SC_SPD_SPEED_GEN2   0x00000020
-#define         ATA_SC_SPD_SPEED_GEN3   0x00000040
+#define         ATA_SC_SPD_SPEED_GEN3   0x00000030
 
 #define         ATA_SC_IPM_MASK         0x00000f00
 #define         ATA_SC_IPM_NONE         0x00000000

Modified: stable/10/sys/dev/ata/ata-all.h
==============================================================================
--- stable/10/sys/dev/ata/ata-all.h	Fri Mar 20 07:12:02 2015	(r280275)
+++ stable/10/sys/dev/ata/ata-all.h	Fri Mar 20 08:28:11 2015	(r280276)
@@ -105,6 +105,7 @@
 #define         ATA_SS_SPD_NO_SPEED     0x00000000
 #define         ATA_SS_SPD_GEN1         0x00000010
 #define         ATA_SS_SPD_GEN2         0x00000020
+#define         ATA_SS_SPD_GEN3         0x00000030
 
 #define         ATA_SS_IPM_MASK         0x00000f00
 #define         ATA_SS_IPM_NO_DEVICE    0x00000000
@@ -140,7 +141,7 @@
 #define         ATA_SC_SPD_NO_SPEED     0x00000000
 #define         ATA_SC_SPD_SPEED_GEN1   0x00000010
 #define         ATA_SC_SPD_SPEED_GEN2   0x00000020
-#define         ATA_SC_SPD_SPEED_GEN3   0x00000040
+#define         ATA_SC_SPD_SPEED_GEN3   0x00000030
 
 #define         ATA_SC_IPM_MASK         0x00000f00
 #define         ATA_SC_IPM_NONE         0x00000000

Modified: stable/10/sys/dev/mvs/mvs.h
==============================================================================
--- stable/10/sys/dev/mvs/mvs.h	Fri Mar 20 07:12:02 2015	(r280275)
+++ stable/10/sys/dev/mvs/mvs.h	Fri Mar 20 08:28:11 2015	(r280276)
@@ -263,7 +263,7 @@
 #define        SATA_SS_SPD_NO_SPEED     0x00000000
 #define        SATA_SS_SPD_GEN1         0x00000010
 #define        SATA_SS_SPD_GEN2         0x00000020
-#define        SATA_SS_SPD_GEN3         0x00000040
+#define        SATA_SS_SPD_GEN3         0x00000030
 
 #define        SATA_SS_IPM_MASK         0x00000f00
 #define        SATA_SS_IPM_NO_DEVICE    0x00000000
@@ -298,7 +298,7 @@
 #define        SATA_SC_SPD_NO_SPEED     0x00000000
 #define        SATA_SC_SPD_SPEED_GEN1   0x00000010
 #define        SATA_SC_SPD_SPEED_GEN2   0x00000020
-#define        SATA_SC_SPD_SPEED_GEN3   0x00000040
+#define        SATA_SC_SPD_SPEED_GEN3   0x00000030
 
 #define        SATA_SC_IPM_MASK         0x00000f00
 #define        SATA_SC_IPM_NONE         0x00000000

Modified: stable/10/sys/dev/siis/siis.h
==============================================================================
--- stable/10/sys/dev/siis/siis.h	Fri Mar 20 07:12:02 2015	(r280275)
+++ stable/10/sys/dev/siis/siis.h	Fri Mar 20 08:28:11 2015	(r280276)
@@ -92,7 +92,7 @@
 #define         ATA_SS_SPD_NO_SPEED     0x00000000
 #define         ATA_SS_SPD_GEN1         0x00000010
 #define         ATA_SS_SPD_GEN2         0x00000020
-#define         ATA_SS_SPD_GEN3         0x00000040
+#define         ATA_SS_SPD_GEN3         0x00000030
 
 #define         ATA_SS_IPM_MASK         0x00000f00
 #define         ATA_SS_IPM_NO_DEVICE    0x00000000
@@ -128,7 +128,7 @@
 #define         ATA_SC_SPD_NO_SPEED     0x00000000
 #define         ATA_SC_SPD_SPEED_GEN1   0x00000010
 #define         ATA_SC_SPD_SPEED_GEN2   0x00000020
-#define         ATA_SC_SPD_SPEED_GEN3   0x00000040
+#define         ATA_SC_SPD_SPEED_GEN3   0x00000030
 
 #define         ATA_SC_IPM_MASK         0x00000f00
 #define         ATA_SC_IPM_NONE         0x00000000