misc: rtsx: Fix power down flow
Subsystems (2)
PATCH v5 1/2 misc: rtsx: Fix power down flow
From: Ricky Wu <[email protected]>
Fix and sort out rtsx driver power down flow
--- 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
Quoted 3 lines · On Mon, Sep 07, 2020 at 06:07:18PM +0800, [email protected] wrote:
From: Ricky Wu <[email protected]>
Fix and sort out rtsx driver power down flow
It would be nice to say what's changing here, but it's a great improvement to have this split out.
For example, this drops the "pm_state == HOST_ENTER_S3" check, but there's no explanation.
Minor comments below.
Quoted 153 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(-)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 +0
-0
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct *work) · line 1103
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c +5
-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 );
Personally, I don't think MASK_8_BIT_DEF is an improvement over 0xFF.
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct *work) · line 1110
Quoted 7 lines
drivers/misc/cardreader/rtsx_pcr.c +7
-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 );
This changes the value written from 0x3 to 0x7 (ALL_POWER_DOWN) in a couple cases. I guess you know that's OK.
Quoted 17 lines
drivers/misc/cardreader/rtsx_pcr.c +4
-0+} +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
Quoted 15 lines
-----Original Message-----
From: Bjorn Helgaas [mailto:[email protected]]
Sent: Wednesday, September 09, 2020 6:20 AM
To: 吳昊澄 Ricky
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v5 1/2] misc: rtsx: Fix power down flowQuoted 3 lines · On Mon, Sep 07, 2020 at 06:07:18PM +0800, [email protected] wrote:
From: Ricky Wu <[email protected]>
Fix and sort out rtsx driver power down flow
Quoted 8 lines
It would be nice to say what's changing here, but it's a great improvement to have this split out.
For example, this drops the "
pm_state==HOST_ENTER_S3" check, but there's no explanation.Minor comments below.
Drop out "pm_state == HOST_ENTER_S3"
Because in shutdown flow we also need to clean this register But pm_state we may use in the future like D3...
Quoted 188 lines
Review
Quoted 10 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(-)(quoted diff) +0
-0
b/drivers/misc/cardreader/rts5227.cdrivers/misc/cardreader/rts5227.c static void rts5227_fetch_vendor_settings(struct
Quoted 4 lines
index
f5f392ddf3d6..747391e3fb5d100644drivers/misc/cardreader/rts5227.c +0
-0@@ -77,19 +77,6 @@ static void rts5227_fetch_vendor_settings(struct
rtsx_pcr*pcr)Review
Quoted 36 lines
drivers/misc/cardreader/rts5227.c +0
-15pcr->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)(quoted diff) +0
-0
b/drivers/misc/cardreader/rts5228.cdrivers/misc/cardreader/rts5228.c static void rts5228_force_power_down(struct rtsx_pcr
Quoted 4 lines
index
28feab1449ab..781a86def59a100644drivers/misc/cardreader/rts5228.c +0
-0@@ -99,9 +99,8 @@ static void rts5228_force_power_down(struct rtsx_pcr*pcr, u8
pm_state)Review
Quoted 12 lines
drivers/misc/cardreader/rts5228.c +2
-3rtsx_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 );(quoted diff) +0
-0
b/drivers/misc/cardreader/rts5249.cdrivers/misc/cardreader/rts5249.c static void rtsx_base_fetch_vendor_settings(struct
Quoted 4 lines
index
941b3d77f1e9..719aa2d61919100644drivers/misc/cardreader/rts5249.c +0
-0@@ -78,20 +78,6 @@ static void rtsx_base_fetch_vendor_settings(struct
rtsx_pcr*pcr)Review
Quoted 45 lines
drivers/misc/cardreader/rts5249.c +0
-17pcr->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, };(quoted diff) +0
-0
b/drivers/misc/cardreader/rts5260.cdrivers/misc/cardreader/rts5260.c static void rtsx_base_fetch_vendor_settings(struct
Quoted 4 lines
index
b9f66b1384a6..897cfee350e7100644drivers/misc/cardreader/rts5260.c +0
-0@@ -87,21 +87,6 @@ static void rtsx_base_fetch_vendor_settings(struct
rtsx_pcr*pcr)drivers/misc/cardreader/rts5260.c static void rtsx_base_fetch_vendor_settings(struct · line 93
Quoted 7 lines
drivers/misc/cardreader/rts5260.c +0
-4pcr->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);
drivers/misc/cardreader/rts5260.c static void rtsx_base_fetch_vendor_settings(struct · line 94
Quoted 1 line
drivers/misc/cardreader/rts5260.c +0
-1- rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 2, MASK_8_BIT_DEF,0);
drivers/misc/cardreader/rts5260.c static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr)
Quoted 8 lines
drivers/misc/cardreader/rts5260.c +0
-8-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);Review
Quoted 14 lines
drivers/misc/cardreader/rts5260.c +0
-3-} -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,(quoted diff) +0
-0
b/drivers/misc/cardreader/rtsx_pcr.cdrivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct
Quoted 4 lines
index
37ccc67f4914..3f84b898bd9c100644drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1096,6 +1096,20 @@ static void rtsx_pci_idle_work(struct work_struct*work)
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct *work)
Quoted 7 lines
drivers/misc/cardreader/rtsx_pcr.c +4
-0mutex_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);
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct · line 1103
Quoted 1 line
drivers/misc/cardreader/rtsx_pcr.c +1
-0+ rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 2, MASK_8_BIT_DEF,0);
Personally, I don't think
MASK_8_BIT_DEFis an improvement over0xFF.drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct *work)
Quoted 7 lines
drivers/misc/cardreader/rtsx_pcr.c +7
-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);
Quoted 3 lines
This changes the value written from
0x3to0x7(ALL_POWER_DOWN) in a couple cases. I guess you know that's OK.
Yes, so I left rts5228_force_power_down for call back
Quoted 21 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_idle_work(struct work_struct *work)
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +2
-0+} + static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8
pm_state)drivers/misc/cardreader/rtsx_pcr.c static void __maybe_unused
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0{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)Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +2
-1if (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) --2.17.1
------Please consider the environment before printing this e-mail.