misc: rtsx: add power saving function and bios guide options
Subsystems (2)
PATCH 1/1 misc: rtsx: add power saving function and bios guide options
From: Ricky Wu <[email protected]>
Added rts5227 rts5249 rts5260 rts5228 power saving functions, added BIOS guide MMC funciton and U_d3_en register support and fixed rts5260 driving parameter
--- drivers/misc/cardreader/rts5227.c | 115 +++++++++++++++++++++- drivers/misc/cardreader/rts5228.c | 5 +- drivers/misc/cardreader/rts5249.c | 147 ++++++++++++++++++++++++++++- drivers/misc/cardreader/rts5260.c | 33 ++++--- drivers/misc/cardreader/rtsx_pcr.h | 18 ++++ 5 files changed, 289 insertions(+), 29 deletions(-)
drivers/misc/cardreader/rts5227.c +111 -4
@@ -72,6 +72,8 @@ 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 ;
@@ -84,16 +86,78 @@ static void rts5227_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)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, pcr->reg_pm_ctrl3,0x10 ,0x10 );rtsx_pci_write_register (pcr,FPDCTL ,0x03 ,0x03 ); } +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 */
@@ -115,9 +179,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 );
@@ -373,6 +445,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. */
@@ -390,15 +483,29 @@ static const struct pcr_ops rts522a_pcr_ops = { .cd_deglitch = NULL, .conv_clk_and_div_n = NULL, .force_power_down = rts5227_force_power_down, + .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/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 +142 -5
198 lines not on this page · raw message
drivers/misc/cardreader/rts5260.c +16 -17
@@ -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 ;
@@ -95,9 +93,8 @@ static void rtsx_base_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 ,ALL_POWER_DOWN ,ALL_POWER_DOWN ); }
@@ -574,6 +571,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 +18 -0
@@ -18,7 +18,25 @@#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
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on char-misc/char-misc-testing]
[also build test WARNING on soc/for-next linus/master v5.9-rc3 next-20200828] [cannot apply to linux/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/ricky_wu-realtek-com/misc-rtsx-add-power-saving-function-and-bios-guide-options/20200901-103534 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git dd5597245d35cfbb0890b8a868028aa1d2018701 config: ia64-randconfig-r005-20200831 (attached as .config) compiler: ia64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=ia64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from arch/ia64/include/asm/pgtable.h:154,
from include/linux/pgtable.h:6,
from arch/ia64/include/asm/uaccess.h:40,
from include/linux/uaccess.h:9,
from arch/ia64/include/asm/sections.h:11,
from include/linux/interrupt.h:20,
from include/linux/pci.h:38,
from include/linux/rtsx_pci.h:14,
from drivers/misc/cardreader/rts5249.c:12:
arch/ia64/include/asm/mmu_context.h: In function 'reload_context':
arch/ia64/include/asm/mmu_context.h:137:41: warning: variable 'old_rr4' set but not used [-Wunused-but-set-variable]
137 | unsigned long rr0, rr1, rr2, rr3, rr4, old_rr4;
| ^~~~~~~
drivers/misc/cardreader/rts5249.c: In function 'rts52xa_save_content_from_efuse':
>> drivers/misc/cardreader/rts5249.c:157:14: warning: variable 'cv' set but not used [-Wunused-but-set-variable]
157 | u8 cnt, sv, cv;
| ^~# https://github.com/0day-ci/linux/commit/7f37b141bf20205913d0efbf1bca25e323489b6b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review ricky_wu-realtek-com/misc-rtsx-add-power-saving-function-and-bios-guide-options/20200901-103534 git checkout 7f37b141bf20205913d0efbf1bca25e323489b6b
vim +/cv +157 drivers/misc/cardreader/rts5249.c
154
155 static void rts52xa_save_content_from_efuse(struct rtsx_pcr *pcr)
156 {
> 157 u8 cnt, sv, cv;
158 u8 j = 0;
159 u8 tmp;
160 u8 val;
161 int i;
162
163 rtsx_pci_write_register(pcr, RTS524A_PME_FORCE_CTL,
164 REG_EFUSE_BYPASS | REG_EFUSE_POR, REG_EFUSE_POR);
165 udelay(1);
166
167 pcr_dbg(pcr, "Enable efuse por!");
168 pcr_dbg(pcr, "save efuse to autoload");
169
170 rtsx_pci_write_register(pcr, RTS525A_EFUSE_ADD, REG_EFUSE_ADD_MASK, 0x00);
171 rtsx_pci_write_register(pcr, RTS525A_EFUSE_CTL,
172 REG_EFUSE_ENABLE | REG_EFUSE_MODE, REG_EFUSE_ENABLE);
173 /* Wait transfer end */
174 for (j = 0; j < 1024; j++) {
175 rtsx_pci_read_register(pcr, RTS525A_EFUSE_CTL, &tmp);
176 if ((tmp & 0x80) == 0)
177 break;
178 }
179 rtsx_pci_read_register(pcr, RTS525A_EFUSE_DATA, &val);
180 cnt = val & 0x0F;
181 sv = val & 0x10;
182 cv = val & 0x20;
183
184 if (sv) {
185 for (i = 0; i < 4; i++) {
186 rtsx_pci_write_register(pcr, RTS525A_EFUSE_ADD,
187 REG_EFUSE_ADD_MASK, 0x04 + i);
188 rtsx_pci_write_register(pcr, RTS525A_EFUSE_CTL,
189 REG_EFUSE_ENABLE | REG_EFUSE_MODE, REG_EFUSE_ENABLE);
190 /* Wait transfer end */
191 for (j = 0; j < 1024; j++) {
192 rtsx_pci_read_register(pcr, RTS525A_EFUSE_CTL, &tmp);
193 if ((tmp & 0x80) == 0)
194 break;
195 }
196 rtsx_pci_read_register(pcr, RTS525A_EFUSE_DATA, &val);
197 rtsx_pci_write_register(pcr, 0xFF04 + i, 0xFF, val);
198 }
199 } else {
200 rtsx_pci_write_register(pcr, 0xFF04, 0xFF, (u8)PCI_VID(pcr));
201 rtsx_pci_write_register(pcr, 0xFF05, 0xFF, (u8)(PCI_VID(pcr) >> 8));
202 rtsx_pci_write_register(pcr, 0xFF06, 0xFF, (u8)PCI_PID(pcr));
203 rtsx_pci_write_register(pcr, 0xFF07, 0xFF, (u8)(PCI_PID(pcr) >> 8));
204 }
205
206 for (i = 0; i < cnt * 4; i++) {
207 if (sv)
208 rtsx_pci_write_register(pcr, RTS525A_EFUSE_ADD,
209 REG_EFUSE_ADD_MASK, 0x08 + i);
210 else
211 rtsx_pci_write_register(pcr, RTS525A_EFUSE_ADD,
212 REG_EFUSE_ADD_MASK, 0x04 + i);
213 rtsx_pci_write_register(pcr, RTS525A_EFUSE_CTL,
214 REG_EFUSE_ENABLE | REG_EFUSE_MODE, REG_EFUSE_ENABLE);
215 /* Wait transfer end */
216 for (j = 0; j < 1024; j++) {
217 rtsx_pci_read_register(pcr, RTS525A_EFUSE_CTL, &tmp);
218 if ((tmp & 0x80) == 0)
219 break;
220 }
221 rtsx_pci_read_register(pcr, RTS525A_EFUSE_DATA, &val);
222 rtsx_pci_write_register(pcr, 0xFF08 + i, 0xFF, val);
223 }
224 rtsx_pci_write_register(pcr, 0xFF00, 0xFF, (cnt & 0x7F) | 0x80);
225 rtsx_pci_write_register(pcr, RTS524A_PME_FORCE_CTL,
226 REG_EFUSE_BYPASS | REG_EFUSE_POR, REG_EFUSE_BYPASS);
227 pcr_dbg(pcr, "Disable efuse por!");
228 }
229
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]