mmc:sdhci-pci-o2micro:Improve card input timing at SDR104/HS200 mode
PATCH v3 1/2 mmc:sdhci-pci-o2micro:Improve card input timing at SDR104/HS200 mode
From: Fred Ai <[email protected]>
Card input timing is margin, need to adjust the hold timing of card input.
---
Change in V3:
1.Select suit DLL phase's output clock as SD interface clock at SDR104/HS200 mode. 2.Deselect DLL output phase as SD interface clock before next card initialization.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 56 +++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 9 deletions(-)
drivers/mmc/host/sdhci-pci-o2micro.c +47 -9
@@ -43,11 +43,15 @@#define O2_SD_CAP_REG0 0x334#define O2_SD_UHS1_CAP_SETTING 0x33C#define O2_SD_DELAY_CTRL 0x350 +#define O2_SD_OUTPUT_CLK_SOURCE_SWITCH 0x354#define O2_SD_UHS2_L1_CTRL 0x35C#define O2_SD_FUNC_REG3 0x3E0#define O2_SD_FUNC_REG4 0x3E4#define O2_SD_LED_ENABLE BIT(6)#define O2_SD_FREG0_LEDOFF BIT(13) +#define O2_SD_SEL_DLL BIT(16) +#define O2_SD_FIX_PHASE (BIT(23) | BIT(20)) +#define O2_SD_PHASE_MASK GENMASK(23, 20)#define O2_SD_FREG4_ENABLE_CLK_SET BIT(22)#define O2_SD_VENDOR_SETTING 0x110
@@ -301,9 +305,13 @@ static int sdhci_o2_dll_recovery(struct sdhci_host *host)static int sdhci_o2_execute_tuning (struct mmc_host *mmc,u32 opcode) {struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip;int current_bus_width =0 ;u32 scratch32 =0 ;u16 scratch =0 ; +u8 scratch_8 =0 ; +u32 reg_val;/* * This handler only implements the eMMC tuning that is specific to
@@ -322,6 +330,32 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) scratch |=O2_SD_PWR_FORCE_L0 ;sdhci_writew (host, scratch,O2_SD_MISC_CTRL ); +/* Stop clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); + +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch_8); + scratch_8 &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch_8); + +/* Set pcr 0x354[16] to choose dll clock, and set the default phase */ +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , ®_val); + reg_val &= ~(O2_SD_SEL_DLL |O2_SD_PHASE_MASK ); + reg_val |= (O2_SD_SEL_DLL |O2_SD_FIX_PHASE ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , reg_val); + +/* Lock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch_8); + scratch_8 |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch_8); + +/* Start clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); +/* wait DLL lock, timeout value 5ms */ if (readx_poll_timeout (sdhci_o2_pll_dll_wdt_control, host, scratch32, (scratch32 &O2_DLL_LOCK_STATUS ),1 ,5000 ))
@@ -533,22 +567,26 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if (clock ==0 )return ; -if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) { -pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); - - scratch &=0x7f ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); + scratch &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) {pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32);if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + } -pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); + scratch_32 &= ~(O2_SD_SEL_DLL |O2_SD_PHASE_MASK ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , scratch_32); - scratch |=0x80 ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); - } +/* Lock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); + scratch |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); clk =sdhci_calc_clk (host, clock, &host->mmc->actual_clock);sdhci_o2_enable_clk (host, clk);
Signature · 1 line
2.32.0
PATCH v3 2/2 mmc:sdhci-pci-o2micro:Make the SD clock's base clock frequency correctly according to different card mode
From: Fred Ai <[email protected]>
Remove SDR104 card, SD clock's base clock frequency is not right when insert SD2.0/SDR50 card
---
Change in V3:
1.Set SD clock's base clock frequency to 208MHz when card mode is SDR104/HS200. 2.Set SD clock's base clock frequency to 200MHz when card mode is SD2.0/SDR50.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mmc/host/sdhci-pci-o2micro.c +5 -0
@@ -577,6 +577,11 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + }else { +pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); + +if ((scratch_32 &0xFFFF0000 ) !=0x25100000 ) +o2_pci_set_baseclk (chip,0x25100000 ); }pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32);
Signature · 1 line
2.32.0
Re: [PATCH V3 2/2] mmc:sdhci-pci-o2micro:Make the SD clock's base clock frequency correctly according to different card mode
Quoted 6 lines · fred
From: Fred Ai <[email protected]>
Remove SDR104 card, SD clock's base clock frequency is not right when insert SD2.0/SDR50 card
Signed-off-by Fred Ai <[email protected]>
Quoted 25 lines
---
Change in V3:
1.Set SD clock's base clock frequency to 208MHz when card mode is SDR104/HS200. 2.Set SD clock's base clock frequency to 200MHz when card mode is SD2.0/SDR50.--- drivers/mmc/host/sdhci-pci-o2micro.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mmc/host/sdhci-pci-o2micro.c +5
-0@@ -577,6 +577,11 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + }else { +pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); + +if ((scratch_32 &0xFFFF0000 ) !=0x25100000 ) +o2_pci_set_baseclk (chip,0x25100000 ); }pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32);
Re: [PATCH V3 2/2] mmc:sdhci-pci-o2micro:Make the SD clock's base clock frequency correctly according to different card mode
In reply to fredQuoted 7 lines · fred
From: Fred Ai <[email protected]>
Remove SDR104 card, SD clock's base clock frequency is not right when insert SD2.0/SDR50 card
Signed-off-by Fred Ai <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 27 lines
---
Change in V3:
1.Set SD clock's base clock frequency to 208MHz when card mode is SDR104/HS200. 2.Set SD clock's base clock frequency to 200MHz when card mode is SD2.0/SDR50.--- drivers/mmc/host/sdhci-pci-o2micro.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mmc/host/sdhci-pci-o2micro.c +5
-1@@ -577,6 +577,11 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + }else { +pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); + +if ((scratch_32 &0xFFFF0000 ) !=0x25100000 ) +o2_pci_set_baseclk (chip,0x25100000 ); }pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); --2.32.0
Adrian Hunter
maintainerQuoted 20 lines · fred
From: Fred Ai <[email protected]>
Card input timing is margin, need to adjust the hold timing of card input.
Signed-off-by Fred Ai <[email protected]>---
Change in V3:
1.Select suit DLL phase's output clock as SD interface clock at SDR104/HS200 mode. 2.Deselect DLL output phase as SD interface clock before next card initialization.--- drivers/mmc/host/sdhci-pci-o2micro.c | 56 +++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 9 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +0
-0@@ -43,11 +43,15 @@#define O2_SD_CAP_REG0 0x334#define O2_SD_UHS1_CAP_SETTING 0x33C
drivers/mmc/host/sdhci-pci-o2micro.c line 54
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +4
-0#define O2_SD_DELAY_CTRL 0x350 +#define O2_SD_OUTPUT_CLK_SOURCE_SWITCH 0x354#define O2_SD_UHS2_L1_CTRL 0x35C#define O2_SD_FUNC_REG3 0x3E0#define O2_SD_FUNC_REG4 0x3E4#define O2_SD_LED_ENABLE BIT(6)#define O2_SD_FREG0_LEDOFF BIT(13) +#define O2_SD_SEL_DLL BIT(16) +#define O2_SD_FIX_PHASE (BIT(23) | BIT(20)) +#define O2_SD_PHASE_MASK GENMASK(23, 20)
Can use FIELD_PREP here e.g.
#define O2_SD_PHASE_MASK GENMASK(23, 20)
#define O2_SD_FIX_PHASE FIELD_PREP(O2_SD_PHASE_MASK, 0x9)
Quoted 87 lines
drivers/mmc/host/sdhci-pci-o2micro.c +43
-9#define O2_SD_FREG4_ENABLE_CLK_SET BIT(22)#define O2_SD_VENDOR_SETTING 0x110@@ -301,9 +305,13 @@ static int sdhci_o2_dll_recovery(struct sdhci_host *host)static int sdhci_o2_execute_tuning (struct mmc_host *mmc,u32 opcode) {struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip;int current_bus_width =0 ;u32 scratch32 =0 ;u16 scratch =0 ; +u8 scratch_8 =0 ; +u32 reg_val;/* * This handler only implements the eMMC tuning that is specific to @@ -322,6 +330,32 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) scratch |=O2_SD_PWR_FORCE_L0 ;sdhci_writew (host, scratch,O2_SD_MISC_CTRL ); +/* Stop clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); + +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch_8); + scratch_8 &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch_8); + +/* Set pcr 0x354[16] to choose dll clock, and set the default phase */ +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , ®_val); + reg_val &= ~(O2_SD_SEL_DLL |O2_SD_PHASE_MASK ); + reg_val |= (O2_SD_SEL_DLL |O2_SD_FIX_PHASE ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , reg_val); + +/* Lock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch_8); + scratch_8 |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch_8); + +/* Start clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); +/* wait DLL lock, timeout value 5ms */ if (readx_poll_timeout (sdhci_o2_pll_dll_wdt_control, host, scratch32, (scratch32 &O2_DLL_LOCK_STATUS ),1 ,5000 ))@@ -533,22 +567,26 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if (clock ==0 )return ; -if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) { -pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); - - scratch &=0x7f ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); + scratch &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) {pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32);if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + } -pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); + scratch_32 &= ~(O2_SD_SEL_DLL |O2_SD_PHASE_MASK ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , scratch_32); - scratch |=0x80 ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); - } +/* Lock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); + scratch |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); clk =sdhci_calc_clk (host, clock, &host->mmc->actual_clock);sdhci_o2_enable_clk (host, clk);
Adrian Hunter
maintainerQuoted 100 lines · fred
From: Fred Ai <[email protected]>
Card input timing is margin, need to adjust the hold timing of card input.
Signed-off-by Fred Ai <[email protected]>---
Change in V3:
1.Select suit DLL phase's output clock as SD interface clock at SDR104/HS200 mode. 2.Deselect DLL output phase as SD interface clock before next card initialization.--- drivers/mmc/host/sdhci-pci-o2micro.c | 56 +++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 9 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +40
-5@@ -43,11 +43,15 @@#define O2_SD_CAP_REG0 0x334#define O2_SD_UHS1_CAP_SETTING 0x33C#define O2_SD_DELAY_CTRL 0x350 +#define O2_SD_OUTPUT_CLK_SOURCE_SWITCH 0x354#define O2_SD_UHS2_L1_CTRL 0x35C#define O2_SD_FUNC_REG3 0x3E0#define O2_SD_FUNC_REG4 0x3E4#define O2_SD_LED_ENABLE BIT(6)#define O2_SD_FREG0_LEDOFF BIT(13) +#define O2_SD_SEL_DLL BIT(16) +#define O2_SD_FIX_PHASE (BIT(23) | BIT(20)) +#define O2_SD_PHASE_MASK GENMASK(23, 20)#define O2_SD_FREG4_ENABLE_CLK_SET BIT(22)#define O2_SD_VENDOR_SETTING 0x110@@ -301,9 +305,13 @@ static int sdhci_o2_dll_recovery(struct sdhci_host *host)static int sdhci_o2_execute_tuning (struct mmc_host *mmc,u32 opcode) {struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip;int current_bus_width =0 ;u32 scratch32 =0 ;u16 scratch =0 ; +u8 scratch_8 =0 ; +u32 reg_val;/* * This handler only implements the eMMC tuning that is specific to @@ -322,6 +330,32 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) scratch |=O2_SD_PWR_FORCE_L0 ;sdhci_writew (host, scratch,O2_SD_MISC_CTRL ); +/* Stop clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); + +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch_8); + scratch_8 &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch_8); + +/* Set pcr 0x354[16] to choose dll clock, and set the default phase */ +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , ®_val); + reg_val &= ~(O2_SD_SEL_DLL |O2_SD_PHASE_MASK ); + reg_val |= (O2_SD_SEL_DLL |O2_SD_FIX_PHASE ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , reg_val); + +/* Lock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch_8); + scratch_8 |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch_8); + +/* Start clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); +/* wait DLL lock, timeout value 5ms */ if (readx_poll_timeout (sdhci_o2_pll_dll_wdt_control, host, scratch32, (scratch32 &O2_DLL_LOCK_STATUS ),1 ,5000 ))@@ -533,22 +567,26 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if (clock ==0 )return ; -if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) { -pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); - - scratch &=0x7f ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); + scratch &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) {pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32);if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + }
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 586
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +4
-4-pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); + scratch_32 &= ~(O2_SD_SEL_DLL |O2_SD_PHASE_MASK ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , scratch_32); - scratch |=0x80 ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); - } +/* Lock WP */
Also please nudge this indent into line.
Quoted 7 lines
drivers/mmc/host/sdhci-pci-o2micro.c +3
-0+pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); + scratch |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); clk =sdhci_calc_clk (host, clock, &host->mmc->actual_clock);sdhci_o2_enable_clk (host, clk);