RE: [PATCH v1] ufs: add a variety of definitions decribed in UFS spec
Hi, Subhash I'll update this patch referring what you said below except for creating of "mphy.h". > >> > These things are defined to be used by some UFS Host controllers. > >> > > >> > Signed-off-by: Kiwoong Kim > >> > --- > >> > drivers/scsi/ufs/mphy.h | 38 ++ > >> > drivers/scsi/ufs/ufshci.h | 14 +++--- > >> > drivers/scsi/ufs/unipro.h | 24 > >> > 3 files changed, 73 insertions(+), 3 deletions(-) create mode > >> > 100644 drivers/scsi/ufs/mphy.h > >> > > >> > diff --git a/drivers/scsi/ufs/mphy.h b/drivers/scsi/ufs/mphy.h new > >> > file mode 100644 index 000..c431f49 > >> > --- /dev/null > >> > +++ b/drivers/scsi/ufs/mphy.h > >> > @@ -0,0 +1,38 @@ > >> > +/* > >> > + * drivers/scsi/ufs/mphy.h > >> > + * > >> > + * Copyright (C) 2014 Samsung Electronics Co., Ltd. > >> > + * > >> > + * This program is free software; you can redistribute it and/or > >> > modify > >> > + * it under the terms of the GNU General Public License as > >> > + published > >> > by > >> > + * the Free Software Foundation; either version 2 of the License, > >> > + or > >> > + * (at your option) any later version. > >> > + */ > >> > + > >> > +#ifndef _MPHY_H_ > >> > +#define _MPHY_H_ > >> > >> Do we really need separate file for MPHY? May be we can have these > >> accomodated in unipro.h itself? > > > > I think it's needed. MPHY spec isn't related with Unipro spec directly. > > Yes but for UFS host controller, Unipro is the communication channel > between host and device, includes M-PHY as well. > > > Is there any reason why we say that this file is deprecated? > > Please let me know if you have. > > These are only few declarations and i guess it would be appopriate to put > them under UniPro header file. Anyways it is your choice. As you said, for now, there are not many declarations of mphy. But I expect adding more in the future. I think that all other UFS driver including coming new ones, if any, aren't separated from mphy like "ufs-qcom.c", especially Exynos driver. Anyway, thank you for your opinion. > > > > >> > >> > + > >> > +#define TX_HIBERN8TIME_CAP 0x0f > >> > +#define TX_MIN_ACTIVATE_TIME0x33 > >> > + > >> > +#define RX_HS_G1_SYNC_LEN_CAP 0x8b > >> > +#define RX_HS_G1_PREP_LEN_CAP 0x8c > >> > +#define RX_HS_G2_SYNC_LEN_CAP 0x94 > >> > +#define RX_HS_G3_SYNC_LEN_CAP 0x95 > >> > +#define RX_HS_G2_PREP_LEN_CAP 0x96 > >> > +#define RX_HS_G3_PREP_LEN_CAP 0x97 > >> > + #define SYNC_RANGE_FINE(0 << 6) > >> > + #define SYNC_RANGE_COARSE (1 << 6) > >> > + #define SYNC_LEN(x)((x) & 0x3f) > >> > + #define PREP_LEN(x)((x) & 0xf) > >> > +#define RX_ADV_GRANULARITY_CAP 0x98 > >> > + #define RX_ADV_GRAN_STEP(x)x) & 0x3) << 1) | 0x1) > >> > +#define TX_ADV_GRANULARITY_CAP 0x10 > >> > + #define TX_ADV_GRAN_STEP(x)x) & 0x3) << 1) | 0x1) > >> > +#define RX_MIN_ACTIVATETIME_CAP 0x8f > >> > +#define RX_HIBERN8TIME_CAP 0x92 > >> > +#define RX_ADV_HIBERN8TIME_CAP 0x99 > >> > +#define RX_ADV_MIN_ACTIVATETIME_CAP 0x9a > >> > + > >> > +#endif /* _MPHY_H_ */ > >> > + > >> > diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h > >> > index 9599741..26dc340 100644 > >> > --- a/drivers/scsi/ufs/ufshci.h > >> > +++ b/drivers/scsi/ufs/ufshci.h > >> > @@ -170,17 +170,25 @@ enum { > >> > /* UECDL - Host UIC Error Code Data Link Layer 3Ch */ > >> > #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 > >> > +#define UIC_DATA_LINK_LAYER_ERROR_NAC_RECEIVED UFS_BIT(0) > >> > +#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUTUFS_BIT(1) > >> > +#define UIC_DATA_LINK_LAYER_ERROR_RX_BUF_OF UFS_BIT(5) > >> > >> why don't we just add macros for all the bits in UECDL ? This makes > >> it easy in future. > > > > Okay. I'll think about it and apply new macros on new version of this > > patch. > > > >> > >> > +#define UIC_DATA_LINK_LAYER_ERROR_PA_INIT UFS_BIT(13) > >> > > >> > /* UECN - Host UIC Error Code Network Layer 40h */ > >> > #define UIC_NETWORK_LAYER_ERROR UFS_BIT(31) > >> > #define UIC_NETWORK_LAYER_ERROR_CODE_MASK 0x7 > >> > +#define UIC_NETWORK_UNSUPPORTED_HEADER_TYPE BIT(0) > >> > +#define UIC_NETWORK_BAD_DEVICEID_ENCBIT(1) > >> > +#define UIC_NETWORK_LHDR_TRAP_PACKET_DROPPING BIT(2) > >> > > >> > /* UECT - Host UIC Error Code Transport Layer 44h */ > >> > #define UIC_TRANSPORT_LAYER_ERROR UFS_BIT(31) > >> > #define UIC_TRANSPORT_LAYER_ERROR_CODE_MASK 0x7F > >> > +#define UIC_TRANSPORT_UNSUPPORTED_HEADER_TYPE BIT(0) > >> > +#define UIC_TRANSPORT_UNKN
Re: [PATCH v1] ufs: add a variety of definitions decribed in UFS spec
On 2016-11-08 21:40, Kiwoong Kim wrote: > These things are defined to be used by some UFS Host controllers. > > Signed-off-by: Kiwoong Kim > --- > drivers/scsi/ufs/mphy.h | 38 ++ > drivers/scsi/ufs/ufshci.h | 14 +++--- > drivers/scsi/ufs/unipro.h | 24 > 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 > drivers/scsi/ufs/mphy.h > > diff --git a/drivers/scsi/ufs/mphy.h b/drivers/scsi/ufs/mphy.h new > file mode 100644 index 000..c431f49 > --- /dev/null > +++ b/drivers/scsi/ufs/mphy.h > @@ -0,0 +1,38 @@ > +/* > + * drivers/scsi/ufs/mphy.h > + * > + * Copyright (C) 2014 Samsung Electronics Co., Ltd. > + * > + * This program is free software; you can redistribute it and/or > modify > + * it under the terms of the GNU General Public License as published > by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#ifndef _MPHY_H_ > +#define _MPHY_H_ Do we really need separate file for MPHY? May be we can have these accomodated in unipro.h itself? I think it's needed. MPHY spec isn't related with Unipro spec directly. Yes but for UFS host controller, Unipro is the communication channel between host and device, includes M-PHY as well. Is there any reason why we say that this file is deprecated? Please let me know if you have. These are only few declarations and i guess it would be appopriate to put them under UniPro header file. Anyways it is your choice. > + > +#define TX_HIBERN8TIME_CAP0x0f > +#define TX_MIN_ACTIVATE_TIME 0x33 > + > +#define RX_HS_G1_SYNC_LEN_CAP 0x8b > +#define RX_HS_G1_PREP_LEN_CAP 0x8c > +#define RX_HS_G2_SYNC_LEN_CAP 0x94 > +#define RX_HS_G3_SYNC_LEN_CAP 0x95 > +#define RX_HS_G2_PREP_LEN_CAP 0x96 > +#define RX_HS_G3_PREP_LEN_CAP 0x97 > + #define SYNC_RANGE_FINE (0 << 6) > + #define SYNC_RANGE_COARSE(1 << 6) > + #define SYNC_LEN(x) ((x) & 0x3f) > + #define PREP_LEN(x) ((x) & 0xf) > +#define RX_ADV_GRANULARITY_CAP0x98 > + #define RX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) > +#define TX_ADV_GRANULARITY_CAP0x10 > + #define TX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) > +#define RX_MIN_ACTIVATETIME_CAP 0x8f > +#define RX_HIBERN8TIME_CAP0x92 > +#define RX_ADV_HIBERN8TIME_CAP0x99 > +#define RX_ADV_MIN_ACTIVATETIME_CAP 0x9a > + > +#endif /* _MPHY_H_ */ > + > diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h > index 9599741..26dc340 100644 > --- a/drivers/scsi/ufs/ufshci.h > +++ b/drivers/scsi/ufs/ufshci.h > @@ -170,17 +170,25 @@ enum { > /* UECDL - Host UIC Error Code Data Link Layer 3Ch */ > #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_RECEIVED0x0001 > -#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUT 0x0002 > +#define UIC_DATA_LINK_LAYER_ERROR_NAC_RECEIVEDUFS_BIT(0) > +#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUT UFS_BIT(1) > +#define UIC_DATA_LINK_LAYER_ERROR_RX_BUF_OF UFS_BIT(5) why don't we just add macros for all the bits in UECDL ? This makes it easy in future. Okay. I'll think about it and apply new macros on new version of this patch. > +#define UIC_DATA_LINK_LAYER_ERROR_PA_INIT UFS_BIT(13) > > /* UECN - Host UIC Error Code Network Layer 40h */ > #define UIC_NETWORK_LAYER_ERROR UFS_BIT(31) > #define UIC_NETWORK_LAYER_ERROR_CODE_MASK 0x7 > +#define UIC_NETWORK_UNSUPPORTED_HEADER_TYPE BIT(0) > +#define UIC_NETWORK_BAD_DEVICEID_ENC BIT(1) > +#define UIC_NETWORK_LHDR_TRAP_PACKET_DROPPING BIT(2) > > /* UECT - Host UIC Error Code Transport Layer 44h */ > #define UIC_TRANSPORT_LAYER_ERROR UFS_BIT(31) > #define UIC_TRANSPORT_LAYER_ERROR_CODE_MASK 0x7F > +#define UIC_TRANSPORT_UNSUPPORTED_HEADER_TYPE BIT(0) > +#define UIC_TRANSPORT_UNKNOWN_CPORTID BIT(1) > +#define UIC_TRANSPORT_NO_CONNECTION_RXBIT(2) > +#define UIC_TRANSPORT_BAD_TC BIT(4) May be add definition for bit-5 and 6 as well. Okay. I'll add those things on new version of this patch. > > /* UECDME - Host UIC Error Code DME 48h */ > #define UIC_DME_ERROR UFS_BIT(31) > diff --git a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h > index eff8b56..e47e2c2 100644 > --- a/drivers/scsi/ufs/unipro.h > +++ b/drivers/scsi/ufs/unipro.h > @@ -127,6 +127,7 @@ > #define PA_PACPREQEOBTIMEOUT 0x1591 > #define PA_HIBERN8TIME0x15A7 > #define PA_LOCALVERINFO 0x15A9 > +#define PA_GRANULARITY0x15AA > #define PA_TACTIVATE 0x15A8 > #define PA_PACPFRAMECOUNT 0x15C0 > #de
RE: [PATCH v1] ufs: add a variety of definitions decribed in UFS spec
> > These things are defined to be used by some UFS Host controllers. > > > > Signed-off-by: Kiwoong Kim > > --- > > drivers/scsi/ufs/mphy.h | 38 ++ > > drivers/scsi/ufs/ufshci.h | 14 +++--- > > drivers/scsi/ufs/unipro.h | 24 > > 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 > > drivers/scsi/ufs/mphy.h > > > > diff --git a/drivers/scsi/ufs/mphy.h b/drivers/scsi/ufs/mphy.h new > > file mode 100644 index 000..c431f49 > > --- /dev/null > > +++ b/drivers/scsi/ufs/mphy.h > > @@ -0,0 +1,38 @@ > > +/* > > + * drivers/scsi/ufs/mphy.h > > + * > > + * Copyright (C) 2014 Samsung Electronics Co., Ltd. > > + * > > + * This program is free software; you can redistribute it and/or > > modify > > + * it under the terms of the GNU General Public License as published > > by > > + * the Free Software Foundation; either version 2 of the License, or > > + * (at your option) any later version. > > + */ > > + > > +#ifndef _MPHY_H_ > > +#define _MPHY_H_ > > Do we really need separate file for MPHY? May be we can have these > accomodated in unipro.h itself? I think it's needed. MPHY spec isn't related with Unipro spec directly. Is there any reason why we say that this file is deprecated? Please let me know if you have. > > > + > > +#define TX_HIBERN8TIME_CAP 0x0f > > +#define TX_MIN_ACTIVATE_TIME 0x33 > > + > > +#define RX_HS_G1_SYNC_LEN_CAP 0x8b > > +#define RX_HS_G1_PREP_LEN_CAP 0x8c > > +#define RX_HS_G2_SYNC_LEN_CAP 0x94 > > +#define RX_HS_G3_SYNC_LEN_CAP 0x95 > > +#define RX_HS_G2_PREP_LEN_CAP 0x96 > > +#define RX_HS_G3_PREP_LEN_CAP 0x97 > > + #define SYNC_RANGE_FINE (0 << 6) > > + #define SYNC_RANGE_COARSE (1 << 6) > > + #define SYNC_LEN(x) ((x) & 0x3f) > > + #define PREP_LEN(x) ((x) & 0xf) > > +#define RX_ADV_GRANULARITY_CAP 0x98 > > + #define RX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) > > +#define TX_ADV_GRANULARITY_CAP 0x10 > > + #define TX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) > > +#define RX_MIN_ACTIVATETIME_CAP0x8f > > +#define RX_HIBERN8TIME_CAP 0x92 > > +#define RX_ADV_HIBERN8TIME_CAP 0x99 > > +#define RX_ADV_MIN_ACTIVATETIME_CAP0x9a > > + > > +#endif /* _MPHY_H_ */ > > + > > diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h > > index 9599741..26dc340 100644 > > --- a/drivers/scsi/ufs/ufshci.h > > +++ b/drivers/scsi/ufs/ufshci.h > > @@ -170,17 +170,25 @@ enum { > > /* UECDL - Host UIC Error Code Data Link Layer 3Ch */ > > #define UIC_DATA_LINK_LAYER_ERROR UFS_BIT(31) > > #define UIC_DATA_LINK_LAYER_ERROR_CODE_MASK0x7FFF > > -#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 > > +#define UIC_DATA_LINK_LAYER_ERROR_NAC_RECEIVED UFS_BIT(0) > > +#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUT UFS_BIT(1) > > +#define UIC_DATA_LINK_LAYER_ERROR_RX_BUF_OFUFS_BIT(5) > > why don't we just add macros for all the bits in UECDL ? This makes it > easy in future. Okay. I'll think about it and apply new macros on new version of this patch. > > > +#define UIC_DATA_LINK_LAYER_ERROR_PA_INIT UFS_BIT(13) > > > > /* UECN - Host UIC Error Code Network Layer 40h */ > > #define UIC_NETWORK_LAYER_ERRORUFS_BIT(31) > > #define UIC_NETWORK_LAYER_ERROR_CODE_MASK 0x7 > > +#define UIC_NETWORK_UNSUPPORTED_HEADER_TYPEBIT(0) > > +#define UIC_NETWORK_BAD_DEVICEID_ENC BIT(1) > > +#define UIC_NETWORK_LHDR_TRAP_PACKET_DROPPING BIT(2) > > > > /* UECT - Host UIC Error Code Transport Layer 44h */ > > #define UIC_TRANSPORT_LAYER_ERROR UFS_BIT(31) > > #define UIC_TRANSPORT_LAYER_ERROR_CODE_MASK0x7F > > +#define UIC_TRANSPORT_UNSUPPORTED_HEADER_TYPE BIT(0) > > +#define UIC_TRANSPORT_UNKNOWN_CPORTID BIT(1) > > +#define UIC_TRANSPORT_NO_CONNECTION_RX BIT(2) > > +#define UIC_TRANSPORT_BAD_TC BIT(4) > > May be add definition for bit-5 and 6 as well. Okay. I'll add those things on new version of this patch. > > > > > /* UECDME - Host UIC Error Code DME 48h */ > > #define UIC_DME_ERROR UFS_BIT(31) > > diff --git a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h > > index eff8b56..e47e2c2 100644 > > --- a/drivers/scsi/ufs/unipro.h > > +++ b/drivers/scsi/ufs/unipro.h > > @@ -127,6 +127,7 @@ > > #define PA_PACPREQEOBTIMEOUT 0x1591 > > #define PA_HIBERN8TIME 0x15A7 > > #define PA_LOCALVERINFO0x15A9 > > +#define PA_GRANULARITY 0x15AA > > #define PA_TACTIVATE 0x15A8 > > #define PA_PACPFRAMECOUNT 0x15C0 > > #define PA_PACPERRORCOUNT 0x15C1 > > @@ -170,6 +171,9 @@ enum { > >
Re: [PATCH v1] ufs: add a variety of definitions decribed in UFS spec
On 2016-11-08 00:00, Kiwoong Kim wrote: These things are defined to be used by some UFS Host controllers. Signed-off-by: Kiwoong Kim --- drivers/scsi/ufs/mphy.h | 38 ++ drivers/scsi/ufs/ufshci.h | 14 +++--- drivers/scsi/ufs/unipro.h | 24 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 drivers/scsi/ufs/mphy.h diff --git a/drivers/scsi/ufs/mphy.h b/drivers/scsi/ufs/mphy.h new file mode 100644 index 000..c431f49 --- /dev/null +++ b/drivers/scsi/ufs/mphy.h @@ -0,0 +1,38 @@ +/* + * drivers/scsi/ufs/mphy.h + * + * Copyright (C) 2014 Samsung Electronics Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef _MPHY_H_ +#define _MPHY_H_ Do we really need separate file for MPHY? May be we can have these accomodated in unipro.h itself? + +#define TX_HIBERN8TIME_CAP 0x0f +#define TX_MIN_ACTIVATE_TIME 0x33 + +#define RX_HS_G1_SYNC_LEN_CAP 0x8b +#define RX_HS_G1_PREP_LEN_CAP 0x8c +#define RX_HS_G2_SYNC_LEN_CAP 0x94 +#define RX_HS_G3_SYNC_LEN_CAP 0x95 +#define RX_HS_G2_PREP_LEN_CAP 0x96 +#define RX_HS_G3_PREP_LEN_CAP 0x97 + #define SYNC_RANGE_FINE (0 << 6) + #define SYNC_RANGE_COARSE (1 << 6) + #define SYNC_LEN(x) ((x) & 0x3f) + #define PREP_LEN(x) ((x) & 0xf) +#define RX_ADV_GRANULARITY_CAP 0x98 + #define RX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) +#define TX_ADV_GRANULARITY_CAP 0x10 + #define TX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) +#define RX_MIN_ACTIVATETIME_CAP0x8f +#define RX_HIBERN8TIME_CAP 0x92 +#define RX_ADV_HIBERN8TIME_CAP 0x99 +#define RX_ADV_MIN_ACTIVATETIME_CAP0x9a + +#endif /* _MPHY_H_ */ + diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h index 9599741..26dc340 100644 --- a/drivers/scsi/ufs/ufshci.h +++ b/drivers/scsi/ufs/ufshci.h @@ -170,17 +170,25 @@ enum { /* UECDL - Host UIC Error Code Data Link Layer 3Ch */ #define UIC_DATA_LINK_LAYER_ERROR UFS_BIT(31) #define UIC_DATA_LINK_LAYER_ERROR_CODE_MASK0x7FFF -#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 +#define UIC_DATA_LINK_LAYER_ERROR_NAC_RECEIVED UFS_BIT(0) +#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUT UFS_BIT(1) +#define UIC_DATA_LINK_LAYER_ERROR_RX_BUF_OFUFS_BIT(5) why don't we just add macros for all the bits in UECDL ? This makes it easy in future. +#define UIC_DATA_LINK_LAYER_ERROR_PA_INIT UFS_BIT(13) /* UECN - Host UIC Error Code Network Layer 40h */ #define UIC_NETWORK_LAYER_ERRORUFS_BIT(31) #define UIC_NETWORK_LAYER_ERROR_CODE_MASK 0x7 +#define UIC_NETWORK_UNSUPPORTED_HEADER_TYPEBIT(0) +#define UIC_NETWORK_BAD_DEVICEID_ENC BIT(1) +#define UIC_NETWORK_LHDR_TRAP_PACKET_DROPPING BIT(2) /* UECT - Host UIC Error Code Transport Layer 44h */ #define UIC_TRANSPORT_LAYER_ERROR UFS_BIT(31) #define UIC_TRANSPORT_LAYER_ERROR_CODE_MASK0x7F +#define UIC_TRANSPORT_UNSUPPORTED_HEADER_TYPE BIT(0) +#define UIC_TRANSPORT_UNKNOWN_CPORTID BIT(1) +#define UIC_TRANSPORT_NO_CONNECTION_RX BIT(2) +#define UIC_TRANSPORT_BAD_TC BIT(4) May be add definition for bit-5 and 6 as well. /* UECDME - Host UIC Error Code DME 48h */ #define UIC_DME_ERROR UFS_BIT(31) diff --git a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h index eff8b56..e47e2c2 100644 --- a/drivers/scsi/ufs/unipro.h +++ b/drivers/scsi/ufs/unipro.h @@ -127,6 +127,7 @@ #define PA_PACPREQEOBTIMEOUT 0x1591 #define PA_HIBERN8TIME 0x15A7 #define PA_LOCALVERINFO0x15A9 +#define PA_GRANULARITY 0x15AA #define PA_TACTIVATE 0x15A8 #define PA_PACPFRAMECOUNT 0x15C0 #define PA_PACPERRORCOUNT 0x15C1 @@ -170,6 +171,9 @@ enum { UNCHANGED = 7, }; +#define IS_PWR_MODE_HS(m)(((m) == FAST_MODE) || ((m) == FASTAUTO_MODE)) s/IS_PWR_MODE_HS/IS_HS_PWR_MODE ? +#define IS_PWR_MODE_PWM(m) (((m) == SLOW_MODE) || ((m) == SLOWAUTO_MODE)) s/IS_PWR_MODE_PWM/IS_PWM_PWR_MODE ? + /* PA TX/RX Frequency Series */ enum { PA_HS_MODE_A= 1, @@ -231,6 +235,11 @@ enum ufs_unipro_ver { #define DL_PEERTC1PRESENT 0x2066 #define DL_PEERTC1RXINITCREVAL 0x2067 +/* Default value of L2 Timer */ +#define FC0PROTTIMEOUTVAL 8191 +#define TC0REPLAYTIMEOUTVAL65535 +#define AFC0REQTIMEOUTVAL 32767 + /* * Network Layer Attributes */ @@ -259,6 +268,21 @@ enum ufs_unipro_ver { #define T_TC0TXMAXSDUSIZE 0x4060 #define T_TC1TX
[PATCH v1] ufs: add a variety of definitions decribed in UFS spec
These things are defined to be used by some UFS Host controllers. Signed-off-by: Kiwoong Kim --- drivers/scsi/ufs/mphy.h | 38 ++ drivers/scsi/ufs/ufshci.h | 14 +++--- drivers/scsi/ufs/unipro.h | 24 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 drivers/scsi/ufs/mphy.h diff --git a/drivers/scsi/ufs/mphy.h b/drivers/scsi/ufs/mphy.h new file mode 100644 index 000..c431f49 --- /dev/null +++ b/drivers/scsi/ufs/mphy.h @@ -0,0 +1,38 @@ +/* + * drivers/scsi/ufs/mphy.h + * + * Copyright (C) 2014 Samsung Electronics Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef _MPHY_H_ +#define _MPHY_H_ + +#define TX_HIBERN8TIME_CAP 0x0f +#define TX_MIN_ACTIVATE_TIME 0x33 + +#define RX_HS_G1_SYNC_LEN_CAP 0x8b +#define RX_HS_G1_PREP_LEN_CAP 0x8c +#define RX_HS_G2_SYNC_LEN_CAP 0x94 +#define RX_HS_G3_SYNC_LEN_CAP 0x95 +#define RX_HS_G2_PREP_LEN_CAP 0x96 +#define RX_HS_G3_PREP_LEN_CAP 0x97 + #define SYNC_RANGE_FINE (0 << 6) + #define SYNC_RANGE_COARSE (1 << 6) + #define SYNC_LEN(x) ((x) & 0x3f) + #define PREP_LEN(x) ((x) & 0xf) +#define RX_ADV_GRANULARITY_CAP 0x98 + #define RX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) +#define TX_ADV_GRANULARITY_CAP 0x10 + #define TX_ADV_GRAN_STEP(x) x) & 0x3) << 1) | 0x1) +#define RX_MIN_ACTIVATETIME_CAP0x8f +#define RX_HIBERN8TIME_CAP 0x92 +#define RX_ADV_HIBERN8TIME_CAP 0x99 +#define RX_ADV_MIN_ACTIVATETIME_CAP0x9a + +#endif /* _MPHY_H_ */ + diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h index 9599741..26dc340 100644 --- a/drivers/scsi/ufs/ufshci.h +++ b/drivers/scsi/ufs/ufshci.h @@ -170,17 +170,25 @@ enum { /* UECDL - Host UIC Error Code Data Link Layer 3Ch */ #define UIC_DATA_LINK_LAYER_ERROR UFS_BIT(31) #define UIC_DATA_LINK_LAYER_ERROR_CODE_MASK0x7FFF -#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 +#define UIC_DATA_LINK_LAYER_ERROR_NAC_RECEIVED UFS_BIT(0) +#define UIC_DATA_LINK_LAYER_ERROR_TCx_REPLAY_TIMEOUT UFS_BIT(1) +#define UIC_DATA_LINK_LAYER_ERROR_RX_BUF_OFUFS_BIT(5) +#define UIC_DATA_LINK_LAYER_ERROR_PA_INIT UFS_BIT(13) /* UECN - Host UIC Error Code Network Layer 40h */ #define UIC_NETWORK_LAYER_ERRORUFS_BIT(31) #define UIC_NETWORK_LAYER_ERROR_CODE_MASK 0x7 +#define UIC_NETWORK_UNSUPPORTED_HEADER_TYPEBIT(0) +#define UIC_NETWORK_BAD_DEVICEID_ENC BIT(1) +#define UIC_NETWORK_LHDR_TRAP_PACKET_DROPPING BIT(2) /* UECT - Host UIC Error Code Transport Layer 44h */ #define UIC_TRANSPORT_LAYER_ERROR UFS_BIT(31) #define UIC_TRANSPORT_LAYER_ERROR_CODE_MASK0x7F +#define UIC_TRANSPORT_UNSUPPORTED_HEADER_TYPE BIT(0) +#define UIC_TRANSPORT_UNKNOWN_CPORTID BIT(1) +#define UIC_TRANSPORT_NO_CONNECTION_RX BIT(2) +#define UIC_TRANSPORT_BAD_TC BIT(4) /* UECDME - Host UIC Error Code DME 48h */ #define UIC_DME_ERROR UFS_BIT(31) diff --git a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h index eff8b56..e47e2c2 100644 --- a/drivers/scsi/ufs/unipro.h +++ b/drivers/scsi/ufs/unipro.h @@ -127,6 +127,7 @@ #define PA_PACPREQEOBTIMEOUT 0x1591 #define PA_HIBERN8TIME 0x15A7 #define PA_LOCALVERINFO0x15A9 +#define PA_GRANULARITY 0x15AA #define PA_TACTIVATE 0x15A8 #define PA_PACPFRAMECOUNT 0x15C0 #define PA_PACPERRORCOUNT 0x15C1 @@ -170,6 +171,9 @@ enum { UNCHANGED = 7, }; +#define IS_PWR_MODE_HS(m)(((m) == FAST_MODE) || ((m) == FASTAUTO_MODE)) +#define IS_PWR_MODE_PWM(m) (((m) == SLOW_MODE) || ((m) == SLOWAUTO_MODE)) + /* PA TX/RX Frequency Series */ enum { PA_HS_MODE_A= 1, @@ -231,6 +235,11 @@ enum ufs_unipro_ver { #define DL_PEERTC1PRESENT 0x2066 #define DL_PEERTC1RXINITCREVAL 0x2067 +/* Default value of L2 Timer */ +#define FC0PROTTIMEOUTVAL 8191 +#define TC0REPLAYTIMEOUTVAL65535 +#define AFC0REQTIMEOUTVAL 32767 + /* * Network Layer Attributes */ @@ -259,6 +268,21 @@ enum ufs_unipro_ver { #define T_TC0TXMAXSDUSIZE 0x4060 #define T_TC1TXMAXSDUSIZE 0x4061 +/* CPort setting */ +#define E2EFC_ON (1 << 0) +#define E2EFC_OFF (0 << 0) +#define CSD_N_ON (0 << 1) +#define CSD_N_OFF (1 << 1) +#define CSV_N_ON (0 << 2) +#define CSV_N_OFF (1 << 2) +#define CPORT_DEF_FLAGS(CSV_N_OFF | CSD_N_OFF | E2EFC_OFF) + +/* CPort connection state */ +enum { + CPORT_ID