mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 support
PATCH 1/2 mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 support
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for USHI function
---
Change in V1:
1.Add GG8 chip IDs in sdhci-pci-core.c and sdhci-pci.h 2.Add GG8 chip initialization flow at sdhci-pci-o2micro.c
--- drivers/mmc/host/sdhci-pci-core.c | 4 + drivers/mmc/host/sdhci-pci-o2micro.c | 154 ++++++++++++++++++++------- drivers/mmc/host/sdhci-pci.h | 4 + 3 files changed, 126 insertions(+), 36 deletions(-)
drivers/mmc/host/sdhci-pci-core.c +4 -0
@@ -1898,6 +1898,10 @@ static const struct pci_device_id pci_ids[] = {SDHCI_PCI_DEVICE (O2 ,SDS1 , o2),SDHCI_PCI_DEVICE (O2 ,SEABIRD0 , o2),SDHCI_PCI_DEVICE (O2 ,SEABIRD1 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9860 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9861 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9862 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9863 , o2),SDHCI_PCI_DEVICE (ARASAN ,PHY_EMMC , arasan),SDHCI_PCI_DEVICE (SYNOPSYS ,DWC_MSHC , snps), SDHCI_PCI_DEVICE(GLI, 9750, gl9750),
drivers/mmc/host/sdhci-pci-o2micro.c +118 -36
228 lines not on this page · raw message
drivers/mmc/host/sdhci-pci.h +4 -0
@@ -11,6 +11,10 @@#define PCI_DEVICE_ID_O2_FUJIN2 0x8520#define PCI_DEVICE_ID_O2_SEABIRD0 0x8620#define PCI_DEVICE_ID_O2_SEABIRD1 0x8621 +#define PCI_DEVICE_ID_O2_GG8_9860 0x9860 +#define PCI_DEVICE_ID_O2_GG8_9861 0x9861 +#define PCI_DEVICE_ID_O2_GG8_9862 0x9862 +#define PCI_DEVICE_ID_O2_GG8_9863 0x9863#define PCI_DEVICE_ID_INTEL_PCH_SDIO0 0x8809#define PCI_DEVICE_ID_INTEL_PCH_SDIO1 0x880a
base-commit: 9e87b63ed37e202c77aa17d4112da6ae0c7c097c
Signature · 1 line
2.25.1
PATCH 2/2 mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 support
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for SD express card. This patch depends on patch 1/2.
---
Change in V1:
1.Implement the SD express card callback routine. 2.Add SD express card support for Bayhub GG8 chip.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 61 +++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-o2micro.c +60 -1
@@ -21,6 +21,7 @@* O2Micro device registers */ +#define O2_SD_PCIE_SWITCH 0x54#define O2_SD_MISC_REG5 0x64#define O2_SD_LD0_CTRL 0x68#define O2_SD_DEV_CTRL 0x88
@@ -631,6 +632,63 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)sdhci_o2_enable_clk (host, clk); } +static u8 sdhci_o2_sd_express_clkq_assert (struct sdhci_host *host) +{ +return sdhci_readb (host,O2_SD_EXP_INT_REG ); +} + +static int sdhci_pci_o2_init_sd_express (struct mmc_host *mmc,struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip; +u8 scratch8 =0 ; +u16 scratch16 =0 ; +bool ret = false; + +/* Disable clock */ +sdhci_writeb (host,0 ,SDHCI_CLOCK_CONTROL ); + +/* Set VDD2 voltage*/ + scratch8 =sdhci_readb (host,SDHCI_POWER_CONTROL ); + scratch8 &=0x0F ; +if ((host->mmc->ios.timing ==MMC_TIMING_SD_EXP_1_2V ) && + (host->mmc->caps2 &MMC_CAP2_SD_EXP_1_2V )) { + scratch8 |=BIT (4 ) |BIT (7 ); + }else + scratch8 |=BIT (4 ) |BIT (5 ) |BIT (7 ); +sdhci_writeb (host, scratch8,SDHCI_POWER_CONTROL ); + +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch8); + scratch8 &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch8); + + ret =readx_poll_timeout (sdhci_o2_sd_express_clkq_assert, host, + scratch8, !(scratch8 &BIT (0 )),1 ,30000 ) ==0 ?0 :1 ; + +if (!ret) { +/* switch to PCIe mode */ + scratch16 =sdhci_readw (host,O2_SD_PCIE_SWITCH ); + scratch16 |=BIT (8 ); +sdhci_writew (host, scratch16,O2_SD_PCIE_SWITCH ); + }else { +/* keep mode as USHI */ +pci_read_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , &scratch16); + scratch16 &= ~BIT (11 ); +pci_write_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , scratch16); + } +/* Lock WP */ +pci_read_config_byte (chip->pdev, +O2_SD_LOCK_WP , &scratch8); + scratch8 |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch8); + +return ret; +} +static int sdhci_pci_o2_probe_slot (struct sdhci_pci_slot *slot) {struct sdhci_pci_chip *chip;
@@ -703,10 +761,11 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)case PCI_DEVICE_ID_O2_GG8_9861 :case PCI_DEVICE_ID_O2_GG8_9862 :case PCI_DEVICE_ID_O2_GG8_9863 : - host->mmc->caps2 |=MMC_CAP2_NO_SDIO ; + host->mmc->caps2 |=MMC_CAP2_NO_SDIO |MMC_CAP2_SD_EXP |MMC_CAP2_SD_EXP_1_2V ; host->mmc->caps |=MMC_CAP_HW_RESET ; host->quirks2 |=SDHCI_QUIRK2_PRESET_VALUE_BROKEN ; slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd; + host->mmc_host_ops.init_sd_express = sdhci_pci_o2_init_sd_express;break ;default :break ;
Signature · 1 line
2.25.1
Hi, Adrian/Ulf,
May I know the patch progress?
Look forward your response.
BR,
Chevron
-----Original Message-----
From: Chevron Li <[email protected]>
Sent: Wednesday, June 7, 2023 9:48
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: Shaper Liu (WH) <[email protected]>; XiaoGuang Yu (WH) <[email protected]>; Shirley Her(SC) <[email protected]>; Chevron Li (WH) <[email protected]>
Subject: [PATCH V1 2/2] mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 support
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for SD express card. This patch depends on patch 1/2.
---
Change in V1:
1.Implement the SD express card callback routine. 2.Add SD express card support for Bayhub GG8 chip.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 61 +++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-o2micro.c +59 -1
@@ -21,6 +21,7 @@* O2Micro device registers */ +#define O2_SD_PCIE_SWITCH 0x54#define O2_SD_MISC_REG5 0x64#define O2_SD_LD0_CTRL 0x68#define O2_SD_DEV_CTRL 0x88
@@ -631,6 +632,63 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)sdhci_o2_enable_clk (host, clk); } +static u8 sdhci_o2_sd_express_clkq_assert (struct sdhci_host *host) { +return sdhci_readb (host,O2_SD_EXP_INT_REG ); } + +static int sdhci_pci_o2_init_sd_express (struct mmc_host *mmc,struct +mmc_ios *ios) { +struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip; +u8 scratch8 =0 ; +u16 scratch16 =0 ; +bool ret = false; + +/* Disable clock */ +sdhci_writeb (host,0 ,SDHCI_CLOCK_CONTROL ); + +/* Set VDD2 voltage*/ + scratch8 =sdhci_readb (host,SDHCI_POWER_CONTROL ); + scratch8 &=0x0F ; +if ((host->mmc->ios.timing ==MMC_TIMING_SD_EXP_1_2V ) && + (host->mmc->caps2 &MMC_CAP2_SD_EXP_1_2V )) { + scratch8 |=BIT (4 ) |BIT (7 ); + }else + scratch8 |=BIT (4 ) |BIT (5 ) |BIT (7 ); +sdhci_writeb (host, scratch8,SDHCI_POWER_CONTROL ); + +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch8); + scratch8 &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch8); + + ret =readx_poll_timeout (sdhci_o2_sd_express_clkq_assert, host, + scratch8, !(scratch8 &BIT (0 )),1 ,30000 ) ==0 ?0 :1 ; + +if (!ret) { +/* switch to PCIe mode */ + scratch16 =sdhci_readw (host,O2_SD_PCIE_SWITCH ); + scratch16 |=BIT (8 ); +sdhci_writew (host, scratch16,O2_SD_PCIE_SWITCH ); + }else { +/* keep mode as USHI */ +pci_read_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , &scratch16); + scratch16 &= ~BIT (11 ); +pci_write_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , scratch16); + } +/* Lock WP */ +pci_read_config_byte (chip->pdev, +O2_SD_LOCK_WP , &scratch8); + scratch8 |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch8); + +return ret; +} +static int sdhci_pci_o2_probe_slot (struct sdhci_pci_slot *slot) {struct sdhci_pci_chip *chip;
@@ -703,10 +761,11 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)case PCI_DEVICE_ID_O2_GG8_9861 :case PCI_DEVICE_ID_O2_GG8_9862 :case PCI_DEVICE_ID_O2_GG8_9863 : - host->mmc->caps2 |=MMC_CAP2_NO_SDIO ; + host->mmc->caps2 |=MMC_CAP2_NO_SDIO |MMC_CAP2_SD_EXP | +MMC_CAP2_SD_EXP_1_2V ; host->mmc->caps |=MMC_CAP_HW_RESET ; host->quirks2 |=SDHCI_QUIRK2_PRESET_VALUE_BROKEN ; slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd; + host->mmc_host_ops.init_sd_express = sdhci_pci_o2_init_sd_express;break ;default :
break;
--
2.25.1
Adrian Hunter
maintainerQuoted 4 lines · Chevron Li
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for SD express card. This patch depends on patch 1/2.
Patch subject should be different from patch 1
Quoted 2 lines
Signed-off-by Chevron Li <[email protected]>
Some comments below.
Quoted 27 lines
---
Change in V1:
1.Implement the SD express card callback routine. 2.Add SD express card support for Bayhub GG8 chip.--- drivers/mmc/host/sdhci-pci-o2micro.c | 61 +++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci-pci-o2micro.c +4
-0@@ -21,6 +21,7 @@* O2Micro device registers */ +#define O2_SD_PCIE_SWITCH 0x54#define O2_SD_MISC_REG5 0x64#define O2_SD_LD0_CTRL 0x68#define O2_SD_DEV_CTRL 0x88@@ -631,6 +632,63 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)sdhci_o2_enable_clk (host, clk); } +static u8 sdhci_o2_sd_express_clkq_assert (struct sdhci_host *host) +{ +return sdhci_readb (host,O2_SD_EXP_INT_REG );
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 647
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +10
-0+} + +static int sdhci_pci_o2_init_sd_express (struct mmc_host *mmc,struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct sdhci_pci_chip *chip = slot->chip; +u8 scratch8 =0 ; +u16 scratch16 =0 ; +bool ret = false;
ret should be an int and does not need to be initialized.
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 656
Quoted 9 lines
drivers/mmc/host/sdhci-pci-o2micro.c +9
-0+ +/* Disable clock */ +sdhci_writeb (host,0 ,SDHCI_CLOCK_CONTROL ); + +/* Set VDD2 voltage*/ + scratch8 =sdhci_readb (host,SDHCI_POWER_CONTROL ); + scratch8 &=0x0F ; +if ((host->mmc->ios.timing ==MMC_TIMING_SD_EXP_1_2V ) && + (host->mmc->caps2 &MMC_CAP2_SD_EXP_1_2V )) {
Unnecessary parentheses
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 658
Quoted 2 lines
drivers/mmc/host/sdhci-pci-o2micro.c +2
-0+ scratch8 |=BIT (4 ) |BIT (7 ); + }else
braces {} should be used on all arms of this statement
Have a look at the output of checkpatch.pl --strict
There are "Alignment should match open parenthesis" messages also
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 659
Quoted 1 line
drivers/mmc/host/sdhci-pci-o2micro.c +1
-0+ scratch8 |=BIT (4 ) |BIT (5 ) |BIT (7 );
Please use SDHCI_VDD2_POWER_ON, SDHCI_VDD2_POWER_120, SDHCI_VDD2_POWER_180
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 668
Quoted 9 lines
drivers/mmc/host/sdhci-pci-o2micro.c +9
-0+sdhci_writeb (host, scratch8,SDHCI_POWER_CONTROL ); + +/* UnLock WP */ +pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch8); + scratch8 &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch8); + + ret =readx_poll_timeout (sdhci_o2_sd_express_clkq_assert, host, + scratch8, !(scratch8 &BIT (0 )),1 ,30000 ) ==0 ?0 :1 ;
This can use read_poll_timeout() then sdhci_o2_sd_express_clkq_assert() is not needed. And the ' == 0 ? 0 : 1' does not seem needed.
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 676
Quoted 8 lines
drivers/mmc/host/sdhci-pci-o2micro.c +8
-0+ +if (!ret) { +/* switch to PCIe mode */ + scratch16 =sdhci_readw (host,O2_SD_PCIE_SWITCH ); + scratch16 |=BIT (8 ); +sdhci_writew (host, scratch16,O2_SD_PCIE_SWITCH ); + }else { +/* keep mode as USHI */
USHI ?
Do you intend to fall back to SD mode here? Because returning non-zero will cause the initialization to fail. To continue to initialize SD mode, it looks like you need to change host->ios.timing = MMC_TIMING_LEGACY and return 0
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 678
Quoted 2 lines
drivers/mmc/host/sdhci-pci-o2micro.c +2
-0+pci_read_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , &scratch16);
Unneeded line break
drivers/mmc/host/sdhci-pci-o2micro.c static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) · line 681
Quoted 3 lines
drivers/mmc/host/sdhci-pci-o2micro.c +3
-0+ scratch16 &= ~BIT (11 ); +pci_write_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , scratch16);
Unneeded line break
Quoted 26 lines
drivers/mmc/host/sdhci-pci-o2micro.c +12
-1+ } +/* Lock WP */ +pci_read_config_byte (chip->pdev, +O2_SD_LOCK_WP , &scratch8); + scratch8 |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch8); + +return ret; +} +static int sdhci_pci_o2_probe_slot (struct sdhci_pci_slot *slot) {struct sdhci_pci_chip *chip;@@ -703,10 +761,11 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)case PCI_DEVICE_ID_O2_GG8_9861 :case PCI_DEVICE_ID_O2_GG8_9862 :case PCI_DEVICE_ID_O2_GG8_9863 : - host->mmc->caps2 |=MMC_CAP2_NO_SDIO ; + host->mmc->caps2 |=MMC_CAP2_NO_SDIO |MMC_CAP2_SD_EXP |MMC_CAP2_SD_EXP_1_2V ; host->mmc->caps |=MMC_CAP_HW_RESET ; host->quirks2 |=SDHCI_QUIRK2_PRESET_VALUE_BROKEN ; slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd; + host->mmc_host_ops.init_sd_express = sdhci_pci_o2_init_sd_express;break ;default :break ;
Hi, Adrian/Ulf,
May I know the patch progress?
Look forward your response.
BR,
Chevron
-----Original Message-----
From: Chevron Li <[email protected]>
Sent: Wednesday, June 7, 2023 9:48
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: Shaper Liu (WH) <[email protected]>; XiaoGuang Yu (WH) <[email protected]>; Shirley Her(SC) <[email protected]>; Chevron Li (WH) <[email protected]>
Subject: [PATCH V1 1/2] mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 support
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for USHI function
---
Change in V1:
1.Add GG8 chip IDs in sdhci-pci-core.c and sdhci-pci.h 2.Add GG8 chip initialization flow at sdhci-pci-o2micro.c
--- drivers/mmc/host/sdhci-pci-core.c | 4 + drivers/mmc/host/sdhci-pci-o2micro.c | 154 ++++++++++++++++++++------- drivers/mmc/host/sdhci-pci.h | 4 + 3 files changed, 126 insertions(+), 36 deletions(-)
drivers/mmc/host/sdhci-pci-core.c +4 -0
@@ -1898,6 +1898,10 @@ static const struct pci_device_id pci_ids[] = {SDHCI_PCI_DEVICE (O2 ,SDS1 , o2),SDHCI_PCI_DEVICE (O2 ,SEABIRD0 , o2),SDHCI_PCI_DEVICE (O2 ,SEABIRD1 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9860 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9861 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9862 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9863 , o2),SDHCI_PCI_DEVICE (ARASAN ,PHY_EMMC , arasan),SDHCI_PCI_DEVICE (SYNOPSYS ,DWC_MSHC , snps), SDHCI_PCI_DEVICE(GLI, 9750, gl9750),
drivers/mmc/host/sdhci-pci-o2micro.c +42 -25
86 lines not on this page · raw message
if (readx_poll_timeout(sdhci_o2_pll_dll_wdt_control, host, @@ -563,6 +579,7 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) u16 clk;
u8 scratch;
u32 scratch_32;
+ u32 dmdn_208m, dmdn_200m;
struct sdhci_pci_slot *slot = sdhci_priv(host);
struct sdhci_pci_chip *chip = slot->chip;
@@ -578,16 +595,27 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)
scratch &= 0x7f;
pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
+ if ((chip->pdev->device == PCI_DEVICE_ID_O2_GG8_9860) ||
+ (chip->pdev->device == PCI_DEVICE_ID_O2_GG8_9861) || + (chip->pdev->device == PCI_DEVICE_ID_O2_GG8_9862) ||
+ (chip->pdev->device == PCI_DEVICE_ID_O2_GG8_9863)) {
+ dmdn_208m = 0x2c500000;
+ dmdn_200m = 0x25200000;
+ } else {
+ dmdn_208m = 0x2c280000;
+ dmdn_200m = 0x25100000;
+ }
+
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);
+ if ((scratch_32 & 0xFFFF0000) != dmdn_208m)
+ o2_pci_set_baseclk(chip, dmdn_208m);
} else {
pci_read_config_dword(chip->pdev, O2_SD_PLL_SETTING, &scratch_32);
- if ((scratch_32 & 0xFFFF0000) != 0x25100000)
- o2_pci_set_baseclk(chip, 0x25100000);
+ if ((scratch_32 & 0xFFFF0000) != dmdn_200m)
+ o2_pci_set_baseclk(chip, dmdn_200m);
}
pci_read_config_dword(chip->pdev, O2_SD_OUTPUT_CLK_SOURCE_SWITCH, &scratch_32); @@ -624,6 +652,11 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) if (caps & SDHCI_CAN_DO_8BIT)
host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+ host->quirks2 |= SDHCI_QUIRK2_BROKEN_DDR50;
+
+ sdhci_pci_o2_enable_msi(chip, host);
+
+ host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning;
switch (chip->pdev->device) {
case PCI_DEVICE_ID_O2_SDS0:
case PCI_DEVICE_ID_O2_SEABIRD0:
@@ -634,10 +667,6 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
if (reg & 0x1)
host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
- host->quirks2 |= SDHCI_QUIRK2_BROKEN_DDR50;
-
- sdhci_pci_o2_enable_msi(chip, host);
-
if (chip->pdev->device == PCI_DEVICE_ID_O2_SEABIRD0) {
ret = pci_read_config_dword(chip->pdev,
O2_SD_MISC_SETTING, ®);
@@ -663,15 +692,21 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
}
- host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning;
-
if (chip->pdev->device != PCI_DEVICE_ID_O2_FUJIN2)
break;
/* set dll watch dog timer */
reg = sdhci_readl(host, O2_SD_VENDOR_SETTING2);
reg |= (1 << 12);
sdhci_writel(host, reg, O2_SD_VENDOR_SETTING2);
-
+ break;
+ case PCI_DEVICE_ID_O2_GG8_9860:
+ case PCI_DEVICE_ID_O2_GG8_9861:
+ case PCI_DEVICE_ID_O2_GG8_9862:
+ case PCI_DEVICE_ID_O2_GG8_9863:
+ host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
+ host->mmc->caps |= MMC_CAP_HW_RESET;
+ host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
+ slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;
break;
default:
break;
@@ -684,6 +719,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) {
int ret;
u8 scratch;
+ u16 scratch16;
u32 scratch_32;
switch (chip->pdev->device) {
@@ -885,6 +921,52 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
scratch_32 |= 0x00180000; pci_write_config_dword(chip->pdev, O2_SD_MISC_CTRL2, scratch_32); pci_write_config_dword(chip->pdev, O2_SD_DETECT_SETTING, 1);
+ /* Lock WP */
+ ret = pci_read_config_byte(chip->pdev,
+ O2_SD_LOCK_WP, &scratch);
+ if (ret)
+ return ret;
+ scratch |= 0x80;
+ pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
+ break;
+ case PCI_DEVICE_ID_O2_GG8_9860:
+ case PCI_DEVICE_ID_O2_GG8_9861:
+ case PCI_DEVICE_ID_O2_GG8_9862:
+ case PCI_DEVICE_ID_O2_GG8_9863:
+ /* UnLock WP */
+ ret = pci_read_config_byte(chip->pdev, O2_SD_LOCK_WP, &scratch);
+ if (ret)
+ return ret;
+ scratch &= 0x7f;
+ pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
+
+ /* Select mode switch source as software control */
+ pci_read_config_word(chip->pdev,
+ O2_SD_PARA_SET_REG1, &scratch16);
+ scratch16 &= 0xF8FF;
+ scratch16 |= BIT(9);
+ pci_write_config_word(chip->pdev,
+ O2_SD_PARA_SET_REG1, scratch16);
+
+ /* set VDD1 supply source */
+ pci_read_config_word(chip->pdev,
+ O2_SD_VDDX_CTRL_REG, &scratch16);
+ scratch16 &= 0xFFE3;
+ scratch16 |= BIT(3);
+ pci_write_config_word(chip->pdev,
+ O2_SD_VDDX_CTRL_REG, scratch16);
+
+ /* Set host drive strength*/
+ scratch16 = 0x0025;
+ pci_write_config_word(chip->pdev,
+ O2_SD_PLL_SETTING, scratch16);
+
+ /* Set output delay*/
+ pci_read_config_dword(chip->pdev, O2_SD_OUTPUT_CLK_SOURCE_SWITCH, &scratch_32);
+ scratch_32 &= 0xFF0FFF00;
+ scratch_32 |= 0x00B0003B;
+ pci_write_config_dword(chip->pdev, O2_SD_OUTPUT_CLK_SOURCE_SWITCH,
+scratch_32);
+
/* Lock WP */
ret = pci_read_config_byte(chip->pdev,
O2_SD_LOCK_WP, &scratch);
drivers/mmc/host/sdhci-pci.h +4 -0
@@ -11,6 +11,10 @@#define PCI_DEVICE_ID_O2_FUJIN2 0x8520#define PCI_DEVICE_ID_O2_SEABIRD0 0x8620#define PCI_DEVICE_ID_O2_SEABIRD1 0x8621 +#define PCI_DEVICE_ID_O2_GG8_9860 0x9860 +#define PCI_DEVICE_ID_O2_GG8_9861 0x9861 +#define PCI_DEVICE_ID_O2_GG8_9862 0x9862 +#define PCI_DEVICE_ID_O2_GG8_9863 0x9863#define PCI_DEVICE_ID_INTEL_PCH_SDIO0 0x8809#define PCI_DEVICE_ID_INTEL_PCH_SDIO1 0x880a
base-commit: 9e87b63ed37e202c77aa17d4112da6ae0c7c097c --
2.25.1
Adrian Hunter
maintainerQuoted 5 lines · Chevron Li
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for USHI function
Signed-off-by Chevron Li <[email protected]>
Some minor cosmetic comments below.
Quoted 38 lines
---
Change in V1:
1.Add GG8 chip IDs insdhci-pci-core.candsdhci-pci.h2.Add GG8 chip initialization flow atsdhci-pci-o2micro.c--- drivers/mmc/host/sdhci-pci-core.c | 4 + drivers/mmc/host/sdhci-pci-o2micro.c | 154 ++++++++++++++++++++------- drivers/mmc/host/sdhci-pci.h | 4 + 3 files changed, 126 insertions(+), 36 deletions(-)drivers/mmc/host/sdhci-pci-core.c +4
-0@@ -1898,6 +1898,10 @@ static const struct pci_device_id pci_ids[] = {SDHCI_PCI_DEVICE (O2 ,SDS1 , o2),SDHCI_PCI_DEVICE (O2 ,SEABIRD0 , o2),SDHCI_PCI_DEVICE (O2 ,SEABIRD1 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9860 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9861 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9862 , o2), +SDHCI_PCI_DEVICE (O2 ,GG8_9863 , o2),SDHCI_PCI_DEVICE (ARASAN ,PHY_EMMC , arasan),SDHCI_PCI_DEVICE (SYNOPSYS ,DWC_MSHC , snps), SDHCI_PCI_DEVICE(GLI, 9750, gl9750),drivers/mmc/host/sdhci-pci-o2micro.c +1
-0@@ -36,6 +36,7 @@#define O2_SD_INF_MOD 0xF1#define O2_SD_MISC_CTRL4 0xFC#define O2_SD_MISC_CTRL 0x1C0 +#define O2_SD_EXP_INT_REG 0x1E0#define O2_SD_PWR_FORCE_L0 0x0002#define O2_SD_TUNING_CTRL 0x300#define O2_SD_PLL_SETTING 0x304
drivers/mmc/host/sdhci-pci-o2micro.c line 55
Quoted 6 lines
drivers/mmc/host/sdhci-pci-o2micro.c +3
-0@@ -49,6 +50,9 @@#define O2_SD_UHS2_L1_CTRL 0x35C#define O2_SD_FUNC_REG3 0x3E0#define O2_SD_FUNC_REG4 0x3E4 +#define O2_SD_PARA_SET_REG1 0x444 +#define O2_SD_VDDX_CTRL_REG 0x508 +#define O2_SD_GPIO_CTRL_REG1 0x510
Values do not align with the ones above
Quoted 28 lines
drivers/mmc/host/sdhci-pci-o2micro.c +4
-17#define O2_SD_LED_ENABLE BIT(6)#define O2_SD_FREG0_LEDOFF BIT(13)#define O2_SD_SEL_DLL BIT(16)@@ -334,33 +338,45 @@ 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 ); - -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); - -/* 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); +/* Update output phase */ +switch (chip->pdev->device) { +case PCI_DEVICE_ID_O2_SDS0 : +case PCI_DEVICE_ID_O2_SEABIRD0 :
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 354
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +10
-0+case PCI_DEVICE_ID_O2_SEABIRD1 : +case PCI_DEVICE_ID_O2_SDS1 : +case PCI_DEVICE_ID_O2_FUJIN2 : +/* Stop clk */ + reg_val =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + reg_val &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, reg_val,SDHCI_CLOCK_CONTROL ); + +if ((host->timing ==MMC_TIMING_MMC_HS200 ) || + (host->timing ==MMC_TIMING_UHS_SDR104 )) {
There are unecessary parentheses here and elsewhere. Have a look at the output of checkpatch.pl --strict
There are "Alignment should match open parenthesis" messages also
Quoted 148 lines
drivers/mmc/host/sdhci-pci-o2micro.c +66
-19+/* 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); + } -/* 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 ); +break ; +default : +break ; } -/* 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,@@ -563,6 +579,7 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock)u16 clk;u8 scratch;u32 scratch_32; +u32 dmdn_208m, dmdn_200m;struct sdhci_pci_slot *slot =sdhci_priv (host);struct sdhci_pci_chip *chip = slot->chip;@@ -578,16 +595,27 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *host, unsigned int clock) scratch &=0x7f ;pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +if ((chip->pdev->device ==PCI_DEVICE_ID_O2_GG8_9860 ) || + (chip->pdev->device ==PCI_DEVICE_ID_O2_GG8_9861 ) || + (chip->pdev->device ==PCI_DEVICE_ID_O2_GG8_9862 ) || + (chip->pdev->device ==PCI_DEVICE_ID_O2_GG8_9863 )) { + dmdn_208m =0x2c500000 ; + dmdn_200m =0x25200000 ; + }else { + dmdn_208m =0x2c280000 ; + dmdn_200m =0x25100000 ; + } +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 ); +if ((scratch_32 &0xFFFF0000 ) != dmdn_208m) +o2_pci_set_baseclk (chip, dmdn_208m); }else {pci_read_config_dword (chip->pdev,O2_SD_PLL_SETTING , &scratch_32); -if ((scratch_32 &0xFFFF0000 ) !=0x25100000 ) -o2_pci_set_baseclk (chip,0x25100000 ); +if ((scratch_32 &0xFFFF0000 ) != dmdn_200m) +o2_pci_set_baseclk (chip, dmdn_200m); }pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32);@@ -624,6 +652,11 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)if (caps &SDHCI_CAN_DO_8BIT ) host->mmc->caps |=MMC_CAP_8_BIT_DATA ; + host->quirks2 |=SDHCI_QUIRK2_BROKEN_DDR50 ; + +sdhci_pci_o2_enable_msi (chip, host); + + host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning;switch (chip->pdev->device) {case PCI_DEVICE_ID_O2_SDS0 :case PCI_DEVICE_ID_O2_SEABIRD0 :@@ -634,10 +667,6 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)if (reg &0x1 ) host->quirks |=SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 ; - host->quirks2 |=SDHCI_QUIRK2_BROKEN_DDR50 ; - -sdhci_pci_o2_enable_msi (chip, host); -if (chip->pdev->device ==PCI_DEVICE_ID_O2_SEABIRD0 ) { ret =pci_read_config_dword (chip->pdev,O2_SD_MISC_SETTING , ®);@@ -663,15 +692,21 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) host->quirks2 |=SDHCI_QUIRK2_PRESET_VALUE_BROKEN ; } - host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning; -if (chip->pdev->device !=PCI_DEVICE_ID_O2_FUJIN2 )break ;/* set dll watch dog timer */ reg =sdhci_readl (host,O2_SD_VENDOR_SETTING2 ); reg |= (1 <<12 );sdhci_writel (host, reg,O2_SD_VENDOR_SETTING2 ); - +break ; +case PCI_DEVICE_ID_O2_GG8_9860 : +case PCI_DEVICE_ID_O2_GG8_9861 : +case PCI_DEVICE_ID_O2_GG8_9862 : +case PCI_DEVICE_ID_O2_GG8_9863 : + host->mmc->caps2 |=MMC_CAP2_NO_SDIO ; + host->mmc->caps |=MMC_CAP_HW_RESET ; + host->quirks2 |=SDHCI_QUIRK2_PRESET_VALUE_BROKEN ; + slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd;break ;default :break ;@@ -684,6 +719,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) {int ret;u8 scratch; +u16 scratch16;u32 scratch_32;switch (chip->pdev->device) {@@ -885,6 +921,52 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) scratch_32 |=0x00180000 ;pci_write_config_dword (chip->pdev,O2_SD_MISC_CTRL2 , scratch_32);pci_write_config_dword (chip->pdev,O2_SD_DETECT_SETTING ,1 ); +/* Lock WP */ + ret =pci_read_config_byte (chip->pdev, +O2_SD_LOCK_WP , &scratch); +if (ret) +return ret; + scratch |=0x80 ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); +break ; +case PCI_DEVICE_ID_O2_GG8_9860 : +case PCI_DEVICE_ID_O2_GG8_9861 : +case PCI_DEVICE_ID_O2_GG8_9862 : +case PCI_DEVICE_ID_O2_GG8_9863 :
drivers/mmc/host/sdhci-pci-o2micro.c static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) · line 945
Quoted 10 lines
drivers/mmc/host/sdhci-pci-o2micro.c +10
-0+/* UnLock WP */ + ret =pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch); +if (ret) +return ret; + scratch &=0x7f ; +pci_write_config_byte (chip->pdev,O2_SD_LOCK_WP , scratch); + +/* Select mode switch source as software control */ +pci_read_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , &scratch16);
Line break is not needed above and in similar cases below. Wrapping at 100 columns instead of 80 is OK.
Quoted 44 lines
drivers/mmc/host/sdhci-pci-o2micro.c +24
-0+ scratch16 &=0xF8FF ; + scratch16 |=BIT (9 ); +pci_write_config_word (chip->pdev, +O2_SD_PARA_SET_REG1 , scratch16); + +/* set VDD1 supply source */ +pci_read_config_word (chip->pdev, +O2_SD_VDDX_CTRL_REG , &scratch16); + scratch16 &=0xFFE3 ; + scratch16 |=BIT (3 ); +pci_write_config_word (chip->pdev, +O2_SD_VDDX_CTRL_REG , scratch16); + +/* Set host drive strength*/ + scratch16 =0x0025 ; +pci_write_config_word (chip->pdev, +O2_SD_PLL_SETTING , scratch16); + +/* Set output delay*/ +pci_read_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , &scratch_32); + scratch_32 &=0xFF0FFF00 ; + scratch_32 |=0x00B0003B ; +pci_write_config_dword (chip->pdev,O2_SD_OUTPUT_CLK_SOURCE_SWITCH , scratch_32); +/* Lock WP */ ret =pci_read_config_byte (chip->pdev,O2_SD_LOCK_WP , &scratch);drivers/mmc/host/sdhci-pci.h +4
-0@@ -11,6 +11,10 @@#define PCI_DEVICE_ID_O2_FUJIN2 0x8520#define PCI_DEVICE_ID_O2_SEABIRD0 0x8620#define PCI_DEVICE_ID_O2_SEABIRD1 0x8621 +#define PCI_DEVICE_ID_O2_GG8_9860 0x9860 +#define PCI_DEVICE_ID_O2_GG8_9861 0x9861 +#define PCI_DEVICE_ID_O2_GG8_9862 0x9862 +#define PCI_DEVICE_ID_O2_GG8_9863 0x9863#define PCI_DEVICE_ID_INTEL_PCH_SDIO0 0x8809#define PCI_DEVICE_ID_INTEL_PCH_SDIO1 0x880abase-commit:
9e87b63ed37e202c77aa17d4112da6ae0c7c097c
Adrian Hunter
maintainerQuoted 3 lines · Chevron Li
From: Chevron Li <[email protected]>
Add Bayhub new chip GG8 support for USHI function
USHI ? Should that be UHS-I