Skip to content

Commit 86f4c65

Browse files
Ricky WUgregkh
Ricky WU
authored and
gregkh
committed
misc: rtsx: rts522a rts5228 rts5261 support Runtime PM
rts522a, rts5228, rts5261 add extra init flow for rtd3 add more power_down setting for avoid being woken up by plugging or unplugging card when system in S3 Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Ricky Wu <ricky_wu@realtek.com> Link: https://lore.kernel.org/r/dace32f573a445908fec0a10482c394c@realtek.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f4e335f commit 86f4c65

File tree

4 files changed

+98
-5
lines changed

4 files changed

+98
-5
lines changed

‎drivers/misc/cardreader/rts5227.c‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ static void rts5227_fetch_vendor_settings(struct rtsx_pcr *pcr)
7272

7373
pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);
7474
pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);
75+
if (CHK_PCI_PID(pcr, 0x522A))
76+
pcr->rtd3_en = rtsx_reg_to_rtd3(reg);
7577
if (rtsx_check_mmc_support(reg))
7678
pcr->extra_caps |= EXTRA_CAPS_NO_MMC;
7779
pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg);
@@ -171,6 +173,28 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
171173
else
172174
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0x30, 0x00);
173175

176+
if (CHK_PCI_PID(pcr, 0x522A))
177+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, RTS522A_AUTOLOAD_CFG1,
178+
CD_RESUME_EN_MASK, CD_RESUME_EN_MASK);
179+
180+
if (pcr->rtd3_en) {
181+
if (CHK_PCI_PID(pcr, 0x522A)) {
182+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, RTS522A_PM_CTRL3, 0x01, 0x01);
183+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, RTS522A_PME_FORCE_CTL, 0x30, 0x30);
184+
} else {
185+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x01, 0x01);
186+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PME_FORCE_CTL, 0xFF, 0x33);
187+
}
188+
} else {
189+
if (CHK_PCI_PID(pcr, 0x522A)) {
190+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, RTS522A_PM_CTRL3, 0x01, 0x00);
191+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, RTS522A_PME_FORCE_CTL, 0x30, 0x20);
192+
} else {
193+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PME_FORCE_CTL, 0xFF, 0x30);
194+
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x01, 0x00);
195+
}
196+
}
197+
174198
if (option->force_clkreq_0)
175199
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG,
176200
FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
@@ -438,6 +462,28 @@ static int rts522a_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
438462
return rtsx_pci_send_cmd(pcr, 100);
439463
}
440464

465+
static void rts522a_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool runtime)
466+
{
467+
/* Set relink_time to 0 */
468+
rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 1, MASK_8_BIT_DEF, 0);
469+
rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 2, MASK_8_BIT_DEF, 0);
470+
rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 3,
471+
RELINK_TIME_MASK, 0);
472+
473+
rtsx_pci_write_register(pcr, RTS522A_PM_CTRL3,
474+
D3_DELINK_MODE_EN, D3_DELINK_MODE_EN);
475+
476+
if (!runtime) {
477+
rtsx_pci_write_register(pcr, RTS522A_AUTOLOAD_CFG1,
478+
CD_RESUME_EN_MASK, 0);
479+
rtsx_pci_write_register(pcr, RTS522A_PM_CTRL3, 0x01, 0x00);
480+
rtsx_pci_write_register(pcr, RTS522A_PME_FORCE_CTL, 0x30, 0x20);
481+
}
482+
483+
rtsx_pci_write_register(pcr, FPDCTL, ALL_POWER_DOWN, ALL_POWER_DOWN);
484+
}
485+
486+
441487
static void rts522a_set_l1off_cfg_sub_d0(struct rtsx_pcr *pcr, int active)
442488
{
443489
struct rtsx_cr_option *option = &pcr->option;
@@ -473,6 +519,7 @@ static const struct pcr_ops rts522a_pcr_ops = {
473519
.card_power_on = rts5227_card_power_on,
474520
.card_power_off = rts5227_card_power_off,
475521
.switch_output_voltage = rts522a_switch_output_voltage,
522+
.force_power_down = rts522a_force_power_down,
476523
.cd_deglitch = NULL,
477524
.conv_clk_and_div_n = NULL,
478525
.set_l1off_cfg_sub_d0 = rts522a_set_l1off_cfg_sub_d0,

‎drivers/misc/cardreader/rts5228.c‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,14 @@ static void rts5228_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool run
102102
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3,
103103
D3_DELINK_MODE_EN, D3_DELINK_MODE_EN);
104104

105+
if (!runtime) {
106+
rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1,
107+
CD_RESUME_EN_MASK, 0);
108+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x01, 0x00);
109+
rtsx_pci_write_register(pcr, RTS5228_REG_PME_FORCE_CTL,
110+
FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL);
111+
}
112+
105113
rtsx_pci_write_register(pcr, FPDCTL,
106114
SSC_POWER_DOWN, SSC_POWER_DOWN);
107115
}
@@ -480,9 +488,18 @@ static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
480488
FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
481489

