Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / ufs / ufshci.h

diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h
index 0ae0967aaed8c651830d138cc7e3adc40a6f826b..4cb1cc63f1a1bd834fb22a972de9803c47891f24 100644 (file)
--- a/drivers/scsi/ufs/ufshci.h
+++ b/drivers/scsi/ufs/ufshci.h
@@ -92,6 +92,7 @@ enum {
        UFSHCI_VERSION_10 = 0x00010000, /* 1.0 */
        UFSHCI_VERSION_11 = 0x00010100, /* 1.1 */
        UFSHCI_VERSION_20 = 0x00000200, /* 2.0 */
+       UFSHCI_VERSION_21 = 0x00000210, /* 2.1 */
 };
 
 /*
@@ -170,6 +171,8 @@ enum {
 #define UIC_DATA_LINK_LAYER_ERROR              UFS_BIT(31)
 #define UIC_DATA_LINK_LAYER_ERROR_CODE_MASK    0x7FFF
 #define UIC_DATA_LINK_LAYER_ERROR_PA_INIT      0x2000
+#define UIC_DATA_LINK_LAYER_ERROR_NAC_RECEIVED 0x0001
+#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUT 0x0002
 
 /* UECN - Host UIC Error Code Network Layer 40h */
 #define UIC_NETWORK_LAYER_ERROR                        UFS_BIT(31)
@@ -209,6 +212,7 @@ enum {
 
 /* GenSelectorIndex calculation macros for M-PHY attributes */
 #define UIC_ARG_MPHY_TX_GEN_SEL_INDEX(lane) (lane)
+#define UIC_ARG_MPHY_RX_GEN_SEL_INDEX(lane) (PA_MAXDATALANES + (lane))
 
 #define UIC_ARG_MIB_SEL(attr, sel)     ((((attr) & 0xFFFF) << 16) |\
                                         ((sel) & 0xFFFF))