Commit 71732e24 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Greg Kroah-Hartman
Browse files

misc: rtsx: Quiesce rts5249 on system suspend 

Set more registers in force_power_down callback to avoid S3 wakeup from
hotplugging cards.

This is originally written by Ricky WU.

Link: https://lore.kernel.org/lkml/c4525b4738f94483b9b8f8571fc80646@realtek.com/


Cc: Ricky WU <ricky_wu@realtek.com>
Tested-by: default avatarRicky WU <ricky_wu@realtek.com>
Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20220125055010.1866563-4-kai.heng.feng@canonical.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b11a3c7a

drivers/misc/cardreader/rtl8411.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void rtl8411b_fetch_vendor_settings(struct rtsx_pcr *pcr) 
		map_sd_drive(rtl8411b_reg_to_sd30_drive_sel_3v3(reg));

}



static void rtl8411_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)

static void rtl8411_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool runtime)

{

	rtsx_pci_write_register(pcr, FPDCTL, 0x07, 0x07);

}

drivers/misc/cardreader/rts5209.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void rts5209_fetch_vendor_settings(struct rtsx_pcr *pcr) 
	}

}



static void rts5209_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)

static void rts5209_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool runtime)

{

	rtsx_pci_write_register(pcr, FPDCTL, 0x07, 0x07);

}

drivers/misc/cardreader/rts5228.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int rts5228_optimize_phy(struct rtsx_pcr *pcr) 
	return rtsx_pci_write_phy_register(pcr, 0x07, 0x8F40);

}



static void rts5228_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)

static void rts5228_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool runtime)

{

	/* Set relink_time to 0 */

	rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 1, MASK_8_BIT_DEF, 0);

drivers/misc/cardreader/rts5229.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void rts5229_fetch_vendor_settings(struct rtsx_pcr *pcr) 
		map_sd_drive(rtsx_reg_to_sd30_drive_sel_3v3(reg));

}



static void rts5229_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)

static void rts5229_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool runtime)

{

	rtsx_pci_write_register(pcr, FPDCTL, 0x03, 0x03);

}

drivers/misc/cardreader/rts5249.c

+29 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr) 
	pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);

	pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);



	if (CHK_PCI_PID(pcr, PID_524A) || CHK_PCI_PID(pcr, PID_525A))

		pcr->rtd3_en = rtsx_reg_to_rtd3_uhsii(reg);



	if (rtsx_check_mmc_support(reg))
@@ -143,6 +144,27 @@ static int rts5249_init_from_hw(struct rtsx_pcr *pcr) 
	return 0;

}



static void rts52xa_force_power_down(struct rtsx_pcr *pcr, u8 pm_state, bool runtime)

{

	/* Set relink_time to 0 */

	rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 1, MASK_8_BIT_DEF, 0);

	rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 2, MASK_8_BIT_DEF, 0);

	rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 3,

				RELINK_TIME_MASK, 0);



	rtsx_pci_write_register(pcr, RTS524A_PM_CTRL3,

			D3_DELINK_MODE_EN, D3_DELINK_MODE_EN);



	if (!runtime) {

		rtsx_pci_write_register(pcr, RTS524A_AUTOLOAD_CFG1,

				CD_RESUME_EN_MASK, 0);

		rtsx_pci_write_register(pcr, RTS524A_PM_CTRL3, 0x01, 0x00);

		rtsx_pci_write_register(pcr, RTS524A_PME_FORCE_CTL, 0x30, 0x20);

	}



	rtsx_pci_write_register(pcr, FPDCTL, ALL_POWER_DOWN, ALL_POWER_DOWN);

}



static void rts52xa_save_content_from_efuse(struct rtsx_pcr *pcr)

{

	u8 cnt, sv;
@@ -281,8 +303,11 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr) 


	rtsx_pci_send_cmd(pcr, CMD_TIMEOUT_DEF);



	if (CHK_PCI_PID(pcr, PID_524A) || CHK_PCI_PID(pcr, PID_525A))

	if (CHK_PCI_PID(pcr, PID_524A) || CHK_PCI_PID(pcr, PID_525A)) {

		rtsx_pci_write_register(pcr, REG_VREF, PWD_SUSPND_EN, PWD_SUSPND_EN);

		rtsx_pci_write_register(pcr, RTS524A_AUTOLOAD_CFG1,

			CD_RESUME_EN_MASK, CD_RESUME_EN_MASK);

	}



	if (pcr->rtd3_en) {

		if (CHK_PCI_PID(pcr, PID_524A) || CHK_PCI_PID(pcr, PID_525A)) {
@@ -724,6 +749,7 @@ static const struct pcr_ops rts524a_pcr_ops = { 
	.card_power_on = rtsx_base_card_power_on,

	.card_power_off = rtsx_base_card_power_off,

	.switch_output_voltage = rtsx_base_switch_output_voltage,

	.force_power_down = rts52xa_force_power_down,

	.set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0,

};
@@ -841,6 +867,7 @@ static const struct pcr_ops rts525a_pcr_ops = { 
	.card_power_on = rts525a_card_power_on,

	.card_power_off = rtsx_base_card_power_off,

	.switch_output_voltage = rts525a_switch_output_voltage,

	.force_power_down = rts52xa_force_power_down,

	.set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0,

};