mmc:sdhci-pci-o2micro: Fix SDR50 mode timing issue
PATCH 1/1 mmc:sdhci-pci-o2micro: Fix SDR50 mode timing issue
From: Fred <[email protected]>
Change SDR50 mode clock source from DLL output clock to PLL open clock 1.HS200 and SDR104 mode select DLL output clock
2.SDR50 mode select PLL open clock
---
Change in V1
SDR50 mode select PLL open clock as its clock source.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/mmc/host/sdhci-pci-o2micro.c +16 -14
@@ -339,22 +339,24 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) 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); +if ((host->timing ==MMC_TIMING_MMC_HS200 ) || + (host->timing ==MMC_TIMING_UHS_SDR104 )) { +/* 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); -/* 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); +/* 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 ;
Signature · 1 line
2.37.2
Best regards!
I am the software engineer of the Bayhub Electronic Technology Co. I am writing to you to inquire about the progress of this patch.
Title “[PATCH V1 1/1] mmc:sdhci-pci-o2micro: Fix SDR50 mode timing issue” Time :February 3rd, 2023.
Looking forward to your reply!
Best regards!
Fred
Quoted 76 lines
-----邮件原件-----
发件人: [email protected] <[email protected]> 发送时间: 2023年2月23日 20:05
收件人: [email protected]; [email protected]; [email protected]; [email protected] 抄送: Shaper Liu (WH) <[email protected]>; Chevron Li (WH) <[email protected]>; XiaoGuang Yu (WH) <[email protected]>; Shirley Her(SC) <[email protected]>; Fred Ai(WH) <[email protected]> 主题: [PATCH V1 1/1] mmc:sdhci-pci-o2micro: Fix SDR50 mode timing issueFrom: Fred <[email protected]>
Change SDR50 mode clock source from DLL output clock to PLL open clock 1.HS200 and SDR104 mode select DLL output clock
2.SDR50 mode select PLL open clockSigned-off-by Fred <[email protected]>---
Change in V1
SDR50 mode select PLL open clock as its clock source.--- drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +11
-14@@ -339,22 +339,24 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) 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); +if ((host->timing ==MMC_TIMING_MMC_HS200 ) || + (host->timing ==MMC_TIMING_UHS_SDR104 )) { +/* 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); -/* 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); +/* 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);drivers/mmc/host/sdhci-pci-o2micro.c +5
-1+/* 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 ; --2.37.2
+ Adrian (corrected the email)
Quoted 8 lines · On Thu, 23 Feb 2023 at 13:05, <[email protected]> wrote:
From: Fred <[email protected]>
Change SDR50 mode clock source from DLL output clock to PLL open clock 1.HS200 and SDR104 mode select DLL output clock
2.SDR50 mode select PLL open clockSigned-off-by Fred <[email protected]>
Looks like you posted this to an incorrect email to Adrian, perhaps re-post to include him.
Kind regards
Uffe
Quoted 53 lines
---
Change in V1
SDR50 mode select PLL open clock as its clock source.--- drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +16
-15@@ -339,22 +339,24 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) 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); +if ((host->timing ==MMC_TIMING_MMC_HS200 ) || + (host->timing ==MMC_TIMING_UHS_SDR104 )) { +/* 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); -/* 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); +/* 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 ; --2.37.2
Quoted 7 lines · On 23/02/23 14:04, [email protected] wrote:
From: Fred <[email protected]>
Change SDR50 mode clock source from DLL output clock to PLL open clock 1.HS200 and SDR104 mode select DLL output clock
2.SDR50 mode select PLL open clockSigned-off-by Fred <[email protected]>
Seems like it could use a fixes tag? Nevertheless:
Quoted 50 lines
---
Change in V1
SDR50 mode select PLL open clock as its clock source.--- drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +16
-14@@ -339,22 +339,24 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) 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); +if ((host->timing ==MMC_TIMING_MMC_HS200 ) || + (host->timing ==MMC_TIMING_UHS_SDR104 )) { +/* 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); -/* 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); +/* 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 ;
Quoted 8 lines · On Thu, 23 Feb 2023 at 13:05, <[email protected]> wrote:
From: Fred <[email protected]>
Change SDR50 mode clock source from DLL output clock to PLL open clock 1.HS200 and SDR104 mode select DLL output clock
2.SDR50 mode select PLL open clockSigned-off-by Fred <[email protected]>
Applied for next, thanks!
Perhaps I should move this to the fixes branch and we should add a fixes and a stable tag too?
Kind regards
Uffe
Quoted 53 lines
---
Change in V1
SDR50 mode select PLL open clock as its clock source.--- drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-)drivers/mmc/host/sdhci-pci-o2micro.c +16
-15@@ -339,22 +339,24 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) 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); +if ((host->timing ==MMC_TIMING_MMC_HS200 ) || + (host->timing ==MMC_TIMING_UHS_SDR104 )) { +/* 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); -/* 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); +/* 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 ; --2.37.2