scsi: ufs: Rearrange addresses in increasing order

Rearrange all the unipro and mphy addresses in their increasing order.

Link: https://lore.kernel.org/r/20220615121204.16642-3-alim.akhtar@samsung.com
Reviewed-by: Chanho Park <chanho61.park@samsung.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h
index ade92e8d367616d4fb40b052db193000beaa2999..4cbfe92727875416ed7a658a9464a8b3437c12bb 100644 (file)
--- a/include/ufs/unipro.h
+++ b/include/ufs/unipro.h
@@ -38,6 +38,18 @@
 /*
  * M-RX Configuration Attributes
  */
+#define RX_HS_G1_SYNC_LENGTH_CAP               0x008B
+#define RX_HS_G1_PREP_LENGTH_CAP               0x008C
+#define RX_MIN_ACTIVATETIME_CAPABILITY         0x008F
+#define RX_HIBERN8TIME_CAPABILITY              0x0092
+#define RX_HS_G2_SYNC_LENGTH_CAP               0x0094
+#define RX_HS_G3_SYNC_LENGTH_CAP               0x0095
+#define RX_HS_G2_PREP_LENGTH_CAP               0x0096
+#define RX_HS_G3_PREP_LENGTH_CAP               0x0097
+#define RX_ADV_GRANULARITY_CAP                 0x0098
+#define RX_HIBERN8TIME_CAP                     0x0092
+#define RX_ADV_HIBERN8TIME_CAP                 0x0099
+#define RX_ADV_MIN_ACTIVATETIME_CAP            0x009A
 #define RX_MODE                                        0x00A1
 #define RX_HSRATE_SERIES                       0x00A2
 #define RX_HSGEAR                              0x00A3
@@ -47,31 +59,19 @@
 #define RX_ENTER_HIBERN8                       0x00A7
 #define RX_BYPASS_8B10B_ENABLE                 0x00A8
 #define RX_TERMINATION_FORCE_ENABLE            0x00A9
-#define RX_MIN_ACTIVATETIME_CAPABILITY         0x008F
-#define RX_HIBERN8TIME_CAPABILITY              0x0092
+#define RXCALCTRL                              0x00B4
+#define RXSQCTRL                               0x00B5
+#define CFGRXCDR8                              0x00BA
+#define CFGRXOVR8                              0x00BD
+#define CFGRXOVR6                              0x00BF
+#define RXDIRECTCTRL2                          0x00C7
+#define CFGRXOVR4                              0x00E9
 #define RX_REFCLKFREQ                          0x00EB
 #define        RX_CFGCLKFREQVAL                        0x00EC
 #define CFGWIDEINLN                            0x00F0
-#define CFGRXCDR8                              0x00BA
 #define ENARXDIRECTCFG4                                0x00F2
-#define CFGRXOVR8                              0x00BD
-#define RXDIRECTCTRL2                          0x00C7
 #define ENARXDIRECTCFG3                                0x00F3
-#define RXCALCTRL                              0x00B4
 #define ENARXDIRECTCFG2                                0x00F4
-#define CFGRXOVR4                              0x00E9
-#define RXSQCTRL                               0x00B5
-#define CFGRXOVR6                              0x00BF
-#define RX_HS_G1_SYNC_LENGTH_CAP               0x008B
-#define RX_HS_G1_PREP_LENGTH_CAP               0x008C
-#define RX_HS_G2_SYNC_LENGTH_CAP               0x0094
-#define RX_HS_G3_SYNC_LENGTH_CAP               0x0095
-#define RX_HS_G2_PREP_LENGTH_CAP               0x0096
-#define RX_HS_G3_PREP_LENGTH_CAP               0x0097
-#define RX_ADV_GRANULARITY_CAP                 0x0098
-#define RX_HIBERN8TIME_CAP                     0x0092
-#define RX_ADV_HIBERN8TIME_CAP                 0x0099
-#define RX_ADV_MIN_ACTIVATETIME_CAP            0x009A
 
 
 #define is_mphy_tx_attr(attr)                  (attr < RX_MODE)
@@ -102,47 +102,50 @@
 /*
  * PHY Adapter attributes
  */
-#define PA_ACTIVETXDATALANES   0x1560
-#define PA_ACTIVERXDATALANES   0x1580
-#define PA_TXTRAILINGCLOCKS    0x1564
 #define PA_PHY_TYPE            0x1500
 #define PA_AVAILTXDATALANES    0x1520
-#define PA_AVAILRXDATALANES    0x1540
-#define PA_MINRXTRAILINGCLOCKS 0x1543
-#define PA_TXPWRSTATUS         0x1567
-#define PA_RXPWRSTATUS         0x1582
-#define PA_TXFORCECLOCK                0x1562
-#define PA_TXPWRMODE           0x1563
-#define PA_LEGACYDPHYESCDL     0x1570
 #define PA_MAXTXSPEEDFAST      0x1521
 #define PA_MAXTXSPEEDSLOW      0x1522
 #define PA_MAXRXSPEEDFAST      0x1541
 #define PA_MAXRXSPEEDSLOW      0x1542
 #define PA_TXLINKSTARTUPHS     0x1544
+#define PA_AVAILRXDATALANES    0x1540
+#define PA_MINRXTRAILINGCLOCKS 0x1543
 #define PA_LOCAL_TX_LCC_ENABLE 0x155E
+#define PA_ACTIVETXDATALANES   0x1560
+#define PA_CONNECTEDTXDATALANES        0x1561
+#define PA_TXFORCECLOCK                0x1562
+#define PA_TXPWRMODE           0x1563
+#define PA_TXTRAILINGCLOCKS    0x1564
 #define PA_TXSPEEDFAST         0x1565
 #define PA_TXSPEEDSLOW         0x1566
