mmc:sdhci-pci-o2micro: Change implementation of tuning for SDR104 and HS200 mode
PATCH 1/2 mmc:sdhci-pci-o2micro: Change implementation of tuning for SDR104 and HS200 mode
Select DLL clock of output tuning
Select fixed output tuning phase 0x9
---
Change in V1:
1. Set register 0x354 bit 16 to select DLL clock
2. Set register 0x354 bit [23:20] to select fiexd output tuning phase 0x9
--- drivers/mmc/host/sdhci-pci-o2micro.c | 51 +++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 9 deletions(-)
drivers/mmc/host/sdhci-pci-o2micro.c +42 -9
@@ -43,6 +43,7 @@#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
@@ -304,6 +305,11 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode)int current_bus_width =0 ;u32 scratch32 =0 ;u16 scratch =0 ; +u8 scratch_8 =0 ; +u32 reg_val; +u8 dll_mode; +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip;/* * This handler only implements the eMMC tuning that is specific to
@@ -322,6 +328,28 @@ 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 + dll_mode =0x9 ;//set default phase 9 +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , ®_val); + reg_val &=0xFF0EFFFF ; + reg_val |= ((1 <<16 ) | (dll_mode <<20 )); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , reg_val); + +/*open 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 ))
@@ -532,24 +560,29 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if (clock ==0 )return ; +/*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_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); - - scratch &=0x7f ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); -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); - - scratch |=0x80 ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +/*If not SDR104 card mode, set 0x354 value 0*/ +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); + scratch_32 &= ~(1 <<16 ); + scratch_32 &= ~(0xf <<20 ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH ,scratch_32); } +/*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 2/2 mmc:sdhci-pci-o2micro:Change implementation of setting corresponding PLL frequency according to card mode
1.SDR104 card mode PLL frequency is 0x2c28.
2.SD2.0/SDR50 card mode PLL frequency is 0X2510.
change in v1:
When SD2.0/SDR50 card mode,driver need to set PLL frequency 0x2510.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mmc/host/sdhci-pci-o2micro.c +8 -0
@@ -568,9 +568,17 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) {pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); +/*SDR104 card mode PLL frequency value is 0x2c28*/ if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + }else { +pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); + +/*SD2.0,SDR50 card mode PLL DMDN value is 0X2510*/ +if ((scratch_32 &0xFFFF0000 ) !=0x2510000 ) +o2_pci_set_baseclk (chip,0x25100000 ); +/*If not SDR104 card mode, set 0x354 value 0*/ pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); scratch_32 &= ~(1 <<16 );
Signature · 1 line
2.32.0
Adrian Hunter
maintainerRe: [PATCH V1 2/2] mmc:sdhci-pci-o2micro:Change implementation of setting corresponding PLL frequency according to card mode
Quoted 2 lines · fred
1.SDR104 card mode PLL frequency is
0x2c28.
2.SD2.0/SDR50 card mode PLL frequency is0X2510.
As before, this commit message is a bit brief. Can you explain a bit more, to explain things like:
Why? Is this a fix? What difference does an end-user see?
If it is a fix, can you add a Fixes: tag.
Subject line should have a space after each ':'
Quoted 2 lines
Signed-off-by fred<[email protected]>
Add a space between fred and <[email protected]>
Quoted 12 lines
change in v1:
When SD2.0/SDR50 card mode,driver need to set PLL frequency0x2510.--- drivers/mmc/host/sdhci-pci-o2micro.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/mmc/host/sdhci-pci-o2micro.c +0
-0
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 571
Quoted 4 lines
drivers/mmc/host/sdhci-pci-o2micro.c +1
-0@@ -568,9 +568,17 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if ((host->timing ==MMC_TIMING_UHS_SDR104 ) && (clock ==200000000 )) {pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); +/*SDR104 card mode PLL frequency value is 0x2c28*/
For this and other comments, please put a space after '/*' and before '*/'
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 575
Quoted 4 lines
drivers/mmc/host/sdhci-pci-o2micro.c +1
-0if ((scratch_32 &0xFFFF0000 ) !=0x2c280000 )o2_pci_set_baseclk (chip,0x2c280000 ); + }else {
Should this 'else' be in the previous patch instead?
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +6
-0+pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); + +/*SD2.0,SDR50 card mode PLL DMDN value is 0X2510*/ +if ((scratch_32 &0xFFFF0000 ) !=0x2510000 ) +o2_pci_set_baseclk (chip,0x25100000 ); +/*If not SDR104 card mode, set 0x354 value 0*/ pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); scratch_32 &= ~(1 <<16 );
Adrian Hunter
maintainerQuoted 2 lines · fred
Select DLL clock of output tuning
Select fixed output tuning phase0x9
This commit message is a bit brief. Can you explain a bit more, to explain things like:
Why? Is this a fix? What difference does an end-user see?
If it is a fix, can you add a Fixes: tag.
Quoted 2 lines
Signed-off-by fred<[email protected]>
Add a space between fred and <[email protected]>
Quoted 1 line
No blank line here
Quoted 21 lines
---
Change in V1:
1. Set register0x354bit 16 to select DLL clock
2. Set register0x354bit [23:20] to select fiexd output tuning phase0x9--- drivers/mmc/host/sdhci-pci-o2micro.c | 51 +++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 9 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +1
-0@@ -43,6 +43,7 @@#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
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 312
Quoted 8 lines
drivers/mmc/host/sdhci-pci-o2micro.c +5
-0@@ -304,6 +305,11 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode)int current_bus_width =0 ;u32 scratch32 =0 ;u16 scratch =0 ; +u8 scratch_8 =0 ; +u32 reg_val; +u8 dll_mode; +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip;
It is nicer kernel style to try to arrange the declarations in descending line length e.g.
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; u8 dll_mode; u32 reg_val;
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 331
Quoted 8 lines
drivers/mmc/host/sdhci-pci-o2micro.c +1
-0/* * This handler only implements the eMMC tuning that is specific to @@ -322,6 +328,28 @@ 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*/
For this and other comments, please put a space after '/*' and before '*/' i.e.
/* stop clk */
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 341
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +10
-0+ 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
Please use /* ... */ instead of //
Also 'clock ,and' -> 'clock, and'
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 342
Quoted 1 line
drivers/mmc/host/sdhci-pci-o2micro.c +1
-0+ dll_mode =0x9 ;//set default phase 9
Please use /* ... */ instead of //
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 348
Quoted 6 lines
drivers/mmc/host/sdhci-pci-o2micro.c +6
-0+pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , ®_val); + reg_val &=0xFF0EFFFF ; + reg_val |= ((1 <<16 ) | (dll_mode <<20 )); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , reg_val); + +/*open clk*/
'open' -> 'start'
Quoted 22 lines
drivers/mmc/host/sdhci-pci-o2micro.c +8
-5+ 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 ))@@ -532,24 +560,29 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)if (clock ==0 )return ; +/*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_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); - - scratch &=0x7f ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); -
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 574
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +1
-4pci_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); - - scratch |=0x80 ; -pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +/*If not SDR104 card mode, set 0x354 value 0*/
This comment contradicts the 'if' statement before it, because host->timing == MMC_TIMING_UHS_SDR104 implies that it is SDR104 card mode.
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 578
Quoted 4 lines
drivers/mmc/host/sdhci-pci-o2micro.c +4
-0+pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); + scratch_32 &= ~(1 <<16 ); + scratch_32 &= ~(0xf <<20 ); +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH ,scratch_32);
Please add a space before 'scratch_32'
Quoted 11 lines
drivers/mmc/host/sdhci-pci-o2micro.c +5
-0} +/*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); }