* [PATCH 2/3] ufs: host: ufs-exynos: use already existing define
2022-06-15 12:12 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Alim Akhtar
@ 2022-06-15 12:12 ` Alim Akhtar
2022-06-15 23:31 ` Chanho Park
2022-06-15 12:12 ` [PATCH 3/3] include: ufs: re-arrange addresses in increasing order Alim Akhtar
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Alim Akhtar @ 2022-06-15 12:12 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, linux-scsi, linux-phy
Cc: beanhuo, krzysztof.kozlowski+dt, avri.altman, bvanassche,
martin.petersen, chanho61.park, linux-samsung-soc, Alim Akhtar
UFS core already uses RX_MIN_ACTIVATETIME_CAPABILITY macro, let's use the
same in driver as well instead of having a different macro name for the
same offset.
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
drivers/ufs/host/ufs-exynos.c | 5 +++--
include/ufs/unipro.h | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
index 04728b5da040..f971569bafc7 100644
--- a/drivers/ufs/host/ufs-exynos.c
+++ b/drivers/ufs/host/ufs-exynos.c
@@ -651,8 +651,9 @@ static void exynos_ufs_config_phy_cap_attr(struct exynos_ufs *ufs)
if (attr->rx_min_actv_time_cap)
ufshcd_dme_set(hba,
- UIC_ARG_MIB_SEL(RX_MIN_ACTIVATETIME_CAP,
- i), attr->rx_min_actv_time_cap);
+ UIC_ARG_MIB_SEL(
+ RX_MIN_ACTIVATETIME_CAPABILITY, i),
+ attr->rx_min_actv_time_cap);
if (attr->rx_hibern8_time_cap)
ufshcd_dme_set(hba,
diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h
index 0521f887e3ac..ade92e8d3676 100644
--- a/include/ufs/unipro.h
+++ b/include/ufs/unipro.h
@@ -69,7 +69,6 @@
#define RX_HS_G2_PREP_LENGTH_CAP 0x0096
#define RX_HS_G3_PREP_LENGTH_CAP 0x0097
#define RX_ADV_GRANULARITY_CAP 0x0098
-#define RX_MIN_ACTIVATETIME_CAP 0x008F
#define RX_HIBERN8TIME_CAP 0x0092
#define RX_ADV_HIBERN8TIME_CAP 0x0099
#define RX_ADV_MIN_ACTIVATETIME_CAP 0x009A
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* RE: [PATCH 2/3] ufs: host: ufs-exynos: use already existing define
2022-06-15 12:12 ` [PATCH 2/3] ufs: host: ufs-exynos: use already existing define Alim Akhtar
@ 2022-06-15 23:31 ` Chanho Park
0 siblings, 0 replies; 8+ messages in thread
From: Chanho Park @ 2022-06-15 23:31 UTC (permalink / raw)
To: 'Alim Akhtar', linux-arm-kernel, linux-kernel, linux-scsi,
linux-phy
Cc: beanhuo, krzysztof.kozlowski+dt, avri.altman, bvanassche,
martin.petersen, linux-samsung-soc
> Subject: [PATCH 2/3] ufs: host: ufs-exynos: use already existing define
>
> UFS core already uses RX_MIN_ACTIVATETIME_CAPABILITY macro, let's use the
> same in driver as well instead of having a different macro name for the
> same offset.
>
Reviewed-by: Chanho Park <chanho61.park@samsung.com>
Best Regards,
Chanho Park
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] include: ufs: re-arrange addresses in increasing order
2022-06-15 12:12 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Alim Akhtar
2022-06-15 12:12 ` [PATCH 2/3] ufs: host: ufs-exynos: use already existing define Alim Akhtar
@ 2022-06-15 12:12 ` Alim Akhtar
2022-06-16 0:11 ` Chanho Park
2022-06-15 23:30 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Chanho Park
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Alim Akhtar @ 2022-06-15 12:12 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, linux-scsi, linux-phy
Cc: beanhuo, krzysztof.kozlowski+dt, avri.altman, bvanassche,
martin.petersen, chanho61.park, linux-samsung-soc, Alim Akhtar
Rearrange all the unipro and mphy addresses in their increasing order.
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
include/ufs/unipro.h | 102 +++++++++++++++++++++----------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h
index ade92e8d3676..4cbfe9272787 100644
--- 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
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* RE: [PATCH 3/3] include: ufs: re-arrange addresses in increasing order
2022-06-15 12:12 ` [PATCH 3/3] include: ufs: re-arrange addresses in increasing order Alim Akhtar
@ 2022-06-16 0:11 ` Chanho Park
0 siblings, 0 replies; 8+ messages in thread
From: Chanho Park @ 2022-06-16 0:11 UTC (permalink / raw)
To: 'Alim Akhtar', linux-arm-kernel, linux-kernel, linux-scsi,
linux-phy
Cc: beanhuo, krzysztof.kozlowski+dt, avri.altman, bvanassche,
martin.petersen, linux-samsung-soc
> Subject: [PATCH 3/3] include: ufs: re-arrange addresses in increasing
> order
>
> Rearrange all the unipro and mphy addresses in their increasing order.
>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
> include/ufs/unipro.h | 102 +++++++++++++++++++++----------------------
> 1 file changed, 51 insertions(+), 51 deletions(-)
>
> diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h index
> ade92e8d3676..4cbfe9272787 100644
> --- 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
This should be removed.
Otherwise, looks good to me.
Reviewed-by: Chanho Park <chanho61.park@samsung.com>
Best Regards,
Chanho Park
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines
2022-06-15 12:12 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Alim Akhtar
2022-06-15 12:12 ` [PATCH 2/3] ufs: host: ufs-exynos: use already existing define Alim Akhtar
2022-06-15 12:12 ` [PATCH 3/3] include: ufs: re-arrange addresses in increasing order Alim Akhtar
@ 2022-06-15 23:30 ` Chanho Park
2022-06-17 1:48 ` Martin K. Petersen
2022-06-22 2:10 ` Martin K. Petersen
4 siblings, 0 replies; 8+ messages in thread
From: Chanho Park @ 2022-06-15 23:30 UTC (permalink / raw)
To: 'Alim Akhtar', linux-arm-kernel, linux-kernel, linux-scsi,
linux-phy
Cc: beanhuo, krzysztof.kozlowski+dt, avri.altman, bvanassche,
martin.petersen, linux-samsung-soc
> Subject: [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines
>
> Remove #defines as those are not used anywhere in the driver file
>
Reviewed-by: Chanho Park <chanho61.park@samsung.com>
Best Regards,
Chanho Park
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines
2022-06-15 12:12 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Alim Akhtar
` (2 preceding siblings ...)
2022-06-15 23:30 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Chanho Park
@ 2022-06-17 1:48 ` Martin K. Petersen
2022-06-22 2:10 ` Martin K. Petersen
4 siblings, 0 replies; 8+ messages in thread
From: Martin K. Petersen @ 2022-06-17 1:48 UTC (permalink / raw)
To: Alim Akhtar
Cc: linux-arm-kernel, linux-kernel, linux-scsi, linux-phy, beanhuo,
krzysztof.kozlowski+dt, avri.altman, bvanassche, martin.petersen,
chanho61.park, linux-samsung-soc
Alim,
> Remove #defines as those are not used anywhere in the driver file
Applied to 5.20/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines
2022-06-15 12:12 ` [PATCH 1/3] ufs: host: ufs-exynos: remove unused defines Alim Akhtar
` (3 preceding siblings ...)
2022-06-17 1:48 ` Martin K. Petersen
@ 2022-06-22 2:10 ` Martin K. Petersen
4 siblings, 0 replies; 8+ messages in thread
From: Martin K. Petersen @ 2022-06-22 2:10 UTC (permalink / raw)
To: Alim Akhtar, linux-arm-kernel, linux-phy, linux-scsi,
linux-kernel
Cc: Martin K . Petersen, bvanassche, chanho61.park, beanhuo,
avri.altman, krzysztof.kozlowski+dt, linux-samsung-soc
On Wed, 15 Jun 2022 17:42:02 +0530, Alim Akhtar wrote:
> Remove #defines as those are not used anywhere in the driver file
>
>
Applied to 5.20/scsi-queue, thanks!
[1/3] ufs: host: ufs-exynos: remove unused defines
https://git.kernel.org/mkp/scsi/c/6c6806abd5bb
[2/3] ufs: host: ufs-exynos: use already existing define
https://git.kernel.org/mkp/scsi/c/cb2bf7c6e544
[3/3] include: ufs: re-arrange addresses in increasing order
https://git.kernel.org/mkp/scsi/c/c0d93b12f31c
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 8+ messages in thread