482490
rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
483-
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00);
491+
492+
if (pcr->rtd3_en) {
493+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x01, 0x01);
484494
rtsx_pci_write_register(pcr, RTS5228_REG_PME_FORCE_CTL,
485-
FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL);
495+
FORCE_PM_CONTROL | FORCE_PM_VALUE,
496+
FORCE_PM_CONTROL | FORCE_PM_VALUE);
497+
} else {
498+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x01, 0x00);
499+
rtsx_pci_write_register(pcr, RTS5228_REG_PME_FORCE_CTL,
500+
FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL);
501+
}
502+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, D3_DELINK_MODE_EN, 0x00);
486503

487504
return 0;
488505
}

‎drivers/misc/cardreader/rts5261.c‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,24 @@ static void rts5261_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool run
103103
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3,
104104
D3_DELINK_MODE_EN, D3_DELINK_MODE_EN);
105105

106+
if (!runtime) {
107+
rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1,
108+
CD_RESUME_EN_MASK, 0);
109+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x01, 0x00);
110+
rtsx_pci_write_register(pcr, RTS5261_REG_PME_FORCE_CTL,
111+
FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL);
112+
113+
} else {
114+
rtsx_pci_write_register(pcr, RTS5261_REG_PME_FORCE_CTL,
115+
FORCE_PM_CONTROL | FORCE_PM_VALUE, 0);
116+
117+
rtsx_pci_write_register(pcr, RTS5261_FW_CTL,
118+
RTS5261_INFORM_RTD3_COLD, RTS5261_INFORM_RTD3_COLD);
119+
rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG4,
120+
RTS5261_FORCE_PRSNT_LOW, RTS5261_FORCE_PRSNT_LOW);
121+
122+
}
123+
106124
rtsx_pci_write_register(pcr, RTS5261_REG_FPDCTL,
107125
SSC_POWER_DOWN, SSC_POWER_DOWN);
108126
}
@@ -536,9 +554,18 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
536554
FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
537555

538556
rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
539-
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00);
540-
rtsx_pci_write_register(pcr, RTS5261_REG_PME_FORCE_CTL,
541-
FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL);
557+
558+
if (pcr->rtd3_en) {
559+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x01, 0x01);
560+
rtsx_pci_write_register(pcr, RTS5261_REG_PME_FORCE_CTL,
561+
FORCE_PM_CONTROL | FORCE_PM_VALUE,
562+
FORCE_PM_CONTROL | FORCE_PM_VALUE);
563+
} else {
564+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x01, 0x00);
565+
rtsx_pci_write_register(pcr, RTS5261_REG_PME_FORCE_CTL,
566+
FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL);
567+
}
568+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, D3_DELINK_MODE_EN, 0x00);
542569

543570
/* Clear Enter RTD3_cold Information*/
544571
rtsx_pci_write_register(pcr, RTS5261_FW_CTL,

‎drivers/misc/cardreader/rtsx_pcr.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#define MIN_DIV_N_PCR 80
1616
#define MAX_DIV_N_PCR 208
1717

18+
#define RTS522A_PME_FORCE_CTL 0xFF78
19+
#define RTS522A_AUTOLOAD_CFG1 0xFF7C
1820
#define RTS522A_PM_CTRL3 0xFF7E
1921

2022
#define RTS524A_PME_FORCE_CTL 0xFF78

0 commit comments

Comments
 (0)