mmc: sdhci-msm: Make tuning block table endian agnostic
Subsystems (4)
PATCH 1/1 mmc: sdhci-msm: Make tuning block table endian agnostic
If we're tuning on a big-endian CPU we'll never determine we properly tuned the device because we compare the data we received from the controller with a table that assumes the CPU is little-endian. Change the table to be an array of bytes instead of 32-bit words so we can use memcmp() without needing to byte-swap every word depending on the endianess of the CPU.
--- drivers/mmc/host/sdhci-msm.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-)
drivers/mmc/host/sdhci-msm.c +27 -15
@@ -47,22 +47,34 @@#define CMUX_SHIFT_PHASE_SHIFT 24#define CMUX_SHIFT_PHASE_MASK (7 << CMUX_SHIFT_PHASE_SHIFT) -static const u32 tuning_block_64[] = { -0x00ff0fff ,0xccc3ccff ,0xffcc3cc3 ,0xeffefffe , -0xddffdfff ,0xfbfffbff ,0xff7fffbf ,0xefbdf777 , -0xf0fff0ff ,0x3cccfc0f ,0xcfcc33cc ,0xeeffefff , -0xfdfffdff ,0xffbfffdf ,0xfff7ffbb ,0xde7b7ff7 +static const u8 tuning_block_64[] = { +0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , +0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , +0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , +0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , +0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , +0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , +0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , +0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , }; -static const u32 tuning_block_128[] = { -0xff00ffff ,0x0000ffff ,0xccccffff ,0xcccc33cc , -0xcc3333cc ,0xffffcccc ,0xffffeeff ,0xffeeeeff , -0xffddffff ,0xddddffff ,0xbbffffff ,0xbbffffff , -0xffffffbb ,0xffffff77 ,0x77ff7777 ,0xffeeddbb , -0x00ffffff ,0x00ffffff ,0xccffff00 ,0xcc33cccc , -0x3333cccc ,0xffcccccc ,0xffeeffff ,0xeeeeffff , -0xddffffff ,0xddffffff ,0xffffffdd ,0xffffffbb , -0xffffbbbb ,0xffff77ff ,0xff7777ff ,0xeeddbb77 +static const u8 tuning_block_128[] = { +0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , +0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , +0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , +0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , +0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , +0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , +0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , +0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , +0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , +0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , +0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , +0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , +0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , +0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , +0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , +0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , };struct sdhci_msm_host {
@@ -359,7 +371,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) {int tuning_seq_cnt =3 ;u8 phase, *data_buf, tuned_phases[16 ], tuned_phase_cnt =0 ; -const u32 *tuning_block_pattern = tuning_block_64; +const u8 *tuning_block_pattern = tuning_block_64;int size =sizeof (tuning_block_64);/* Pattern size in bytes */ int rc;struct mmc_host *mmc = host->mmc;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Jaehoon Chung
maintainerHi, Stephen.
Quoted 57 lines · Stephen Boyd
If we're tuning on a big-endian CPU we'll never determine we properly tuned the device because we compare the data we received from the controller with a table that assumes the CPU is little-endian. Change the table to be an array of bytes instead of 32-bit words so we can use
memcmp()without needing to byte-swap every word depending on the endianess of the CPU.Cc Asutosh Das <[email protected]>Cc Venkat Gopalakrishnan <[email protected]>Reviewed-by Georgi Djakov <[email protected]>Fixes 415b5a75da43 "mmc: sdhci-msm: Add platform_execute_tuning implementation"Signed-off-by Stephen Boyd <[email protected]>--- drivers/mmc/host/sdhci-msm.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-)drivers/mmc/host/sdhci-msm.c +17
-14@@ -47,22 +47,34 @@#define CMUX_SHIFT_PHASE_SHIFT 24#define CMUX_SHIFT_PHASE_MASK (7 << CMUX_SHIFT_PHASE_SHIFT) -static const u32 tuning_block_64[] = { -0x00ff0fff ,0xccc3ccff ,0xffcc3cc3 ,0xeffefffe , -0xddffdfff ,0xfbfffbff ,0xff7fffbf ,0xefbdf777 , -0xf0fff0ff ,0x3cccfc0f ,0xcfcc33cc ,0xeeffefff , -0xfdfffdff ,0xffbfffdf ,0xfff7ffbb ,0xde7b7ff7 +static const u8 tuning_block_64[] = { +0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , +0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , +0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , +0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , +0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , +0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , +0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , +0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , }; -static const u32 tuning_block_128[] = { -0xff00ffff ,0x0000ffff ,0xccccffff ,0xcccc33cc , -0xcc3333cc ,0xffffcccc ,0xffffeeff ,0xffeeeeff , -0xffddffff ,0xddddffff ,0xbbffffff ,0xbbffffff , -0xffffffbb ,0xffffff77 ,0x77ff7777 ,0xffeeddbb , -0x00ffffff ,0x00ffffff ,0xccffff00 ,0xcc33cccc , -0x3333cccc ,0xffcccccc ,0xffeeffff ,0xeeeeffff , -0xddffffff ,0xddffffff ,0xffffffdd ,0xffffffbb , -0xffffbbbb ,0xffff77ff ,0xff7777ff ,0xeeddbb77 +static const u8 tuning_block_128[] = { +0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , +0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , +0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , +0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , +0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , +0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , +0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff ,
drivers/mmc/host/sdhci-msm.c line 78
Quoted 10 lines
drivers/mmc/host/sdhci-msm.c +9
-0+0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , +0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , +0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , +0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , +0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , +0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , +0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , +0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , + 0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, };
In dw-mmc.c, tuning_block values are same.
So I think we can move these value into generic header. how about?
Best Regards,
Jaehoon Chung
Quoted 12 lines
drivers/mmc/host/sdhci-msm.c +1
-1struct sdhci_msm_host {@@ -359,7 +371,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) {int tuning_seq_cnt =3 ;u8 phase, *data_buf, tuned_phases[16 ], tuned_phase_cnt =0 ; -const u32 *tuning_block_pattern = tuning_block_64; +const u8 *tuning_block_pattern = tuning_block_64;int size =sizeof (tuning_block_64);/* Pattern size in bytes */ int rc;struct mmc_host *mmc = host->mmc;
Quoted 64 lines · Jaehoon Chung
Hi, Stephen.
Quoted 61 lines · Stephen Boyd
If we're tuning on a big-endian CPU we'll never determine we properly tuned the device because we compare the data we received from the controller with a table that assumes the CPU is little-endian. Change the table to be an array of bytes instead of 32-bit words so we can use
memcmp()without needing to byte-swap every word depending on the endianess of the CPU.Cc Asutosh Das <[email protected]>Cc Venkat Gopalakrishnan <[email protected]>Reviewed-by Georgi Djakov <[email protected]>Fixes 415b5a75da43 "mmc: sdhci-msm: Add platform_execute_tuning implementation"Signed-off-by Stephen Boyd <[email protected]>--- drivers/mmc/host/sdhci-msm.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-)drivers/mmc/host/sdhci-msm.c +21
-14@@ -47,22 +47,34 @@#define CMUX_SHIFT_PHASE_SHIFT 24#define CMUX_SHIFT_PHASE_MASK (7 << CMUX_SHIFT_PHASE_SHIFT) -static const u32 tuning_block_64[] = { -0x00ff0fff ,0xccc3ccff ,0xffcc3cc3 ,0xeffefffe , -0xddffdfff ,0xfbfffbff ,0xff7fffbf ,0xefbdf777 , -0xf0fff0ff ,0x3cccfc0f ,0xcfcc33cc ,0xeeffefff , -0xfdfffdff ,0xffbfffdf ,0xfff7ffbb ,0xde7b7ff7 +static const u8 tuning_block_64[] = { +0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , +0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , +0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , +0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , +0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , +0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , +0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , +0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , }; -static const u32 tuning_block_128[] = { -0xff00ffff ,0x0000ffff ,0xccccffff ,0xcccc33cc , -0xcc3333cc ,0xffffcccc ,0xffffeeff ,0xffeeeeff , -0xffddffff ,0xddddffff ,0xbbffffff ,0xbbffffff , -0xffffffbb ,0xffffff77 ,0x77ff7777 ,0xffeeddbb , -0x00ffffff ,0x00ffffff ,0xccffff00 ,0xcc33cccc , -0x3333cccc ,0xffcccccc ,0xffeeffff ,0xeeeeffff , -0xddffffff ,0xddffffff ,0xffffffdd ,0xffffffbb , -0xffffbbbb ,0xffff77ff ,0xff7777ff ,0xeeddbb77 +static const u8 tuning_block_128[] = { +0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , +0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , +0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , +0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , +0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , +0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , +0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , +0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , +0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , +0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , +0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,
Quoted 8 lines
drivers/mmc/host/sdhci-msm.c line 78
Quoted 6 lines
drivers/mmc/host/sdhci-msm.c +5
-0+0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , +0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , +0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , +0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , + 0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, };In
dw-mmc.c,tuning_blockvalues are same.
So I think we can move these value into generic header. how about?
Actually, I believe these values comes from the eMMC specification? Shouldn't they be moved to the mmc core instead?
Kind regards
Uffe
Quoted 21 lines
Best Regards,
Jaehoon Chungdrivers/mmc/host/sdhci-msm.c static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) · line 377
Quoted 12 lines
drivers/mmc/host/sdhci-msm.c +1
-1struct sdhci_msm_host {@@ -359,7 +371,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) {int tuning_seq_cnt =3 ;u8 phase, *data_buf, tuned_phases[16 ], tuned_phase_cnt =0 ; -const u32 *tuning_block_pattern = tuning_block_64; +const u8 *tuning_block_pattern = tuning_block_64;int size =sizeof (tuning_block_64);/* Pattern size in bytes */ int rc;struct mmc_host *mmc = host->mmc;--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · Ulf Hansson
Quoted 3 lines · Jaehoon Chung
In
dw-mmc.c,tuning_blockvalues are same.
So I think we can move these value into generic header. how about?Actually, I believe these values comes from the eMMC specification? Shouldn't they be moved to the mmc core instead?
That sounds like good consolidation, but can we do that in a follow-up patch? This fixes the driver for me and I was hoping to make something minimal to go back to stable trees.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Jaehoon Chung
maintainerQuoted 11 lines · Stephen Boyd
Quoted 6 lines · Ulf Hansson
Quoted 3 lines · Jaehoon Chung
In
dw-mmc.c,tuning_blockvalues are same.
So I think we can move these value into generic header. how about?Actually, I believe these values comes from the eMMC specification? Shouldn't they be moved to the mmc core instead?
That sounds like good consolidation, but can we do that in a follow-up patch? This fixes the driver for me and I was hoping to make something minimal to go back to stable trees.
Sure, if my opinion is ok, i will do it after apply your patches.
Best Regards,
Jaehoon Chung
Quoted 1 line
Quoted 6 lines · Jaehoon Chung
Quoted 5 lines · Stephen Boyd
Quoted 4 lines · Ulf Hansson
Quoted 3 lines · Jaehoon Chung
In
dw-mmc.c,tuning_blockvalues are same.
So I think we can move these value into generic header. how about?
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
Actually, I believe these values comes from the eMMC specification? Shouldn't they be moved to the mmc core instead?
That sounds like good consolidation, but can we do that in a follow-up patch? This fixes the driver for me and I was hoping to make something minimal to go back to stable trees.
Sure, if my opinion is ok, i will do it after apply your patches.
Here's the patch
----8<----
From: Stephen Boyd <[email protected]>
Subject: [PATCH] mmc: Consolidate emmc tuning blocks
The same tuning block array exists in the dw_mmc h.c and sdhci-msm.c files. Move these into mmc.c so that they can be shared across drivers.
--- drivers/mmc/core/mmc.c | 32 ++++++++++++++++++++++++++++++++ drivers/mmc/host/dw_mmc.c | 30 ------------------------------ drivers/mmc/host/sdhci-msm.c | 38 ++++---------------------------------- include/linux/mmc/mmc.h | 5 +++++ 4 files changed, 41 insertions(+), 64 deletions(-)
drivers/mmc/core/mmc.c +32 -0
@@ -1135,6 +1135,38 @@ bus_speed:return err; } +const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE ] = { +0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , +0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , +0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , +0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , +0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , +0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , +0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , +0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , +}; +EXPORT_SYMBOL (tuning_blk_pattern_4bit); + +const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE ] = { +0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , +0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , +0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , +0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , +0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , +0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , +0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , +0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , +0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , +0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , +0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , +0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , +0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , +0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , +0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , +0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , +}; +EXPORT_SYMBOL (tuning_blk_pattern_8bit); +/* * Execute tuning sequence to seek the proper bus operating * conditions for HS200 and HS400, which sends CMD21 to the device.
drivers/mmc/host/dw_mmc.c +0 -30
@@ -81,36 +81,6 @@ struct idmac_desc { };#endif /* CONFIG_MMC_DW_IDMAC */ -static const u8 tuning_blk_pattern_4bit[] = { -0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , -0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , -0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , -0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , -0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , -0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , -0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , -0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , -}; - -static const u8 tuning_blk_pattern_8bit[] = { -0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , -0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , -0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , -0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , -0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , -0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , -0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , -0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , -0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , -0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , -0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , -0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , -0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , -0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , -0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , -0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , -}; -static inline bool dw_mci_fifo_reset (struct dw_mci *host);static inline bool dw_mci_ctrl_all_reset (struct dw_mci *host);
drivers/mmc/host/sdhci-msm.c +4 -34
@@ -47,36 +47,6 @@#define CMUX_SHIFT_PHASE_SHIFT 24#define CMUX_SHIFT_PHASE_MASK (7 << CMUX_SHIFT_PHASE_SHIFT) -static const u8 tuning_block_64[] = { -0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , -0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , -0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , -0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , -0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , -0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , -0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , -0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , -}; - -static const u8 tuning_block_128[] = { -0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , -0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , -0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , -0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , -0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , -0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , -0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , -0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , -0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , -0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , -0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , -0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , -0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , -0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , -0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , -0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , -}; -struct sdhci_msm_host {struct platform_device *pdev;void __iomem *core_mem;/* MSM SDCC mapped address */
@@ -371,8 +341,8 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) {int tuning_seq_cnt =3 ;u8 phase, *data_buf, tuned_phases[16 ], tuned_phase_cnt =0 ; -const u8 *tuning_block_pattern = tuning_block_64; -int size =sizeof (tuning_block_64);/* Pattern size in bytes */ +const u8 *tuning_block_pattern = tuning_blk_pattern_4bit; +int size =sizeof (tuning_blk_pattern_4bit);int rc;struct mmc_host *mmc = host->mmc;struct mmc_ios ios = host->mmc->ios;
@@ -388,8 +358,8 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)if ((opcode ==MMC_SEND_TUNING_BLOCK_HS200 ) && (mmc->ios.bus_width ==MMC_BUS_WIDTH_8 )) { - tuning_block_pattern = tuning_block_128; - size =sizeof (tuning_block_128); + tuning_block_pattern = tuning_blk_pattern_8bit; + size =sizeof (tuning_blk_pattern_8bit); } data_buf =kmalloc (size,GFP_KERNEL );
include/linux/mmc/mmc.h +5 -0
@@ -53,6 +53,11 @@#define MMC_SEND_TUNING_BLOCK 19/* adtc R1 */ #define MMC_SEND_TUNING_BLOCK_HS200 21/* adtc R1 */ +#define MMC_TUNING_BLK_PATTERN_4BIT_SIZE 64 +#define MMC_TUNING_BLK_PATTERN_8BIT_SIZE 128 +extern const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE ]; +extern const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE ]; +/* class 3 */ #define MMC_WRITE_DAT_UNTIL_STOP 20/* adtc [31:0] data addr R1 */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 5 lines · Stephen Boyd
----8<----
From: Stephen Boyd <[email protected]>
Subject: [PATCH] mmc: Consolidate emmc tuning blocks
Quoted 7 lines
The same tuning block array exists in the
dw_mmch.candsdhci-msm.cfiles. Move these intommc.cso that they can be shared across drivers.Reported-by Jaehoon Chung <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Hi Ulf,
Can this and the previous patch be picked up for 3.18?
Thanks,
Stephen
Quoted 169 lines
drivers/mmc/core/mmc.c | 32 ++++++++++++++++++++++++++++++++ drivers/mmc/host/dw_mmc.c | 30 ------------------------------ drivers/mmc/host/sdhci-msm.c | 38 ++++---------------------------------- include/linux/mmc/mmc.h | 5 +++++ 4 files changed, 41 insertions(+), 64 deletions(-)drivers/mmc/core/mmc.c +32
-0@@ -1135,6 +1135,38 @@ bus_speed:return err; } +const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE ] = { +0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , +0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , +0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , +0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , +0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , +0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , +0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , +0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , +}; +EXPORT_SYMBOL (tuning_blk_pattern_4bit); + +const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE ] = { +0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , +0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , +0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , +0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , +0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , +0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , +0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , +0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , +0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , +0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , +0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , +0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , +0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , +0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , +0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , +0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , +}; +EXPORT_SYMBOL (tuning_blk_pattern_8bit); +/* * Execute tuning sequence to seek the proper bus operating * conditions for HS200 and HS400, which sends CMD21 to the device. drivers/mmc/host/dw_mmc.c +0
-30@@ -81,36 +81,6 @@ struct idmac_desc { };#endif /* CONFIG_MMC_DW_IDMAC */ -static const u8 tuning_blk_pattern_4bit[] = { -0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , -0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , -0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , -0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , -0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , -0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , -0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , -0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , -}; - -static const u8 tuning_blk_pattern_8bit[] = { -0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , -0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , -0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , -0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , -0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , -0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , -0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , -0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , -0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , -0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , -0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , -0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , -0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , -0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , -0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , -0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , -}; -static inline bool dw_mci_fifo_reset (struct dw_mci *host);static inline bool dw_mci_ctrl_all_reset (struct dw_mci *host);drivers/mmc/host/sdhci-msm.c +4
-34@@ -47,36 +47,6 @@#define CMUX_SHIFT_PHASE_SHIFT 24#define CMUX_SHIFT_PHASE_MASK (7 << CMUX_SHIFT_PHASE_SHIFT) -static const u8 tuning_block_64[] = { -0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , -0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , -0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , -0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , -0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , -0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , -0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , -0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , -}; - -static const u8 tuning_block_128[] = { -0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , -0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , -0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , -0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , -0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , -0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , -0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , -0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , -0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , -0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , -0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , -0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , -0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , -0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , -0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , -0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , -}; -struct sdhci_msm_host {struct platform_device *pdev;void __iomem *core_mem;/* MSM SDCC mapped address */ @@ -371,8 +341,8 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) {int tuning_seq_cnt =3 ;u8 phase, *data_buf, tuned_phases[16 ], tuned_phase_cnt =0 ; -const u8 *tuning_block_pattern = tuning_block_64; -int size =sizeof (tuning_block_64);/* Pattern size in bytes */ +const u8 *tuning_block_pattern = tuning_blk_pattern_4bit; +int size =sizeof (tuning_blk_pattern_4bit);int rc;struct mmc_host *mmc = host->mmc;struct mmc_ios ios = host->mmc->ios;@@ -388,8 +358,8 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)if ((opcode ==MMC_SEND_TUNING_BLOCK_HS200 ) && (mmc->ios.bus_width ==MMC_BUS_WIDTH_8 )) { - tuning_block_pattern = tuning_block_128; - size =sizeof (tuning_block_128); + tuning_block_pattern = tuning_blk_pattern_8bit; + size =sizeof (tuning_blk_pattern_8bit); } data_buf =kmalloc (size,GFP_KERNEL );include/linux/mmc/mmc.h +5
-0@@ -53,6 +53,11 @@#define MMC_SEND_TUNING_BLOCK 19/* adtc R1 */ #define MMC_SEND_TUNING_BLOCK_HS200 21/* adtc R1 */ +#define MMC_TUNING_BLK_PATTERN_4BIT_SIZE 64 +#define MMC_TUNING_BLK_PATTERN_8BIT_SIZE 128 +extern const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE ]; +extern const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE ]; +/* class 3 */ #define MMC_WRITE_DAT_UNTIL_STOP 20/* adtc [31:0] data addr R1 */
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
2014-09-15 23:45 GMT+02:00 Stephen Boyd <[email protected]>:
Quoted 10 lines · Stephen Boyd
Quoted 9 lines
----8<----
From: Stephen Boyd <[email protected]>
Subject: [PATCH] mmc: Consolidate emmc tuning blocksThe same tuning block array exists in the
dw_mmch.candsdhci-msm.cfiles. Move these intommc.cso that they can be shared across drivers.
Quoted 7 lines
Quoted 3 lines
Reported-by Jaehoon Chung <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Hi Ulf,
Can this and the previous patch be picked up for 3.18?
Sure, seems reasonable. Though I am having a bit hard to follow the mail and patches here. Could you please repost the patches and please do not reply to previous mail threads while doing that.
Kind regards
Uffe
Quoted 179 lines
Thanks,
StephenQuoted 159 lines
drivers/mmc/core/mmc.c | 32 ++++++++++++++++++++++++++++++++ drivers/mmc/host/dw_mmc.c | 30 ------------------------------ drivers/mmc/host/sdhci-msm.c | 38 ++++---------------------------------- include/linux/mmc/mmc.h | 5 +++++ 4 files changed, 41 insertions(+), 64 deletions(-)drivers/mmc/core/mmc.c +32
-0@@ -1135,6 +1135,38 @@ bus_speed:return err; } +const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE ] = { +0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , +0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , +0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , +0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , +0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , +0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , +0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , +0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , +}; +EXPORT_SYMBOL (tuning_blk_pattern_4bit); + +const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE ] = { +0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , +0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , +0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , +0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , +0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , +0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , +0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , +0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , +0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , +0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , +0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , +0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , +0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , +0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , +0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , +0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , +}; +EXPORT_SYMBOL (tuning_blk_pattern_8bit); +/* * Execute tuning sequence to seek the proper bus operating * conditions for HS200 and HS400, which sends CMD21 to the device. drivers/mmc/host/dw_mmc.c +0
-30@@ -81,36 +81,6 @@ struct idmac_desc { };#endif /* CONFIG_MMC_DW_IDMAC */ -static const u8 tuning_blk_pattern_4bit[] = { -0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , -0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , -0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , -0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , -0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , -0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , -0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , -0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , -}; - -static const u8 tuning_blk_pattern_8bit[] = { -0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , -0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , -0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , -0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , -0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , -0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , -0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , -0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , -0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , -0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , -0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , -0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , -0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , -0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , -0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , -0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , -}; -static inline bool dw_mci_fifo_reset (struct dw_mci *host);static inline bool dw_mci_ctrl_all_reset (struct dw_mci *host);drivers/mmc/host/sdhci-msm.c +4
-34@@ -47,36 +47,6 @@#define CMUX_SHIFT_PHASE_SHIFT 24#define CMUX_SHIFT_PHASE_MASK (7 << CMUX_SHIFT_PHASE_SHIFT) -static const u8 tuning_block_64[] = { -0xff ,0x0f ,0xff ,0x00 ,0xff ,0xcc ,0xc3 ,0xcc , -0xc3 ,0x3c ,0xcc ,0xff ,0xfe ,0xff ,0xfe ,0xef , -0xff ,0xdf ,0xff ,0xdd ,0xff ,0xfb ,0xff ,0xfb , -0xbf ,0xff ,0x7f ,0xff ,0x77 ,0xf7 ,0xbd ,0xef , -0xff ,0xf0 ,0xff ,0xf0 ,0x0f ,0xfc ,0xcc ,0x3c , -0xcc ,0x33 ,0xcc ,0xcf ,0xff ,0xef ,0xff ,0xee , -0xff ,0xfd ,0xff ,0xfd ,0xdf ,0xff ,0xbf ,0xff , -0xbb ,0xff ,0xf7 ,0xff ,0xf7 ,0x7f ,0x7b ,0xde , -}; - -static const u8 tuning_block_128[] = { -0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 ,0x00 , -0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc ,0xcc , -0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff ,0xff , -0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee ,0xff , -0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd ,0xdd , -0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff ,0xbb , -0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff ,0xff , -0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee ,0xff , -0xff ,0xff ,0xff ,0x00 ,0xff ,0xff ,0xff ,0x00 , -0x00 ,0xff ,0xff ,0xcc ,0xcc ,0xcc ,0x33 ,0xcc , -0xcc ,0xcc ,0x33 ,0x33 ,0xcc ,0xcc ,0xcc ,0xff , -0xff ,0xff ,0xee ,0xff ,0xff ,0xff ,0xee ,0xee , -0xff ,0xff ,0xff ,0xdd ,0xff ,0xff ,0xff ,0xdd , -0xdd ,0xff ,0xff ,0xff ,0xbb ,0xff ,0xff ,0xff , -0xbb ,0xbb ,0xff ,0xff ,0xff ,0x77 ,0xff ,0xff , -0xff ,0x77 ,0x77 ,0xff ,0x77 ,0xbb ,0xdd ,0xee , -}; -struct sdhci_msm_host {struct platform_device *pdev;void __iomem *core_mem;/* MSM SDCC mapped address */ @@ -371,8 +341,8 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) {int tuning_seq_cnt =3 ;u8 phase, *data_buf, tuned_phases[16 ], tuned_phase_cnt =0 ; -const u8 *tuning_block_pattern = tuning_block_64; -int size =sizeof (tuning_block_64);/* Pattern size in bytes */ +const u8 *tuning_block_pattern = tuning_blk_pattern_4bit; +int size =sizeof (tuning_blk_pattern_4bit);int rc;struct mmc_host *mmc = host->mmc;struct mmc_ios ios = host->mmc->ios;@@ -388,8 +358,8 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)if ((opcode ==MMC_SEND_TUNING_BLOCK_HS200 ) && (mmc->ios.bus_width ==MMC_BUS_WIDTH_8 )) { - tuning_block_pattern = tuning_block_128; - size =sizeof (tuning_block_128); + tuning_block_pattern = tuning_blk_pattern_8bit; + size =sizeof (tuning_blk_pattern_8bit); } data_buf =kmalloc (size,GFP_KERNEL );include/linux/mmc/mmc.h +0
-0@@ -53,6 +53,11 @@#define MMC_SEND_TUNING_BLOCK 19/* adtc R1 */ include/linux/mmc/mmc.h line 63
Quoted 10 lines
include/linux/mmc/mmc.h +5
-0#define MMC_SEND_TUNING_BLOCK_HS200 21/* adtc R1 */ +#define MMC_TUNING_BLK_PATTERN_4BIT_SIZE 64 +#define MMC_TUNING_BLK_PATTERN_8BIT_SIZE 128 +extern const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE ]; +extern const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE ]; +/* class 3 */ #define MMC_WRITE_DAT_UNTIL_STOP 20/* adtc [31:0] data addr R1 */ --
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 15 lines · Ulf Hansson
2014-09-15 23:45 GMT+02:00 Stephen Boyd <[email protected]>:
Quoted 14 lines · Stephen Boyd
Quoted 12 lines
----8<----
From: Stephen Boyd <[email protected]>
Subject: [PATCH] mmc: Consolidate emmc tuning blocksThe same tuning block array exists in the
dw_mmch.candsdhci-msm.cfiles. Move these intommc.cso that they can be shared across drivers.Reported-by Jaehoon Chung <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Quoted 8 lines
Quoted 3 lines
Hi Ulf,
Can this and the previous patch be picked up for 3.18?
Sure, seems reasonable. Though I am having a bit hard to follow the mail and patches here. Could you please repost the patches and please do not reply to previous mail threads while doing that.
Ok. No problem.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation