misc: rtsx: Fix power down flow
Subsystems (2)
PATCH v4 1/2 misc: rtsx: Fix power down flow
From: Ricky Wu <[email protected]>
Fix and sort out rtsx driver power down flow
Signed-off-by Ricky Wu <[email protected]>
--- drivers/misc/cardreader/rts5227.c | 15 --------------- drivers/misc/cardreader/rts5228.c | 5 ++--- drivers/misc/cardreader/rts5249.c | 17 ----------------- drivers/misc/cardreader/rts5260.c | 16 ---------------- drivers/misc/cardreader/rtsx_pcr.c | 16 ++++++++++++++++ 5 files changed, 18 insertions(+), 51 deletions(-)
drivers/misc/cardreader/rts5227.c +0 -15
@@ -77,19 +77,6 @@ static void rts5227_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->flags |=PCR_REVERSE_SOCKET ; } -static void rts5227_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) -{ -/* Set relink_time to 0 */ -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +2 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 ,0x01 ,0 ); - -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3,0x10 ,0x10 ); - -rtsx_pci_write_register (pcr,FPDCTL ,0x03 ,0x03 ); -} -static int rts5227_extra_init_hw (struct rtsx_pcr *pcr) {u16 cap;
@@ -239,7 +226,6 @@ static const struct pcr_ops rts5227_pcr_ops = { .switch_output_voltage = rts5227_switch_output_voltage, .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, - .force_power_down = rts5227_force_power_down, };/* SD Pull Control Enable:
@@ -389,7 +375,6 @@ static const struct pcr_ops rts522a_pcr_ops = { .switch_output_voltage = rts522a_switch_output_voltage, .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, - .force_power_down = rts5227_force_power_down, };void rts522a_init_params (struct rtsx_pcr *pcr)
drivers/misc/cardreader/rts5228.c +2 -3
@@ -99,9 +99,8 @@ static void rts5228_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 ,RELINK_TIME_MASK ,0 ); -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, -D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); +rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, +D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN );rtsx_pci_write_register (pcr,FPDCTL ,SSC_POWER_DOWN ,SSC_POWER_DOWN );
drivers/misc/cardreader/rts5249.c +0 -17
@@ -78,20 +78,6 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->flags |=PCR_REVERSE_SOCKET ; } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) -{ -/* Set relink_time to 0 */ -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +2 ,0xFF ,0 ); -rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +3 ,0x01 ,0 ); - -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, -D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); - -rtsx_pci_write_register (pcr,FPDCTL ,0x03 ,0x03 ); -} -static void rts5249_init_from_cfg (struct rtsx_pcr *pcr) {struct pci_dev *pdev = pcr->pci;
@@ -360,7 +346,6 @@ static const struct pcr_ops rts5249_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 = rtsx_base_force_power_down, };/* SD Pull Control Enable:
@@ -585,7 +570,6 @@ 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 = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, };
@@ -700,7 +684,6 @@ 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 = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, };
drivers/misc/cardreader/rts5260.c +0 -16
@@ -87,21 +87,6 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->flags |=PCR_REVERSE_SOCKET ; } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) -{ -/* 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 ); - -if (pm_state ==HOST_ENTER_S3 ) -rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3, -D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); - -rtsx_pci_write_register (pcr,FPDCTL ,ALL_POWER_DOWN ,ALL_POWER_DOWN ); -} -static int rtsx_base_enable_auto_blink (struct rtsx_pcr *pcr) { return rtsx_pci_write_register(pcr, OLT_LED_CTL,
@@ -620,7 +605,6 @@ static const struct pcr_ops rts5260_pcr_ops = { .card_power_on = rts5260_card_power_on, .card_power_off = rts5260_card_power_off, .switch_output_voltage = rts5260_switch_output_voltage, - .force_power_down = rtsx_base_force_power_down, .stop_cmd = rts5260_stop_cmd, .set_l1off_cfg_sub_d0 = rts5260_set_l1off_cfg_sub_d0, .enable_ocp = rts5260_enable_ocp,
drivers/misc/cardreader/rtsx_pcr.c +16 -0
@@ -1096,6 +1096,20 @@ static void rtsx_pci_idle_work(struct work_struct *work)mutex_unlock (&pcr->pcr_mutex); } +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +{ +/* 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, pcr->reg_pm_ctrl3, +D3_DELINK_MODE_EN ,D3_DELINK_MODE_EN ); + +rtsx_pci_write_register (pcr,FPDCTL ,ALL_POWER_DOWN ,ALL_POWER_DOWN ); +} +static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 pm_state) {if (pcr->ops->turn_off_led)
@@ -1109,6 +1123,8 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)if (pcr->ops->force_power_down) pcr->ops->force_power_down (pcr, pm_state); +else +rtsx_base_force_power_down (pcr, pm_state); }void rtsx_pci_enable_ocp (struct rtsx_pcr *pcr)
Signature · 1 line
2.17.1
PATCH v4 2/2 misc: rtsx: Add power saving functions and fix driving parameter
From: Ricky Wu <[email protected]>
Add rts522a L1 sub-state support
Save more power on rts5227 rts5249 rts525a rts5260 Fix rts5260 driving parameter
Signed-off-by Ricky Wu <[email protected]>
--- drivers/misc/cardreader/rts5227.c | 112 +++++++++++++++++++++- drivers/misc/cardreader/rts5249.c | 145 ++++++++++++++++++++++++++++- drivers/misc/cardreader/rts5260.c | 28 +++--- drivers/misc/cardreader/rtsx_pcr.h | 17 ++++ 4 files changed, 283 insertions(+), 19 deletions(-)
drivers/misc/cardreader/rts5227.c +110 -2
@@ -72,15 +72,80 @@ static void rts5227_fetch_vendor_settings(struct rtsx_pcr *pcr)pci_read_config_dword (pdev,PCR_SETTING_REG2 , ®);pcr_dbg (pcr,"Cfg 0x%x: 0x%x\n" ,PCR_SETTING_REG2 , reg); +if (rtsx_check_mmc_support (reg)) + pcr->extra_caps |=EXTRA_CAPS_NO_MMC ; pcr->sd30_drive_sel_3v3 =rtsx_reg_to_sd30_drive_sel_3v3 (reg);if (rtsx_reg_check_reverse_socket (reg)) pcr->flags |=PCR_REVERSE_SOCKET ; } +static void rts5227_init_from_cfg (struct rtsx_pcr *pcr) +{ +struct pci_dev *pdev = pcr->pci; +int l1ss; +u32 lval; +struct rtsx_cr_option *option = &pcr->option; + + l1ss =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_L1SS ); +if (!l1ss) +return ; + +pci_read_config_dword (pdev, l1ss +PCI_L1SS_CTL1 , &lval); + +if (CHK_PCI_PID (pcr,0x522A )) { +if (0 == (lval &0x0F )) +rtsx_pci_enable_oobs_polling (pcr); +else +rtsx_pci_disable_oobs_polling (pcr); + } + +if (lval &PCI_L1SS_CTL1_ASPM_L1_1 ) +rtsx_set_dev_flag (pcr,ASPM_L1_1_EN ); +else +rtsx_clear_dev_flag (pcr,ASPM_L1_1_EN ); + +if (lval &PCI_L1SS_CTL1_ASPM_L1_2 ) +rtsx_set_dev_flag (pcr,ASPM_L1_2_EN ); +else +rtsx_clear_dev_flag (pcr,ASPM_L1_2_EN ); + +if (lval &PCI_L1SS_CTL1_PCIPM_L1_1 ) +rtsx_set_dev_flag (pcr,PM_L1_1_EN ); +else +rtsx_clear_dev_flag (pcr,PM_L1_1_EN ); + +if (lval &PCI_L1SS_CTL1_PCIPM_L1_2 ) +rtsx_set_dev_flag (pcr,PM_L1_2_EN ); +else +rtsx_clear_dev_flag (pcr,PM_L1_2_EN ); + +if (option->ltr_en) { +u16 val; + +pcie_capability_read_word (pcr->pci,PCI_EXP_DEVCTL2 , &val); +if (val &PCI_EXP_DEVCTL2_LTR_EN ) { + option->ltr_enabled = true; + option->ltr_active = true; +rtsx_set_ltr_latency (pcr, option->ltr_active_latency); + }else { + option->ltr_enabled = false; + } + } + +if (rtsx_check_dev_flag (pcr,ASPM_L1_1_EN |ASPM_L1_2_EN + |PM_L1_1_EN |PM_L1_2_EN )) + option->force_clkreq_0 = false; +else + option->force_clkreq_0 = true; + +} +static int rts5227_extra_init_hw (struct rtsx_pcr *pcr) {u16 cap; +struct rtsx_cr_option *option = &pcr->option; +rts5227_init_from_cfg (pcr);rtsx_pci_init_cmd (pcr);/* Configure GPIO as output */
@@ -102,9 +167,17 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)rts5227_fill_driving (pcr,OUTPUT_3V3 );/* Configure force_clock_req */ if (pcr->flags &PCR_REVERSE_SOCKET ) -rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PETXCFG ,0xB8 ,0xB8 ); +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PETXCFG ,0x30 ,0x30 );else -rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PETXCFG ,0xB8 ,0x88 ); +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PETXCFG ,0x30 ,0x00 ); + +if (option->force_clkreq_0) +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PETXCFG , +FORCE_CLKREQ_DELINK_MASK ,FORCE_CLKREQ_LOW ); +else +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD ,PETXCFG , +FORCE_CLKREQ_DELINK_MASK ,FORCE_CLKREQ_HIGH ); +rtsx_pci_add_cmd (pcr,WRITE_REG_CMD , pcr->reg_pm_ctrl3,0x10 ,0x00 );return rtsx_pci_send_cmd (pcr,100 );
@@ -359,6 +432,27 @@ static int rts522a_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)return rtsx_pci_send_cmd (pcr,100 ); } +static void rts522a_set_l1off_cfg_sub_d0 (struct rtsx_pcr *pcr,int active) +{ +struct rtsx_cr_option *option = &pcr->option; +int aspm_L1_1, aspm_L1_2; +u8 val =0 ; + + aspm_L1_1 =rtsx_check_dev_flag (pcr,ASPM_L1_1_EN ); + aspm_L1_2 =rtsx_check_dev_flag (pcr,ASPM_L1_2_EN ); + +if (active) { +/* run, latency: 60us */ +if (aspm_L1_1) + val = option->ltr_l1off_snooze_sspwrgate; + }else { +/* l1off, latency: 300us */ +if (aspm_L1_2) + val = option->ltr_l1off_sspwrgate; + } + +rtsx_set_l1off_sub (pcr, val); +}/* rts522a operations mainly derived from rts5227, except phy/hw init setting. */
@@ -375,15 +469,29 @@ static const struct pcr_ops rts522a_pcr_ops = { .switch_output_voltage = rts522a_switch_output_voltage, .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, + .set_l1off_cfg_sub_d0 = rts522a_set_l1off_cfg_sub_d0, };void rts522a_init_params (struct rtsx_pcr *pcr) { +struct rtsx_cr_option *option = &pcr->option; +rts5227_init_params (pcr); pcr->ops = &rts522a_pcr_ops; pcr->tx_initial_phase =SET_CLOCK_PHASE (20 ,20 ,11 ); pcr->reg_pm_ctrl3 =RTS522A_PM_CTRL3 ; + option->dev_flags =LTR_L1SS_PWR_GATE_EN ; + option->ltr_en = true; + +/* init latency of active, idle, L1OFF to 60us, 300us, 3ms */ + option->ltr_active_latency =LTR_ACTIVE_LATENCY_DEF ; + option->ltr_idle_latency =LTR_IDLE_LATENCY_DEF ; + option->ltr_l1off_latency =LTR_L1OFF_LATENCY_DEF ; + option->l1_snooze_delay =L1_SNOOZE_DELAY_DEF ; + option->ltr_l1off_sspwrgate =0x7F ; + option->ltr_l1off_snooze_sspwrgate =0x78 ; + pcr->option.ocp_en =1 ;if (pcr->option.ocp_en) pcr->hw_param.interrupt_en |=SD_OC_INT_EN ;
drivers/misc/cardreader/rts5249.c +142 -3
190 lines not on this page · raw message
drivers/misc/cardreader/rts5260.c +14 -14
@@ -26,21 +26,17 @@ static u8 rts5260_get_ic_version(struct rtsx_pcr *pcr)static void rts5260_fill_driving (struct rtsx_pcr *pcr,u8 voltage) { -u8 driving_3v3[6 ][3 ] = { - {0x94 ,0x94 ,0x94 }, - {0x11 ,0x11 ,0x18 }, - {0x55 ,0x55 ,0x5C }, - {0x94 ,0x94 ,0x94 }, - {0x94 ,0x94 ,0x94 }, - {0xFF ,0xFF ,0xFF }, +u8 driving_3v3[4 ][3 ] = { + {0x11 ,0x11 ,0x11 }, + {0x22 ,0x22 ,0x22 }, + {0x55 ,0x55 ,0x55 }, + {0x33 ,0x33 ,0x33 }, }; -u8 driving_1v8[6 ][3 ] = { - {0x9A ,0x89 ,0x89 }, - {0xC4 ,0xC4 ,0xC4 }, - {0x3C ,0x3C ,0x3C }, +u8 driving_1v8[4 ][3 ] = { + {0x35 ,0x33 ,0x33 }, + {0x8A ,0x88 ,0x88 }, + {0xBD ,0xBB ,0xBB }, {0x9B ,0x99 ,0x99 }, - {0x9A ,0x89 ,0x89 }, - {0xFE ,0xFE ,0xFE }, };u8 (*driving)[3 ], drive_sel;
@@ -58,7 +54,7 @@ static void rts5260_fill_driving(struct rtsx_pcr *pcr, u8 voltage)rtsx_pci_write_register (pcr,SD30_CMD_DRIVE_SEL ,0xFF , driving[drive_sel][1 ]); -rtsx_pci_write_register (pcr,SD30_CMD_DRIVE_SEL , +rtsx_pci_write_register (pcr,SD30_DAT_DRIVE_SEL ,0xFF , driving[drive_sel][2 ]); }
@@ -82,6 +78,8 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr)pci_read_config_dword (pdev,PCR_SETTING_REG2 , ®);pcr_dbg (pcr,"Cfg 0x%x: 0x%x\n" ,PCR_SETTING_REG2 , reg); +if (rtsx_check_mmc_support (reg)) + pcr->extra_caps |=EXTRA_CAPS_NO_MMC ; pcr->sd30_drive_sel_3v3 =rtsx_reg_to_sd30_drive_sel_3v3 (reg);if (rtsx_reg_check_reverse_socket (reg)) pcr->flags |=PCR_REVERSE_SOCKET ;
@@ -559,6 +557,8 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)rtsx_pci_write_register (pcr,PETXCFG ,FORCE_CLKREQ_DELINK_MASK ,FORCE_CLKREQ_HIGH ); +rtsx_pci_write_register (pcr, pcr->reg_pm_ctrl3,0x10 ,0x00 ); +return 0 ; }
drivers/misc/cardreader/rtsx_pcr.h +17 -0
@@ -18,7 +18,24 @@#define RTS522A_PM_CTRL3 0xFF7E#define RTS524A_PME_FORCE_CTL 0xFF78 +#define REG_EFUSE_BYPASS 0x08 +#define REG_EFUSE_POR 0x04 +#define REG_EFUSE_POWER_MASK 0x03 +#define REG_EFUSE_POWERON 0x03 +#define REG_EFUSE_POWEROFF 0x00 +#define RTS5250_CLK_CFG3 0xFF79 +#define RTS525A_CFG_MEM_PD 0xF0#define RTS524A_PM_CTRL3 0xFF7E +#define RTS525A_BIOS_CFG 0xFF2D +#define RTS525A_LOAD_BIOS_FLAG 0x01 +#define RTS525A_CLEAR_BIOS_FLAG 0x00 + +#define RTS525A_EFUSE_CTL 0xFC32 +#define REG_EFUSE_ENABLE 0x80 +#define REG_EFUSE_MODE 0x40 +#define RTS525A_EFUSE_ADD 0xFC33 +#define REG_EFUSE_ADD_MASK 0x3F +#define RTS525A_EFUSE_DATA 0xFC35#define LTR_ACTIVE_LATENCY_DEF 0x883C#define LTR_IDLE_LATENCY_DEF 0x892C
Signature · 1 line
2.17.1
Greg KH
maintainerQuoted 4 lines · On Fri, Sep 04, 2020 at 05:42:19PM +0800, [email protected] wrote:
From: Ricky Wu <[email protected]>
Fix and sort out rtsx driver power down flow
Quoted 8 lines
Signed-off-by Ricky Wu <[email protected]>--- drivers/misc/cardreader/rts5227.c | 15 --------------- drivers/misc/cardreader/rts5228.c | 5 ++--- drivers/misc/cardreader/rts5249.c | 17 ----------------- drivers/misc/cardreader/rts5260.c | 16 ---------------- drivers/misc/cardreader/rtsx_pcr.c | 16 ++++++++++++++++ 5 files changed, 18 insertions(+), 51 deletions(-)
What changed from the previous versions? That always needs to go below the --- line.
Please fix up and resend a v5.
thanks,
greg k-h