-#define PA_REMOTEVERINFO       0x15A0
+#define PA_TXPWRSTATUS         0x1567
 #define PA_TXGEAR              0x1568
 #define PA_TXTERMINATION       0x1569
 #define PA_HSSERIES            0x156A
+#define PA_LEGACYDPHYESCDL     0x1570
 #define PA_PWRMODE             0x1571
+#define PA_ACTIVERXDATALANES   0x1580
+#define PA_CONNECTEDRXDATALANES        0x1581
+#define PA_RXPWRSTATUS         0x1582
 #define PA_RXGEAR              0x1583
 #define PA_RXTERMINATION       0x1584
 #define PA_MAXRXPWMGEAR                0x1586
 #define PA_MAXRXHSGEAR         0x1587
+#define PA_PACPREQTIMEOUT      0x1590
+#define PA_PACPREQEOBTIMEOUT   0x1591
+#define PA_REMOTEVERINFO       0x15A0
+#define PA_LOGICALLANEMAP      0x15A1
+#define PA_SLEEPNOCONFIGTIME   0x15A2
+#define PA_STALLNOCONFIGTIME   0x15A3
+#define PA_SAVECONFIGTIME      0x15A4
 #define PA_RXHSUNTERMCAP       0x15A5
 #define PA_RXLSTERMCAP         0x15A6
 #define PA_GRANULARITY         0x15AA
-#define PA_PACPREQTIMEOUT      0x1590
-#define PA_PACPREQEOBTIMEOUT   0x1591
 #define PA_HIBERN8TIME         0x15A7
 #define PA_LOCALVERINFO                0x15A9
 #define PA_GRANULARITY         0x15AA
 #define PA_TACTIVATE           0x15A8
-#define PA_PACPFRAMECOUNT      0x15C0
-#define PA_PACPERRORCOUNT      0x15C1
-#define PA_PHYTESTCONTROL      0x15C2
 #define PA_PWRMODEUSERDATA0    0x15B0
 #define PA_PWRMODEUSERDATA1    0x15B1
 #define PA_PWRMODEUSERDATA2    0x15B2
@@ -155,12 +158,9 @@
 #define PA_PWRMODEUSERDATA9    0x15B9
 #define PA_PWRMODEUSERDATA10   0x15BA
 #define PA_PWRMODEUSERDATA11   0x15BB
-#define PA_CONNECTEDTXDATALANES        0x1561
-#define PA_CONNECTEDRXDATALANES        0x1581
-#define PA_LOGICALLANEMAP      0x15A1
-#define PA_SLEEPNOCONFIGTIME   0x15A2
-#define PA_STALLNOCONFIGTIME   0x15A3
-#define PA_SAVECONFIGTIME      0x15A4
+#define PA_PACPFRAMECOUNT      0x15C0
+#define PA_PACPERRORCOUNT      0x15C1
+#define PA_PHYTESTCONTROL      0x15C2
 #define PA_TXHSADAPTTYPE       0x15D4
 
 /* Adpat type for PA_TXHSADAPTTYPE attribute */
@@ -172,9 +172,9 @@
 #define PA_HIBERN8_TIME_UNIT_US                100
 
 /*Other attributes*/
+#define VS_POWERSTATE          0xD083
 #define VS_MPHYCFGUPDT         0xD085
 #define VS_DEBUGOMC            0xD09E
-#define VS_POWERSTATE          0xD083
 
 #define PA_GRANULARITY_MIN_VAL 1
 #define PA_GRANULARITY_MAX_VAL 6
@@ -245,27 +245,27 @@ enum ufs_unipro_ver {
 /*
  * Data Link Layer Attributes
  */
+#define DL_TXPREEMPTIONCAP     0x2000
+#define DL_TC0TXMAXSDUSIZE     0x2001
+#define DL_TC0RXINITCREDITVAL  0x2002
+#define DL_TC1TXMAXSDUSIZE     0x2003
+#define DL_TC1RXINITCREDITVAL  0x2004
+#define DL_TC0TXBUFFERSIZE     0x2005
+#define DL_TC1TXBUFFERSIZE     0x2006
 #define DL_TC0TXFCTHRESHOLD    0x2040
 #define DL_FC0PROTTIMEOUTVAL   0x2041
 #define DL_TC0REPLAYTIMEOUTVAL 0x2042
 #define DL_AFC0REQTIMEOUTVAL   0x2043
 #define DL_AFC0CREDITTHRESHOLD 0x2044
 #define DL_TC0OUTACKTHRESHOLD  0x2045
+#define DL_PEERTC0PRESENT      0x2046
+#define DL_PEERTC0RXINITCREVAL 0x2047
 #define DL_TC1TXFCTHRESHOLD    0x2060
 #define DL_FC1PROTTIMEOUTVAL   0x2061
 #define DL_TC1REPLAYTIMEOUTVAL 0x2062
 #define DL_AFC1REQTIMEOUTVAL   0x2063
 #define DL_AFC1CREDITTHRESHOLD 0x2064
 #define DL_TC1OUTACKTHRESHOLD  0x2065
-#define DL_TXPREEMPTIONCAP     0x2000
-#define DL_TC0TXMAXSDUSIZE     0x2001
-#define DL_TC0RXINITCREDITVAL  0x2002
-#define DL_TC0TXBUFFERSIZE     0x2005
-#define DL_PEERTC0PRESENT      0x2046
-#define DL_PEERTC0RXINITCREVAL 0x2047
-#define DL_TC1TXMAXSDUSIZE     0x2003
-#define DL_TC1RXINITCREDITVAL  0x2004
-#define DL_TC1TXBUFFERSIZE     0x2006
 #define DL_PEERTC1PRESENT      0x2066
 #define DL_PEERTC1RXINITCREVAL 0x2067