mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
Subsystems (2)
PATCH 1/4 mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver, rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.
So use those helpers at right places to properly manage runtime PM.
--- drivers/mmc/host/rtsx_pci_sdmmc.c | 44 +++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 11 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +33 -11
@@ -806,6 +806,7 @@ static void sd_request(struct work_struct *work)struct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; +struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;
@@ -822,6 +823,7 @@ static void sd_request(struct work_struct *work) }mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -858,6 +860,8 @@ static void sd_request(struct work_struct *work) data->bytes_xfered = data->blocks * data->blksz; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:
@@ -1080,6 +1084,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;if (host->eject)return ;
@@ -1088,6 +1093,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)return ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1121,6 +1127,8 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)rtsx_pci_switch_clock (pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); }
@@ -1128,6 +1136,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;
@@ -1135,6 +1144,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc)return -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1144,6 +1154,8 @@ static int sdmmc_get_ro(struct mmc_host *mmc)if (val &SD_WRITE_PROTECT ) ro =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;
@@ -1153,6 +1165,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;
@@ -1160,6 +1173,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc)return cd;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1169,6 +1183,8 @@ static int sdmmc_get_cd(struct mmc_host *mmc)if (val &SD_EXIST ) cd =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;
@@ -1251,6 +1267,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;
@@ -1265,6 +1282,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1294,6 +1312,8 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1303,6 +1323,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)
@@ -1313,6 +1334,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1345,6 +1367,8 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1495,12 +1519,12 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)realtek_init_host (host); -if (pcr->rtd3_en) { -pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); -pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev); - } - +pm_runtime_no_callbacks (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_use_autosuspend (&pdev->dev);mmc_add_host (mmc);
@@ -1521,11 +1545,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) pcr->slots[RTSX_SD_CARD ].card_event =NULL ; mmc = host->mmc; -if (pcr->rtd3_en) { -pm_runtime_dont_use_autosuspend (&pdev->dev); -pm_runtime_disable (&pdev->dev); - } -cancel_work_sync (&host->work);mutex_lock (&host->host_mutex);
@@ -1548,6 +1567,9 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)flush_work (&host->work); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc); dev_dbg(&(pdev->dev),
Signature · 1 line
2.33.1
PATCH 2/4 misc: rtsx: Rework runtime power management flow
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
When its child device, rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
So consolidate "idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
--- drivers/misc/cardreader/rtsx_pcr.c | 123 +++++++++++------------------ include/linux/rtsx_pci.h | 1 - 2 files changed, 44 insertions(+), 80 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +44 -79
@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);
@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work,msecs_to_jiffies (10000 )); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) {/* Set relink_time to 0 */
@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {
@@ -1623,20 +1580,16 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +if (pcr->rtd3_en) { +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev); + }return 0 ;
@@ -1668,10 +1621,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +if (pcr->rtd3_en) { +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); + }/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);
@@ -1680,9 +1634,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);
@@ -1700,11 +1651,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);
@@ -1726,7 +1672,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);
@@ -1760,8 +1705,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;
@@ -1786,6 +1729,32 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) +{ +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device);
@@ -1794,31 +1763,29 @@ static int rtsx_pci_runtime_suspend(struct device *device) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +if (!pcr->rtd3_en) +return -EBUSY ; + +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);
@@ -1834,8 +1801,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1850,7 +1815,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume) -SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume,NULL ) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, rtsx_pci_runtime_idle) };static struct pci_driver rtsx_pci_driver = {
include/linux/rtsx_pci.h +0 -1
@@ -1212,7 +1212,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1)
Signature · 1 line
2.33.1
PATCH v2 2/4 misc: rtsx: Rework runtime power management flow
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
When its child device, rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
So consolidate "idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
---
v2:
- Remove unused idle_work and rtd3_work from rtsx_pcr.
drivers/misc/cardreader/rtsx_pcr.c | 123 +++++++++++------------------ include/linux/rtsx_pci.h | 3 - 2 files changed, 44 insertions(+), 82 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +44 -79
@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);
@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work,msecs_to_jiffies (10000 )); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) {/* Set relink_time to 0 */
@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {
@@ -1623,20 +1580,16 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +if (pcr->rtd3_en) { +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev); + }return 0 ;
@@ -1668,10 +1621,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +if (pcr->rtd3_en) { +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); + }/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);
@@ -1680,9 +1634,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);
@@ -1700,11 +1651,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);
@@ -1726,7 +1672,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);
@@ -1760,8 +1705,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;
@@ -1786,6 +1729,32 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) +{ +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device);
@@ -1794,31 +1763,29 @@ static int rtsx_pci_runtime_suspend(struct device *device) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +if (!pcr->rtd3_en) +return -EBUSY ; + +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);
@@ -1834,8 +1801,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1850,7 +1815,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume) -SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume,NULL ) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, rtsx_pci_runtime_idle) };static struct pci_driver rtsx_pci_driver = {
include/linux/rtsx_pci.h +0 -3
@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;
@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1)
Signature · 1 line
2.33.1
RE: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flow
Quoted 10 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 9:41 AM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flow
Quoted 9 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
This idle_work is not runtime_idle, this is for aspm setting Not only for support RPM, so this idle_work can not be remove....
Our original Idle_work is a power saveing function, It is a delay_work for 200 msec , If no work comes in 200 msec than go to idle_work to set power saveing setting.....
Quoted 286 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 123 +++++++++++------------------ include/linux/rtsx_pci.h | 3 - 2 files changed, 44 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-40@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work, msecs_to_jiffies(10000)); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state){
drivers/misc/cardreader/rtsx_pcr.c +8
-12/* Set relink_time to 0 */ @@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,16 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +if (pcr->rtd3_en) { +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev); + }return 0 ;@@ -1668,10 +1621,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +if (pcr->rtd3_en) { +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); + }/* Disable interrupts at the pcr level */ drivers/misc/cardreader/rtsx_pcr.c +0
-8spin_lock_irq (&pcr->lock);@@ -1680,9 +1634,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1651,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);drivers/misc/cardreader/rtsx_pcr.c +0
-3kfree (handle);@@ -1726,7 +1672,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1705,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);drivers/misc/cardreader/rtsx_pcr.c +25
-0return ret;@@ -1786,6 +1729,32 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1763,29 @@static int
rtsx_pci_runtime_suspend(struct device *device)drivers/misc/cardreader/rtsx_pcr.c +9
-13handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +if (!pcr->rtd3_en) +return -EBUSY ; + +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1801,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ;}
drivers/misc/cardreader/rtsx_pcr.c +2
-1@@ -1850,7 +1815,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (rtsx_pci_suspend, rtsx_pci_resume) - SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, NULL) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, +rtsx_pci_runtime_idle) }; static struct pci_driver rtsx_pci_driver = { diff --git a/include/linux/rtsx_pci.h
b/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-4@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
Re: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flow
Quoted 17 lines · Ricky WU
Quoted 17 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 9:41 AM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flowCommit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
Quoted 6 lines
Quoted 3 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.This
idle_workis notruntime_idle, this is for aspm setting Not only for support RPM, so thisidle_workcan not be remove....
rtsx_pm_power_saving() is called inside rtsx_pci_runtime_idle(), when the usage refcount becomes zero, before runtime suspend routine.
Quoted 3 lines
Our original
Idle_workis a power saveing function, It is adelay_workfor 200 msec , If no work comes in 200 msec than go toidle_workto set power saveing setting.....
Have you tested it locally? rtsx_pci_runtime_idle() really does the same thing.
Kai-Heng
Quoted 288 lines
Quoted 287 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 123 +++++++++++------------------ include/linux/rtsx_pci.h | 3 - 2 files changed, 44 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-40@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work, msecs_to_jiffies(10000)); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state){ /* Set relink_time to 0 */drivers/misc/cardreader/rtsx_pcr.c +8
-12@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,16 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +if (pcr->rtd3_en) { +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev); + }return 0 ;@@ -1668,10 +1621,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +if (pcr->rtd3_en) { +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); + }/* Disable interrupts at the pcr level */ spin_lock_irq(&pcr->lock);drivers/misc/cardreader/rtsx_pcr.c +0
-8@@ -1680,9 +1634,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1651,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree(handle);drivers/misc/cardreader/rtsx_pcr.c +0
-3@@ -1726,7 +1672,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1705,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +25
-0@@ -1786,6 +1729,32 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1763,29 @@static int
rtsx_pci_runtime_suspend(struct device *device)handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +9
-13-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +if (!pcr->rtd3_en) +return -EBUSY ; + +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1801,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ;}
drivers/misc/cardreader/rtsx_pcr.c +2
-1@@ -1850,7 +1815,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (rtsx_pci_suspend, rtsx_pci_resume) - SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, NULL) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, +rtsx_pci_runtime_idle) }; static struct pci_driver rtsx_pci_driver = { diff --git a/include/linux/rtsx_pci.h
b/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-4@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
RE: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flow
Quoted 44 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 12:08 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flowQuoted 13 lines · Ricky WU
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 9:41 AM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flowQuoted 2 lines
Quoted 2 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM statemachine.
Quoted 3 lines
Quoted 3 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PMhelpers.
Quoted 7 lines
Quoted 4 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.This
idle_workis notruntime_idle, this is for aspm setting Not only for support RPM, so thisidle_workcan not be remove....
rtsx_pm_power_saving()is called insidertsx_pci_runtime_idle(), when the usage refcount becomes zero, before runtime suspend routine.Quoted 1 line
Quoted 6 lines
Quoted 2 lines
Our original
Idle_workis a power saveing function, It is adelay_workfor 200 msec , If no work comes in 200 msec than go toidle_workto setpower saveing setting.....
Have you tested it locally?
rtsx_pci_runtime_idle()really does the same thing.
We are testing...
RTD3 is not available on all platforms....
We use a values (rtd3_en) to judge rtd3 enable or not
Aspm is for all platform but RTD3 is not
Quoted 299 lines
Quoted 22 lines
Quoted 22 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 123 +++++++++++------------------ include/linux/rtsx_pci.h | 3 - 2 files changed, 44 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ;Quoted 14 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4-if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false;drivers/misc/cardreader/rtsx_pcr.c void rtsx_pci_start_run(struct rtsx_pcr *pcr)
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4- } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - - mod_delayed_work(system_wq, &pcr->idle_work,
msecs_to_jiffies(200));Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c
Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0}EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct
rtsx_pcr
*pcr)rtsx_comm_pm_power_saving(pcr); }drivers/misc/cardreader/rtsx_pcr.c +0
-3-static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
rtd3_work);Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)
Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-9- -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
idle_work);Quoted 30 lines
Quoted 30 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-18- -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) - mod_delayed_work(system_wq, &pcr->rtd3_work,
msecs_to_jiffies(10000));drivers/misc/cardreader/rtsx_pcr.c +0
-2-} - static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8pm_state) { /* Set relink_time to 0 */drivers/misc/cardreader/rtsx_pcr.c +0
-1@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work);Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,16 @@ static int rtsx_pci_probe(struct pci_dev*pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-2rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { - INIT_DELAYED_WORK(&pcr->rtd3_work,
rtsx_pci_rtd3_work);Quoted 33 lines
Quoted 33 lines
drivers/misc/cardreader/rtsx_pcr.c +8
-9-pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +if (pcr->rtd3_en) { +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev); + }return 0 ;@@ -1668,10 +1621,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +if (pcr->rtd3_en) { +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); + }Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_remove(struct pci_dev
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0/* Disable interrupts at the pcr level */ spin_lock_irq(&pcr->lock);drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1680,9 +1634,6 @@ static void rtsx_pci_remove(struct pci_dev*pcidev)
Quoted 157 lines
Quoted 157 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-8spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1651,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree(handle);drivers/misc/cardreader/rtsx_pcr.c +0
-3@@ -1726,7 +1672,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1705,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d) if (ret) goto out; - schedule_delayed_work(&pcr->idle_work, msecs_to_jiffies(200)); - out: mutex_unlock(&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +26
-0@@ -1786,6 +1729,32 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1763,29 @@ static int rtsx_pci_runtime_suspend(struct device *device)handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +9
-11-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +if (!pcr->rtd3_en) +return -EBUSY ; + +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1801,6 @@ static int rtsx_pci_runtime_resume(structdevice
*device)pcr->slots[RTSX_SD_CARD].p_dev); }drivers/misc/cardreader/rtsx_pcr.c +0
-2-schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1850,7 +1815,7 @@ static int rtsx_pci_runtime_resume(structdevice
*device)static const struct
dev_pm_opsrtsx_pci_pm_ops= {
SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume)
- SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume,
+rtsx_pci_runtime_idle)
};static struct
pci_driverrtsx_pci_driver= { diff --gita/include/linux/rtsx_pci.hb/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-3@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;Quoted 5 lines
Quoted 4 lines
include/linux/rtsx_pci.h +0
-1#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
------Please consider the environment before printing this e-mail.
Re: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flow
Quoted 49 lines · Ricky WU
Quoted 49 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 12:08 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flowQuoted 13 lines · Ricky WU
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 9:41 AM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v2 2/4] misc: rtsx: Rework runtime power management flowQuoted 2 lines
Quoted 2 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM statemachine.
Quoted 3 lines
Quoted 3 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PMhelpers.
Quoted 7 lines
Quoted 4 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.This
idle_workis notruntime_idle, this is for aspm setting Not only for support RPM, so thisidle_workcan not be remove....
rtsx_pm_power_saving()is called insidertsx_pci_runtime_idle(), when the usage refcount becomes zero, before runtime suspend routine.Quoted 3 lines
Our original
Idle_workis a power saveing function, It is adelay_workfor 200 msec , If no work comes in 200 msec than go toidle_workto setpower saveing setting.....
Quoted 8 lines
Quoted 2 lines
Have you tested it locally?
rtsx_pci_runtime_idle()really does the same thing.We are testing...
RTD3 is not available on all platforms....
We use a values (rtd3_en) to judge rtd3 enable or notAspm is for all platform but RTD3 is not
Thanks! I get it now.
Let me send v3 to address the issue.
Kai-Heng
Quoted 300 lines
Quoted 300 lines
Quoted 23 lines
Quoted 23 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 123 +++++++++++------------------ include/linux/rtsx_pci.h | 3 - 2 files changed, 44 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ;Quoted 14 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4-if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false;drivers/misc/cardreader/rtsx_pcr.c void rtsx_pci_start_run(struct rtsx_pcr *pcr)
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4- } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - - mod_delayed_work(system_wq, &pcr->idle_work,
msecs_to_jiffies(200));Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c
Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0}EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct
rtsx_pcr
*pcr)rtsx_comm_pm_power_saving(pcr); }drivers/misc/cardreader/rtsx_pcr.c +0
-3-static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
rtd3_work);Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)
Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-9- -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
idle_work);Quoted 30 lines
Quoted 30 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-18- -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) - mod_delayed_work(system_wq, &pcr->rtd3_work,
msecs_to_jiffies(10000));drivers/misc/cardreader/rtsx_pcr.c +0
-2-} - static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8pm_state) { /* Set relink_time to 0 */drivers/misc/cardreader/rtsx_pcr.c +0
-1@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work);Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,16 @@ static int rtsx_pci_probe(struct pci_dev*pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-2rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { - INIT_DELAYED_WORK(&pcr->rtd3_work,
rtsx_pci_rtd3_work);Quoted 33 lines
Quoted 33 lines
drivers/misc/cardreader/rtsx_pcr.c +8
-9-pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +if (pcr->rtd3_en) { +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev); + }return 0 ;@@ -1668,10 +1621,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +if (pcr->rtd3_en) { +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); + }Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pci_remove(struct pci_dev
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0/* Disable interrupts at the pcr level */ spin_lock_irq(&pcr->lock);drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1680,9 +1634,6 @@ static void rtsx_pci_remove(struct pci_dev*pcidev)
Quoted 157 lines
Quoted 157 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-8spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1651,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree(handle);drivers/misc/cardreader/rtsx_pcr.c +0
-3@@ -1726,7 +1672,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1705,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d) if (ret) goto out; - schedule_delayed_work(&pcr->idle_work, msecs_to_jiffies(200)); - out: mutex_unlock(&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +26
-0@@ -1786,6 +1729,32 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1763,29 @@ static int rtsx_pci_runtime_suspend(struct device *device)handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +9
-11-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +if (!pcr->rtd3_en) +return -EBUSY ; + +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1801,6 @@ static int rtsx_pci_runtime_resume(structdevice
*device)pcr->slots[RTSX_SD_CARD].p_dev); }drivers/misc/cardreader/rtsx_pcr.c +0
-2-schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1850,7 +1815,7 @@ static int rtsx_pci_runtime_resume(structdevice
*device)static const struct
dev_pm_opsrtsx_pci_pm_ops= {
SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume)
- SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume,
+rtsx_pci_runtime_idle)
};static struct
pci_driverrtsx_pci_driver= { diff --gita/include/linux/rtsx_pci.hb/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-3@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;Quoted 5 lines
Quoted 4 lines
include/linux/rtsx_pci.h +0
-1#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
------Please consider the environment before printing this e-mail.
PATCH v3 2/4 misc: rtsx: Rework runtime power management flow
In reply to Kai-Heng FengCommit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
When its child device, rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
So consolidate "idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
---
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices with rtd3_en flagged.
v2:
- Remove unused idle_work and rtd3_work from rtsx_pcr.
drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +39 -79
@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);
@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work,msecs_to_jiffies (10000 )); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) {/* Set relink_time to 0 */
@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {
@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;
@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel (pcr,RTSX_BIER ,0 );
@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);
@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);
@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);
@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;
@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) +{ +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device);
@@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device *device) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);
@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume) -SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume,NULL ) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, rtsx_pci_runtime_idle) };static struct pci_driver rtsx_pci_driver = {
include/linux/rtsx_pci.h +0 -3
@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;
@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1)
Signature · 1 line
2.33.1
RE: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 10 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 2:32 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 8 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
Original idle_work is for aspm delay time is 200 msec, because Aspm can quick in and out to save more power Now this patch need to wait 5 sec because set autosuspend time set to 5 sec in sdmmc,... this time need to set to 200 msec.
But it will get another question, the question is the host(sdmmc) caps has set MMC_CAP_AGGRESSIVE_PM when rtd3_en is set, It will make card power off when sdmmc go to suspend, 200 msec will cause card power off and on frequently
Need to remove this flag in caps, and then change card power off to rtsx_pci_runtime_suspend()....
What do you think?
Ricky
Quoted 287 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices withrtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-40@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work, msecs_to_jiffies(10000)); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state){
drivers/misc/cardreader/rtsx_pcr.c +5
-12/* Set relink_time to 0 */ @@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);drivers/misc/cardreader/rtsx_pcr.c +0
-8rtsx_pci_writel (pcr,RTSX_BIER ,0 );@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);drivers/misc/cardreader/rtsx_pcr.c +0
-3kfree (handle);@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);drivers/misc/cardreader/rtsx_pcr.c +26
-0return ret;@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@static int
rtsx_pci_runtime_suspend(struct device *device)drivers/misc/cardreader/rtsx_pcr.c +6
-13handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ;}
drivers/misc/cardreader/rtsx_pcr.c +2
-1@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (rtsx_pci_suspend, rtsx_pci_resume) - SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, NULL) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, +rtsx_pci_runtime_idle) }; static struct pci_driver rtsx_pci_driver = { diff --git a/include/linux/rtsx_pci.h
b/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-4@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 17 lines · Ricky WU
Quoted 17 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 2:32 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowCommit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
Quoted 6 lines
Quoted 2 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.Original
idle_workis for aspm delay time is 200 msec, because Aspm can quick in and out to save more power Now this patch need to wait 5 sec because set autosuspend time set to 5 sec in sdmmc,... this time need to set to 200 msec.
OK, will change it to 200ms.
Quoted 5 lines
But it will get another question, the question is the host(sdmmc) caps has set
MMC_CAP_AGGRESSIVE_PMwhenrtd3_enis set, It will make card power off when sdmmc go to suspend, 200 msec will cause card power off and on frequentlyNeed to remove this flag in caps, and then change card power off to
rtsx_pci_runtime_suspend()....
You are right, since rtsx_pci_sdmmc behaves like a virtual device of rtsx_pci, so we should let the latter handle all the PM work. Will drop MMC_CAP_AGGRESSIVE_PM in next iteration.
Quoted 2 lines
What do you think?
Thanks for your testing and review.
One question though, regarding to the memstick virtual driver. The memstick support was silently dropped by "misc: rtsx: Add support for RTS5261", as RTSX_MS_CARD was removed from MFD cells.
Is there any memstick device in the wild? If there is, we should add it back to the MFD cells to avoid regression.
And I guess starting from rts5261, only MMC is supported?
Kai-Heng
Quoted 291 lines
Ricky
Quoted 287 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices withrtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-40@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work, msecs_to_jiffies(10000)); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state){ /* Set relink_time to 0 */drivers/misc/cardreader/rtsx_pcr.c +5
-12@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel(pcr, RTSX_BIER, 0);drivers/misc/cardreader/rtsx_pcr.c +0
-8@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree(handle);drivers/misc/cardreader/rtsx_pcr.c +0
-3@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +26
-0@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@static int
rtsx_pci_runtime_suspend(struct device *device)handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +6
-13-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ;}
drivers/misc/cardreader/rtsx_pcr.c +2
-1@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (rtsx_pci_suspend, rtsx_pci_resume) - SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, NULL) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, +rtsx_pci_runtime_idle) }; static struct pci_driver rtsx_pci_driver = { diff --git a/include/linux/rtsx_pci.h
b/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-4@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
RE: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 50 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 8:39 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 13 lines · Ricky WU
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 2:32 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 2 lines
Quoted 2 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM statemachine.
Quoted 3 lines
Quoted 3 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PMhelpers.
Quoted 7 lines
Quoted 3 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.Original
idle_workis for aspm delay time is 200 msec, because Aspm can quick in and out to save more power Now this patch need to wait 5 secbecause set autosuspend time set to 5 sec in sdmmc,... this time need to set to 200 msec.
OK, will change it to 200ms.
Quoted 6 lines
But it will get another question, the question is the host(sdmmc) caps has set
MMC_CAP_AGGRESSIVE_PMwhenrtd3_enis set, It will make card power off when sdmmc go to suspend, 200 msec will cause card power off and on frequently
Quoted 7 lines
Quoted 1 line
Need to remove this flag in caps, and then change card power off to
rtsx_pci_runtime_suspend()....You are right, since
rtsx_pci_sdmmcbehaves like a virtual device ofrtsx_pci, so we should let the latter handle all the PM work.
Will dropMMC_CAP_AGGRESSIVE_PMin next iteration.
We found another problem when we removed MMC_CAP_AGGRESSIVE_PM We call rtsx_sd_power_off_card3v3 in rtsx_pci_runtime_suspend, we found mmc core doesn't call from CMD 0 when resume back
Quoted 5 lines
Quoted 2 lines
What do you think?
Thanks for your testing and review.
Quoted 8 lines
One question though, regarding to the memstick virtual driver. The memstick support was silently dropped by "misc: rtsx: Add support for RTS5261", as
RTSX_MS_CARDwas removed from MFD cells.Is there any memstick device in the wild? If there is, we should add it back to the MFD cells to avoid regression.
And I guess starting from rts5261, only MMC is supported?
Yes, from rts5261 only support SD...
But we removed MS main result is...
1. Memstick card was disappeared about 10 year
2. Our guest do not use combo socket, only use SD card socket so we removed MS event
Ricky
Quoted 299 lines
Quoted 27 lines
Quoted 27 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices withrtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ;Quoted 14 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4-if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false;drivers/misc/cardreader/rtsx_pcr.c void rtsx_pci_start_run(struct rtsx_pcr *pcr)
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4- } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - - mod_delayed_work(system_wq, &pcr->idle_work,
msecs_to_jiffies(200));Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c
Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0}EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct
rtsx_pcr
*pcr)rtsx_comm_pm_power_saving(pcr); }drivers/misc/cardreader/rtsx_pcr.c +0
-3-static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
rtd3_work);Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)
Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-9- -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
idle_work);Quoted 30 lines
Quoted 30 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-18- -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) - mod_delayed_work(system_wq, &pcr->rtd3_work,
msecs_to_jiffies(10000));drivers/misc/cardreader/rtsx_pcr.c +0
-2-} - static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8pm_state) { /* Set relink_time to 0 */drivers/misc/cardreader/rtsx_pcr.c +0
-1@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work);Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev*pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-2rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { - INIT_DELAYED_WORK(&pcr->rtd3_work,
rtsx_pci_rtd3_work);Quoted 189 lines
Quoted 189 lines
drivers/misc/cardreader/rtsx_pcr.c +5
-9-pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel(pcr, RTSX_BIER, 0); @@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev) spin_unlock_irq(&pcr->lock); cancel_delayed_work_sync(&pcr->carddet_work);drivers/misc/cardreader/rtsx_pcr.c +0
-8-cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree(handle);drivers/misc/cardreader/rtsx_pcr.c +0
-3@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d) if (ret) goto out; - schedule_delayed_work(&pcr->idle_work, msecs_to_jiffies(200)); - out: mutex_unlock(&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +27
-0@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device *device)handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +6
-11-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(structdevice
*device)pcr->slots[RTSX_SD_CARD].p_dev); }drivers/misc/cardreader/rtsx_pcr.c +0
-2-schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(structdevice
*device)static const struct
dev_pm_opsrtsx_pci_pm_ops= {
SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume)
- SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume,
+rtsx_pci_runtime_idle)
};static struct
pci_driverrtsx_pci_driver= { diff --gita/include/linux/rtsx_pci.hb/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-3@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;Quoted 5 lines
Quoted 4 lines
include/linux/rtsx_pci.h +0
-1#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
------Please consider the environment before printing this e-mail.
Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 54 lines · Ricky WU
Quoted 54 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 8:39 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 13 lines · Ricky WU
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 2:32 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 2 lines
Quoted 2 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM statemachine.
Quoted 3 lines
Quoted 3 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PMhelpers.
Quoted 7 lines
Quoted 3 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.Original
idle_workis for aspm delay time is 200 msec, because Aspm can quick in and out to save more power Now this patch need to wait 5 secbecause set autosuspend time set to 5 sec in sdmmc,... this time need to set to 200 msec.
OK, will change it to 200ms.
Quoted 7 lines
But it will get another question, the question is the host(sdmmc) caps has set
MMC_CAP_AGGRESSIVE_PMwhenrtd3_enis set, It will make card power off when sdmmc go to suspend, 200 msec will cause card power off and on frequentlyNeed to remove this flag in caps, and then change card power off to
rtsx_pci_runtime_suspend()....
Quoted 8 lines
Quoted 4 lines
You are right, since
rtsx_pci_sdmmcbehaves like a virtual device ofrtsx_pci, so we should let the latter handle all the PM work.
Will dropMMC_CAP_AGGRESSIVE_PMin next iteration.We found another problem when we removed
MMC_CAP_AGGRESSIVE_PMWe callrtsx_sd_power_off_card3v3inrtsx_pci_runtime_suspend, we found mmc core doesn't call from CMD 0 when resume back
Yes, MMC_CAP_AGGRESSIVE_PM needs to be kept to power on the card on runtime resume.
Also, I don't see the frequent powering on/off issue you describe in previous mail. Can you please elaborate more on the issue?
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
What do you think?
Thanks for your testing and review.
One question though, regarding to the memstick virtual driver. The memstick support was silently dropped by "misc: rtsx: Add support for RTS5261", as
RTSX_MS_CARDwas removed from MFD cells.
Quoted 8 lines
Quoted 4 lines
Is there any memstick device in the wild? If there is, we should add it back to the MFD cells to avoid regression.
And I guess starting from rts5261, only MMC is supported?Yes, from rts5261 only support SD...
But we removed MS main result is...
1. Memstick card was disappeared about 10 year
10 years isn't that long.
Quoted 1 line
2. Our guest do not use combo socket, only use SD card socket so we removed MS event
So we should add the memstick support back for chips other than rts5261.
Kai-Heng
Quoted 301 lines
Ricky
Quoted 299 lines
Quoted 27 lines
Quoted 27 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices withrtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ;Quoted 14 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4-if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false;drivers/misc/cardreader/rtsx_pcr.c void rtsx_pci_start_run(struct rtsx_pcr *pcr)
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4- } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - - mod_delayed_work(system_wq, &pcr->idle_work,
msecs_to_jiffies(200));Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c
Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0}EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct
rtsx_pcr
*pcr)rtsx_comm_pm_power_saving(pcr); }drivers/misc/cardreader/rtsx_pcr.c +0
-3-static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
rtd3_work);Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)
Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-9- -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
idle_work);Quoted 30 lines
Quoted 30 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-18- -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) - mod_delayed_work(system_wq, &pcr->rtd3_work,
msecs_to_jiffies(10000));drivers/misc/cardreader/rtsx_pcr.c +0
-2-} - static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8pm_state) { /* Set relink_time to 0 */drivers/misc/cardreader/rtsx_pcr.c +0
-1@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work);Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev
Quoted 3 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev*pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-2rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { - INIT_DELAYED_WORK(&pcr->rtd3_work,
rtsx_pci_rtd3_work);Quoted 189 lines
Quoted 189 lines
drivers/misc/cardreader/rtsx_pcr.c +5
-9-pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel(pcr, RTSX_BIER, 0); @@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev) spin_unlock_irq(&pcr->lock); cancel_delayed_work_sync(&pcr->carddet_work);drivers/misc/cardreader/rtsx_pcr.c +0
-8-cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree(handle);drivers/misc/cardreader/rtsx_pcr.c +0
-3@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d) if (ret) goto out; - schedule_delayed_work(&pcr->idle_work, msecs_to_jiffies(200)); - out: mutex_unlock(&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +27
-0@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device *device)handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +6
-11-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(structdevice
*device)pcr->slots[RTSX_SD_CARD].p_dev); }drivers/misc/cardreader/rtsx_pcr.c +0
-2-schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(structdevice
*device)static const struct
dev_pm_opsrtsx_pci_pm_ops= {
SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume)
- SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume,
+rtsx_pci_runtime_idle)
};static struct
pci_driverrtsx_pci_driver= { diff --gita/include/linux/rtsx_pci.hb/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-3@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;Quoted 5 lines
Quoted 4 lines
include/linux/rtsx_pci.h +0
-1#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
------Please consider the environment before printing this e-mail.
RE: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 77 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Monday, January 24, 2022 12:54 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 57 lines · Ricky WU
Quoted 57 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 8:39 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 13 lines · Ricky WU
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 2:32 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 3 lines
Quoted 3 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM statemachine.
Quoted 4 lines
Quoted 4 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PMhelpers.
Quoted 8 lines
Quoted 3 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.Original
idle_workis for aspm delay time is 200 msec, because Aspm can quick in and out to save more power Now this patch need to wait 5 secbecause set autosuspend time set to 5 sec in sdmmc,... this time need to set to
200 msec.OK, will change it to 200ms.
Quoted 8 lines
But it will get another question, the question is the host(sdmmc) caps has set
MMC_CAP_AGGRESSIVE_PMwhenrtd3_enis set, It will make card power off when sdmmc go to suspend, 200 msec will cause card power off and on frequentlyNeed to remove this flag in caps, and then change card power off to
Quoted 8 lines
Quoted 6 lines
rtsx_pci_runtime_suspend()....You are right, since
rtsx_pci_sdmmcbehaves like a virtual device ofrtsx_pci, so we should let the latter handle all the PM work. Will dropMMC_CAP_AGGRESSIVE_PMin next iteration.We found another problem when we removed
MMC_CAP_AGGRESSIVE_PM
Quoted 9 lines
We call
Quoted 2 lines
rtsx_sd_power_off_card3v3inrtsx_pci_runtime_suspend, we found mmc core doesn't call from CMD 0 when resume backYes,
MMC_CAP_AGGRESSIVE_PMneeds to be kept to power on the card on runtime resume.
Also, I don't see the frequent powering on/off issue you describe in previous mail. Can you please elaborate more on the issue?
We think keep MMC_CAP_AGGRESSIVE_PM exist Is better for now
Also keep the rtsx_pci_sdmmc autsuspend 5 Sec is well
After 5 Sec idle and then power off the card we think this behavior is not a problem
Quoted 19 lines
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
What do you think?
Thanks for your testing and review.
One question though, regarding to the memstick virtual driver. The memstick support was silently dropped by "misc: rtsx: Add support for RTS5261", as
RTSX_MS_CARDwas removed from MFD cells.Quoted 8 lines
Quoted 4 lines
Is there any memstick device in the wild? If there is, we should add it back to the MFD cells to avoid regression.
And I guess starting from rts5261, only MMC is supported?Yes, from rts5261 only support SD...
But we removed MS main result is...
1. Memstick card was disappeared about 10 year
Quoted 7 lines
10 years isn't that long.
Quoted 2 lines
2. Our guest do not use combo socket, only use SD card socket so we removed MS event
So we should add the memstick support back for chips other than rts5261.
We didn’t have guest to use combo socket (SD and MS), so we think support MS is unnecessary
Quoted 314 lines
Kai-Heng
Quoted 11 lines
Ricky
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v3:
- Allow runtime PM for all devices, but only schedule runtimesuspend
Quoted 75 lines
Quoted 75 lines
Quoted 18 lines
Quoted 18 lines
for devices with
rtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ;Quoted 14 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4-if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false;drivers/misc/cardreader/rtsx_pcr.c void rtsx_pci_start_run(struct rtsx_pcr *pcr)
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4- } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - - mod_delayed_work(system_wq, &pcr->idle_work,
msecs_to_jiffies(200));Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c
Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0}EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct
rtsx_pcr
*pcr)rtsx_comm_pm_power_saving(pcr); }drivers/misc/cardreader/rtsx_pcr.c +0
-3-static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
rtd3_work);Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)
Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-9- -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
idle_work);Quoted 20 lines
Quoted 20 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-18- -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) - mod_delayed_work(system_wq, &pcr->rtd3_work,
msecs_to_jiffies(10000));
-}Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
-
static void rtsx_base_force_power_down(structrtsx_pcr*pcr, u8pm_state) { /* Set relink_time to 0 */ @@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted = 0; pcr->card_removed = 0; INIT_DELAYED_WORK(&pcr->carddet_work,
rtsx_pci_card_detect);Quoted 12 lines
Quoted 12 lines
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1-INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev*pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-2rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { - INIT_DELAYED_WORK(&pcr->rtd3_work,
rtsx_pci_rtd3_work);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-5-pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret = mfd_add_devices(&pcidev->dev, pcr->id, rtsx_pcr_cells, ARRAY_SIZE(rtsx_pcr_cells), NULL, 0,NULL);
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1if (ret <0 ) goto free_slots; - schedule_delayed_work(&pcr->idle_work,
msecs_to_jiffies(200));Quoted 53 lines
Quoted 53 lines
Quoted 53 lines
Quoted 53 lines
drivers/misc/cardreader/rtsx_pcr.c +2
-0+pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct
pci_dev
*pcidev)struct pcr_handle *handle = pci_get_drvdata(pcidev); struct rtsx_pcr *pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +3
-3-if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock); rtsx_pci_writel(pcr, RTSX_BIER, 0); @@ -1680,9 +1631,6 @@static void
rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq(&pcr->lock); cancel_delayed_work_sync(&pcr->carddet_work);drivers/misc/cardreader/rtsx_pcr.c +0
-3-cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct
pci_dev
*pcidev)idr_remove(&rtsx_pci_idr, pcr->id); spin_unlock(&rtsx_pci_lock);drivers/misc/cardreader/rtsx_pcr.c +0
-6-if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c static int __maybe_unused · line 1764
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d) if (ret) goto out; - schedule_delayed_work(&pcr->idle_work,
msecs_to_jiffies(200));Quoted 73 lines
Quoted 73 lines
Quoted 73 lines
Quoted 73 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1- out:mutex_unlock (&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct
pci_dev
*pcidev)pci_disable_msi(pcr->pci); }drivers/misc/cardreader/rtsx_pcr.c +27
-0+static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device*device)
handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +6
-11-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
mutex_lock(&pcr->pcr_mutex);drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(structdevice
*device)pcr->slots[RTSX_SD_CARD].p_dev);
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
}- schedule_delayed_work(&pcr->idle_work,
msecs_to_jiffies(200));Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1-mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(structdevice
*device)static const struct
dev_pm_opsrtsx_pci_pm_ops= {
SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend,
rtsx_pci_resume)Quoted 33 lines
Quoted 33 lines
Quoted 27 lines
Quoted 27 lines
- SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,
rtsx_pci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume,
+rtsx_pci_runtime_idle)
};static struct
pci_driverrtsx_pci_driver= { diff --gita/include/linux/rtsx_pci.hb/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-3@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;Quoted 5 lines
Quoted 4 lines
include/linux/rtsx_pci.h +0
-1#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
------Please consider the environment before printing this e-mail.
Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flow
Quoted 88 lines · Ricky WU
Quoted 78 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Monday, January 24, 2022 12:54 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 57 lines · Ricky WU
Quoted 57 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 8:39 PM
To: Ricky WU <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: Re: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 13 lines · Ricky WU
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Friday, January 21, 2022 2:32 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] misc: rtsx: Rework runtime power management flowQuoted 3 lines
Quoted 3 lines
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM statemachine.
Quoted 4 lines
Quoted 4 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PMhelpers.
Quoted 8 lines
Quoted 3 lines
So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.Original
idle_workis for aspm delay time is 200 msec, because Aspm can quick in and out to save more power Now this patch need to wait 5 secbecause set autosuspend time set to 5 sec in sdmmc,... this time need to set to
200 msec.OK, will change it to 200ms.
Quoted 8 lines
But it will get another question, the question is the host(sdmmc) caps has set
MMC_CAP_AGGRESSIVE_PMwhenrtd3_enis set, It will make card power off when sdmmc go to suspend, 200 msec will cause card power off and on frequentlyNeed to remove this flag in caps, and then change card power off to
Quoted 8 lines
Quoted 6 lines
rtsx_pci_runtime_suspend()....You are right, since
rtsx_pci_sdmmcbehaves like a virtual device ofrtsx_pci, so we should let the latter handle all the PM work. Will dropMMC_CAP_AGGRESSIVE_PMin next iteration.We found another problem when we removed
MMC_CAP_AGGRESSIVE_PMQuoted 9 lines
We call
Quoted 2 lines
rtsx_sd_power_off_card3v3inrtsx_pci_runtime_suspend, we found mmc core doesn't call from CMD 0 when resume backYes,
MMC_CAP_AGGRESSIVE_PMneeds to be kept to power on the card on runtime resume.
Also, I don't see the frequent powering on/off issue you describe in previous mail. Can you please elaborate more on the issue?
Quoted 3 lines
We think keep
MMC_CAP_AGGRESSIVE_PMexist Is better for now
Also keep thertsx_pci_sdmmcautsuspend 5 Sec is well
After 5 Sec idle and then power off the card we think this behavior is not a problem
Thanks, I'll send next version to mailing list.
Quoted 23 lines
Quoted 23 lines
Quoted 12 lines
Quoted 12 lines
Quoted 5 lines
What do you think?
Thanks for your testing and review.
One question though, regarding to the memstick virtual driver. The memstick support was silently dropped by "misc: rtsx: Add support for RTS5261", as
RTSX_MS_CARDwas removed from MFD cells.Quoted 8 lines
Quoted 4 lines
Is there any memstick device in the wild? If there is, we should add it back to the MFD cells to avoid regression.
And I guess starting from rts5261, only MMC is supported?Yes, from rts5261 only support SD...
But we removed MS main result is...
1. Memstick card was disappeared about 10 year10 years isn't that long.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
2. Our guest do not use combo socket, only use SD card socket so we removed MS event
So we should add the memstick support back for chips other than rts5261.
We didn’t have guest to use combo socket (SD and MS), so we think support MS is unnecessary
For newer hardware, yes the support is redundant.
But what about old hardwares? Was there any memstick hardware shipped? Maybe there are still some users?
Kai-Heng
Quoted 315 lines
Quoted 315 lines
Kai-Heng
Quoted 11 lines
Ricky
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>---
v3:
- Allow runtime PM for all devices, but only schedule runtimesuspend
Quoted 75 lines
Quoted 75 lines
Quoted 18 lines
Quoted 18 lines
for devices with
rtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ;Quoted 14 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4-if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false;drivers/misc/cardreader/rtsx_pcr.c void rtsx_pci_start_run(struct rtsx_pcr *pcr)
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-4- } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - - mod_delayed_work(system_wq, &pcr->idle_work,
msecs_to_jiffies(200));Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c
Quoted 11 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-0}EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct
rtsx_pcr
*pcr)rtsx_comm_pm_power_saving(pcr); }drivers/misc/cardreader/rtsx_pcr.c +0
-3-static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
rtd3_work);Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)
Quoted 9 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-9- -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr,
idle_work);Quoted 20 lines
Quoted 20 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-18- -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) - mod_delayed_work(system_wq, &pcr->rtd3_work,
msecs_to_jiffies(10000));
-}Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
-
static void rtsx_base_force_power_down(structrtsx_pcr*pcr, u8pm_state) { /* Set relink_time to 0 */ @@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted = 0; pcr->card_removed = 0; INIT_DELAYED_WORK(&pcr->carddet_work,
rtsx_pci_card_detect);Quoted 12 lines
Quoted 12 lines
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1-INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev*pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 5 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-2rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { - INIT_DELAYED_WORK(&pcr->rtd3_work,
rtsx_pci_rtd3_work);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-5-pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret = mfd_add_devices(&pcidev->dev, pcr->id, rtsx_pcr_cells, ARRAY_SIZE(rtsx_pcr_cells), NULL, 0,NULL);
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c static int rtsx_pci_probe(struct pci_dev *pcidev,
Quoted 4 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1if (ret <0 ) goto free_slots; - schedule_delayed_work(&pcr->idle_work,
msecs_to_jiffies(200));Quoted 53 lines
Quoted 53 lines
Quoted 53 lines
Quoted 53 lines
drivers/misc/cardreader/rtsx_pcr.c +2
-0+pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct
pci_dev
*pcidev)struct pcr_handle *handle = pci_get_drvdata(pcidev); struct rtsx_pcr *pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +3
-3-if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock); rtsx_pci_writel(pcr, RTSX_BIER, 0); @@ -1680,9 +1631,6 @@static void
rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq(&pcr->lock); cancel_delayed_work_sync(&pcr->carddet_work);drivers/misc/cardreader/rtsx_pcr.c +0
-3-cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct
pci_dev
*pcidev)idr_remove(&rtsx_pci_idr, pcr->id); spin_unlock(&rtsx_pci_lock);drivers/misc/cardreader/rtsx_pcr.c +0
-6-if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c static int __maybe_unused · line 1764
Quoted 8 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d) if (ret) goto out; - schedule_delayed_work(&pcr->idle_work,
msecs_to_jiffies(200));Quoted 73 lines
Quoted 73 lines
Quoted 73 lines
Quoted 73 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1- out:mutex_unlock (&pcr->pcr_mutex);return ret;drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct
pci_dev
*pcidev)pci_disable_msi(pcr->pci); }drivers/misc/cardreader/rtsx_pcr.c +27
-0+static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device*device)
handle = pci_get_drvdata(pcidev); pcr = handle->pcr;drivers/misc/cardreader/rtsx_pcr.c +6
-11-dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
mutex_lock(&pcr->pcr_mutex);drivers/misc/cardreader/rtsx_pcr.c +0
-0@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(structdevice
*device)pcr->slots[RTSX_SD_CARD].p_dev);
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
}- schedule_delayed_work(&pcr->idle_work,
msecs_to_jiffies(200));Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/misc/cardreader/rtsx_pcr.c +0
-1-mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(structdevice
*device)static const struct
dev_pm_opsrtsx_pci_pm_ops= {
SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend,
rtsx_pci_resume)Quoted 33 lines
Quoted 33 lines
Quoted 27 lines
Quoted 27 lines
- SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,
rtsx_pci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend,rtsx_pci_runtime_resume,
+rtsx_pci_runtime_idle)
};static struct
pci_driverrtsx_pci_driver= { diff --gita/include/linux/rtsx_pci.hb/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-3@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;Quoted 5 lines
Quoted 4 lines
include/linux/rtsx_pci.h +0
-1#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
------Please consider the environment before printing this e-mail.
PATCH v4 1/4 mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
In reply to Kai-Heng FengCommit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver, rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.
So use those helpers at right places to properly manage runtime PM.
Since rtsx_pci will handle the real power management, remove MMC_CAP_AGGRESSIVE_PM to avoid doing duplicate work.
---
v4:
- Decrease the autosuspend delay to 200ms for more power saving.
v3:
v2:
- No change.
drivers/mmc/host/rtsx_pci_sdmmc.c | 47 ++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +33 -14
@@ -806,6 +806,7 @@ static void sd_request(struct work_struct *work)struct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; +struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;
@@ -822,6 +823,7 @@ static void sd_request(struct work_struct *work) }mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -858,6 +860,8 @@ static void sd_request(struct work_struct *work) data->bytes_xfered = data->blocks * data->blksz; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:
@@ -1080,6 +1084,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;if (host->eject)return ;
@@ -1088,6 +1093,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)return ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1121,6 +1127,8 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)rtsx_pci_switch_clock (pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); }
@@ -1128,6 +1136,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;
@@ -1135,6 +1144,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc)return -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1144,6 +1154,8 @@ static int sdmmc_get_ro(struct mmc_host *mmc)if (val &SD_WRITE_PROTECT ) ro =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;
@@ -1153,6 +1165,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;
@@ -1160,6 +1173,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc)return cd;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1169,6 +1183,8 @@ static int sdmmc_get_cd(struct mmc_host *mmc)if (val &SD_EXIST ) cd =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;
@@ -1251,6 +1267,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;
@@ -1265,6 +1282,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1294,6 +1312,8 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1303,6 +1323,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)
@@ -1313,6 +1334,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1345,6 +1367,8 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1427,7 +1451,6 @@ static void init_extra_caps(struct realtek_pci_sdmmc *host)static void realtek_init_host (struct realtek_pci_sdmmc *host) {struct mmc_host *mmc = host->mmc; -struct rtsx_pcr *pcr = host->pcr; mmc->f_min =250000 ; mmc->f_max =208000000 ;
@@ -1435,8 +1458,6 @@ static void realtek_init_host(struct realtek_pci_sdmmc *host) mmc->caps =MMC_CAP_4_BIT_DATA |MMC_CAP_SD_HIGHSPEED |MMC_CAP_MMC_HIGHSPEED |MMC_CAP_BUS_WIDTH_TEST |MMC_CAP_UHS_SDR12 |MMC_CAP_UHS_SDR25 ; -if (pcr->rtd3_en) - mmc->caps = mmc->caps |MMC_CAP_AGGRESSIVE_PM ; mmc->caps2 =MMC_CAP2_NO_PRESCAN_POWERUP |MMC_CAP2_FULL_PWR_CYCLE |MMC_CAP2_NO_SDIO ; mmc->max_current_330 =400 ;
@@ -1495,12 +1516,12 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)realtek_init_host (host); -if (pcr->rtd3_en) { -pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); -pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev); - } - +pm_runtime_no_callbacks (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,200 ); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_use_autosuspend (&pdev->dev);mmc_add_host (mmc);
@@ -1521,11 +1542,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) pcr->slots[RTSX_SD_CARD ].card_event =NULL ; mmc = host->mmc; -if (pcr->rtd3_en) { -pm_runtime_dont_use_autosuspend (&pdev->dev); -pm_runtime_disable (&pdev->dev); - } -cancel_work_sync (&host->work);mutex_lock (&host->host_mutex);
@@ -1548,6 +1564,9 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)flush_work (&host->work); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc); dev_dbg(&(pdev->dev),
Signature · 1 line
2.33.1
PATCH v4 2/4 misc: rtsx: Rework runtime power management flow
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
When its child device, rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
So consolidate "idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
---
v4:
- No change.
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices with rtd3_en flagged.
v2:
- Remove unused idle_work and rtd3_work from rtsx_pcr.
drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +39 -79
@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);
@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work,msecs_to_jiffies (10000 )); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) {/* Set relink_time to 0 */
@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {
@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;
@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel (pcr,RTSX_BIER ,0 );
@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);
@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);
@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);
@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;
@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) +{ +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device);
@@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device *device) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);
@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume) -SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume,NULL ) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, rtsx_pci_runtime_idle) };static struct pci_driver rtsx_pci_driver = {
include/linux/rtsx_pci.h +0 -3
@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;
@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1)
Signature · 1 line
2.33.1
PATCH v4 3/4 misc: rtsx: Cleanup power management ops
In reply to Kai-Heng Feng- Use cancel_delayed_work_sync to ensure there's no race with carddet_work.
- Remove device_wakeup_disable to save some CPU cycles. If the device really has ACPI _DSW then the wakeup should be disabled in probe routine.
- Remove fetch_vendor_settings from runtime resume routine, since they are already saved in "struct rtsx_pcr".
- Move variable assignments to the top of the functions.
---
v4:
- Move variable assignments to the top of the functions.
v3:
v2:
- No change.
drivers/misc/cardreader/rtsx_pcr.c | 34 ++++++++---------------------- 1 file changed, 9 insertions(+), 25 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +9 -25
@@ -1660,22 +1660,17 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)static int __maybe_unused rtsx_pci_suspend (struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; - -cancel_delayed_work (&pcr->carddet_work); +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); -device_wakeup_disable (dev_d); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1683,15 +1678,12 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)static int __maybe_unused rtsx_pci_resume (struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;int ret =0 ;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -mutex_lock (&pcr->pcr_mutex); ret =rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 );
@@ -1711,13 +1703,11 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)static void rtsx_pci_shutdown (struct pci_dev *pcidev) { -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr;rtsx_pci_power_off (pcr,HOST_ENTER_S1 );pci_disable_device (pcidev);
@@ -1756,11 +1746,8 @@ static int rtsx_pci_runtime_idle(struct device *device)static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; - - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (device,"--> %s\n" , __func__);
@@ -1786,9 +1773,6 @@ static int rtsx_pci_runtime_resume(struct device *device)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 ); -if (pcr->ops->fetch_vendor_settings) - pcr->ops->fetch_vendor_settings (pcr); -rtsx_pci_init_hw (pcr);if (pcr->slots[RTSX_SD_CARD ].p_dev !=NULL ) {
Signature · 1 line
2.33.1
PATCH v4 4/4 misc: rtsx: Quiesce rts5249 on system suspend
In reply to Kai-Heng FengSet more registers in force_power_down callback to avoid S3 wakeup from hotplugging cards.
This is originally written by Ricky WU.
---
v4:
v3:
v2:
- No change.
drivers/misc/cardreader/rtl8411.c | 2 +- drivers/misc/cardreader/rts5209.c | 2 +- drivers/misc/cardreader/rts5228.c | 2 +- drivers/misc/cardreader/rts5229.c | 2 +- drivers/misc/cardreader/rts5249.c | 31 ++++++++++++++++++++++++++++-- drivers/misc/cardreader/rts5261.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 14 +++++++------- drivers/misc/cardreader/rtsx_pcr.h | 1 + include/linux/rtsx_pci.h | 2 +- 9 files changed, 43 insertions(+), 15 deletions(-)
drivers/misc/cardreader/rtl8411.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -74,7 +74,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); - pcr->rtd3_en =rtsx_reg_to_rtd3_uhsii (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)) pcr->extra_caps |=EXTRA_CAPS_NO_MMC ;
@@ -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, };
drivers/misc/cardreader/rts5261.c +1 -1
@@ -91,7 +91,7 @@ static void rtsx5261_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_3v3 =rts5261_reg_to_sd30_drive_sel_3v3 (reg); } -static void rts5261_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rts5261_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/rtsx_pcr.c +7 -7
@@ -1086,7 +1086,7 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr) {/* Set relink_time to 0 */ rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,MASK_8_BIT_DEF ,0 );
@@ -1100,7 +1100,7 @@ static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)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) +static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 pm_state,bool runtime) {if (pcr->ops->turn_off_led) pcr->ops->turn_off_led (pcr);
@@ -1112,9 +1112,9 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 , pm_state);if (pcr->ops->force_power_down) - pcr->ops->force_power_down (pcr, pm_state); + pcr->ops->force_power_down (pcr, pm_state, runtime);else -rtsx_base_force_power_down (pcr, pm_state); +rtsx_base_force_power_down (pcr); }void rtsx_pci_enable_ocp (struct rtsx_pcr *pcr)
@@ -1669,7 +1669,7 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , false);mutex_unlock (&pcr->pcr_mutex);return 0 ;
@@ -1708,7 +1708,7 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -rtsx_pci_power_off (pcr,HOST_ENTER_S1 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S1 , false);pci_disable_device (pcidev);free_irq (pcr->irq, (void *)pcr);
@@ -1754,7 +1754,7 @@ static int rtsx_pci_runtime_suspend(struct device *device)cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , true);mutex_unlock (&pcr->pcr_mutex);
drivers/misc/cardreader/rtsx_pcr.h +1 -0
@@ -25,6 +25,7 @@#define REG_EFUSE_POWEROFF 0x00#define RTS5250_CLK_CFG3 0xFF79#define RTS525A_CFG_MEM_PD 0xF0 +#define RTS524A_AUTOLOAD_CFG1 0xFF7C#define RTS524A_PM_CTRL3 0xFF7E#define RTS525A_BIOS_CFG 0xFF2D#define RTS525A_LOAD_BIOS_FLAG 0x01
include/linux/rtsx_pci.h +1 -1
@@ -1095,7 +1095,7 @@ struct pcr_ops {unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);int (*conv_clk_and_div_n)(int clk,int dir);void (*fetch_vendor_settings)(struct rtsx_pcr *pcr); -void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state); +void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state,bool runtime);void (*stop_cmd)(struct rtsx_pcr *pcr);void (*set_aspm)(struct rtsx_pcr *pcr,bool enable);
Signature · 1 line
2.33.1
PATCH v5 1/4 mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
In reply to Kai-Heng FengCommit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver, rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.
So use those helpers at right places to properly manage runtime PM.
---
v5:
- Revert back to v3 as Realtek suggested.
v4:
- Decrease the autosuspend delay to 200ms for more power saving.
v3:
v2:
- No change.
drivers/mmc/host/rtsx_pci_sdmmc.c | 44 +++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 11 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +33 -11
@@ -806,6 +806,7 @@ static void sd_request(struct work_struct *work)struct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; +struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;
@@ -822,6 +823,7 @@ static void sd_request(struct work_struct *work) }mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -858,6 +860,8 @@ static void sd_request(struct work_struct *work) data->bytes_xfered = data->blocks * data->blksz; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:
@@ -1080,6 +1084,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;if (host->eject)return ;
@@ -1088,6 +1093,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)return ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1121,6 +1127,8 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)rtsx_pci_switch_clock (pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); }
@@ -1128,6 +1136,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;
@@ -1135,6 +1144,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc)return -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1144,6 +1154,8 @@ static int sdmmc_get_ro(struct mmc_host *mmc)if (val &SD_WRITE_PROTECT ) ro =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;
@@ -1153,6 +1165,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;
@@ -1160,6 +1173,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc)return cd;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1169,6 +1183,8 @@ static int sdmmc_get_cd(struct mmc_host *mmc)if (val &SD_EXIST ) cd =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;
@@ -1251,6 +1267,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;
@@ -1265,6 +1282,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1294,6 +1312,8 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1303,6 +1323,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)
@@ -1313,6 +1334,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1345,6 +1367,8 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1495,12 +1519,12 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)realtek_init_host (host); -if (pcr->rtd3_en) { -pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); -pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev); - } - +pm_runtime_no_callbacks (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_use_autosuspend (&pdev->dev);mmc_add_host (mmc);
@@ -1521,11 +1545,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) pcr->slots[RTSX_SD_CARD ].card_event =NULL ; mmc = host->mmc; -if (pcr->rtd3_en) { -pm_runtime_dont_use_autosuspend (&pdev->dev); -pm_runtime_disable (&pdev->dev); - } -cancel_work_sync (&host->work);mutex_lock (&host->host_mutex);
@@ -1548,6 +1567,9 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)flush_work (&host->work); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc); dev_dbg(&(pdev->dev),
Signature · 1 line
2.33.1
PATCH v5 2/4 misc: rtsx: Rework runtime power management flow
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
When its child device, rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
So consolidate "idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
---
v5:
v4:
- No change.
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices with rtd3_en flagged.
v2:
- Remove unused idle_work and rtd3_work from rtsx_pcr.
drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +39 -79
@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);
@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work,msecs_to_jiffies (10000 )); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) {/* Set relink_time to 0 */
@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {
@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;
@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel (pcr,RTSX_BIER ,0 );
@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);
@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);
@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);
@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;
@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) +{ +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,5000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device);
@@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device *device) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);
@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume) -SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume,NULL ) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, rtsx_pci_runtime_idle) };static struct pci_driver rtsx_pci_driver = {
include/linux/rtsx_pci.h +0 -3
@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;
@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1)
Signature · 1 line
2.33.1
PATCH v5 3/4 misc: rtsx: Cleanup power management ops
In reply to Kai-Heng Feng- Use cancel_delayed_work_sync to ensure there's no race with carddet_work.
- Remove device_wakeup_disable to save some CPU cycles. If the device really has ACPI _DSW then the wakeup should be disabled in probe routine.
- Remove fetch_vendor_settings from runtime resume routine, since they are already saved in "struct rtsx_pcr".
- Move variable assignments to the top of the functions.
---
v5:
- No change.
v4:
- Move variable assignments to the top of the functions.
v3:
v2:
- No change.
drivers/misc/cardreader/rtsx_pcr.c | 34 ++++++++---------------------- 1 file changed, 9 insertions(+), 25 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +9 -25
@@ -1660,22 +1660,17 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)static int __maybe_unused rtsx_pci_suspend (struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; - -cancel_delayed_work (&pcr->carddet_work); +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); -device_wakeup_disable (dev_d); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1683,15 +1678,12 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)static int __maybe_unused rtsx_pci_resume (struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;int ret =0 ;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -mutex_lock (&pcr->pcr_mutex); ret =rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 );
@@ -1711,13 +1703,11 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)static void rtsx_pci_shutdown (struct pci_dev *pcidev) { -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr;rtsx_pci_power_off (pcr,HOST_ENTER_S1 );pci_disable_device (pcidev);
@@ -1756,11 +1746,8 @@ static int rtsx_pci_runtime_idle(struct device *device)static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; - - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (device,"--> %s\n" , __func__);
@@ -1786,9 +1773,6 @@ static int rtsx_pci_runtime_resume(struct device *device)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 ); -if (pcr->ops->fetch_vendor_settings) - pcr->ops->fetch_vendor_settings (pcr); -rtsx_pci_init_hw (pcr);if (pcr->slots[RTSX_SD_CARD ].p_dev !=NULL ) {
Signature · 1 line
2.33.1
PATCH v5 4/4 misc: rtsx: Quiesce rts5249 on system suspend
In reply to Kai-Heng FengSet more registers in force_power_down callback to avoid S3 wakeup from hotplugging cards.
This is originally written by Ricky WU.
---
v5:
v4:
v3:
v2:
- No change.
drivers/misc/cardreader/rtl8411.c | 2 +- drivers/misc/cardreader/rts5209.c | 2 +- drivers/misc/cardreader/rts5228.c | 2 +- drivers/misc/cardreader/rts5229.c | 2 +- drivers/misc/cardreader/rts5249.c | 31 ++++++++++++++++++++++++++++-- drivers/misc/cardreader/rts5261.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 14 +++++++------- drivers/misc/cardreader/rtsx_pcr.h | 1 + include/linux/rtsx_pci.h | 2 +- 9 files changed, 43 insertions(+), 15 deletions(-)
drivers/misc/cardreader/rtl8411.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -74,7 +74,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); - pcr->rtd3_en =rtsx_reg_to_rtd3_uhsii (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)) pcr->extra_caps |=EXTRA_CAPS_NO_MMC ;
@@ -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, };
drivers/misc/cardreader/rts5261.c +1 -1
@@ -91,7 +91,7 @@ static void rtsx5261_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_3v3 =rts5261_reg_to_sd30_drive_sel_3v3 (reg); } -static void rts5261_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rts5261_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/rtsx_pcr.c +7 -7
@@ -1086,7 +1086,7 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr) {/* Set relink_time to 0 */ rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,MASK_8_BIT_DEF ,0 );
@@ -1100,7 +1100,7 @@ static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)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) +static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 pm_state,bool runtime) {if (pcr->ops->turn_off_led) pcr->ops->turn_off_led (pcr);
@@ -1112,9 +1112,9 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 , pm_state);if (pcr->ops->force_power_down) - pcr->ops->force_power_down (pcr, pm_state); + pcr->ops->force_power_down (pcr, pm_state, runtime);else -rtsx_base_force_power_down (pcr, pm_state); +rtsx_base_force_power_down (pcr); }void rtsx_pci_enable_ocp (struct rtsx_pcr *pcr)
@@ -1669,7 +1669,7 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , false);mutex_unlock (&pcr->pcr_mutex);return 0 ;
@@ -1708,7 +1708,7 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -rtsx_pci_power_off (pcr,HOST_ENTER_S1 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S1 , false);pci_disable_device (pcidev);free_irq (pcr->irq, (void *)pcr);
@@ -1754,7 +1754,7 @@ static int rtsx_pci_runtime_suspend(struct device *device)cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , true);mutex_unlock (&pcr->pcr_mutex);
drivers/misc/cardreader/rtsx_pcr.h +1 -0
@@ -25,6 +25,7 @@#define REG_EFUSE_POWEROFF 0x00#define RTS5250_CLK_CFG3 0xFF79#define RTS525A_CFG_MEM_PD 0xF0 +#define RTS524A_AUTOLOAD_CFG1 0xFF7C#define RTS524A_PM_CTRL3 0xFF7E#define RTS525A_BIOS_CFG 0xFF2D#define RTS525A_LOAD_BIOS_FLAG 0x01
include/linux/rtsx_pci.h +1 -1
@@ -1095,7 +1095,7 @@ struct pcr_ops {unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);int (*conv_clk_and_div_n)(int clk,int dir);void (*fetch_vendor_settings)(struct rtsx_pcr *pcr); -void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state); +void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state,bool runtime);void (*stop_cmd)(struct rtsx_pcr *pcr);void (*set_aspm)(struct rtsx_pcr *pcr,bool enable);
Signature · 1 line
2.33.1
PATCH v6 1/4 mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
In reply to Kai-Heng FengCommit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver, rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.
So use those helpers at right places to properly manage runtime PM.
---
v6:
- Change the auto suspend delay to 200ms as Realtek suggested.
v5:
- Revert back to v3 as Realtek suggested.
v4:
- Decrease the autosuspend delay to 200ms for more power saving.
v3:
v2:
- No change.
drivers/mmc/host/rtsx_pci_sdmmc.c | 44 +++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 11 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +33 -11
@@ -806,6 +806,7 @@ static void sd_request(struct work_struct *work)struct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; +struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;
@@ -822,6 +823,7 @@ static void sd_request(struct work_struct *work) }mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -858,6 +860,8 @@ static void sd_request(struct work_struct *work) data->bytes_xfered = data->blocks * data->blksz; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:
@@ -1080,6 +1084,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;if (host->eject)return ;
@@ -1088,6 +1093,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)return ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1121,6 +1127,8 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)rtsx_pci_switch_clock (pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); }
@@ -1128,6 +1136,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;
@@ -1135,6 +1144,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc)return -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1144,6 +1154,8 @@ static int sdmmc_get_ro(struct mmc_host *mmc)if (val &SD_WRITE_PROTECT ) ro =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;
@@ -1153,6 +1165,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;
@@ -1160,6 +1173,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc)return cd;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1169,6 +1183,8 @@ static int sdmmc_get_cd(struct mmc_host *mmc)if (val &SD_EXIST ) cd =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;
@@ -1251,6 +1267,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;
@@ -1265,6 +1282,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1294,6 +1312,8 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1303,6 +1323,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)
@@ -1313,6 +1334,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1345,6 +1367,8 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1495,12 +1519,12 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)realtek_init_host (host); -if (pcr->rtd3_en) { -pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); -pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev); - } - +pm_runtime_no_callbacks (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,200 ); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_use_autosuspend (&pdev->dev);mmc_add_host (mmc);
@@ -1521,11 +1545,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) pcr->slots[RTSX_SD_CARD ].card_event =NULL ; mmc = host->mmc; -if (pcr->rtd3_en) { -pm_runtime_dont_use_autosuspend (&pdev->dev); -pm_runtime_disable (&pdev->dev); - } -cancel_work_sync (&host->work);mutex_lock (&host->host_mutex);
@@ -1548,6 +1567,9 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)flush_work (&host->work); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc); dev_dbg(&(pdev->dev),
Signature · 1 line
2.33.1
PATCH v6 2/4 misc: rtsx: Rework runtime power management flow
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
When its child device, rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.
So consolidate "idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.
---
v6:
- Change autosuspend delay to 10s as Realtek suggested.
v5:
v4:
- No change.
v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices with rtd3_en flagged.
v2:
- Remove unused idle_work and rtd3_work from rtsx_pcr.
drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +39 -79
@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);
@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work (struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work,msecs_to_jiffies (10000 )); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) {/* Set relink_time to 0 */
@@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {
@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;
@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);rtsx_pci_writel (pcr,RTSX_BIER ,0 );
@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);
@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);kfree (handle);
@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);
@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);return ret;
@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) +{ +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,10000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device);
@@ -1794,31 +1761,26 @@ static int rtsx_pci_runtime_suspend(struct device *device) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);
@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(rtsx_pci_suspend, rtsx_pci_resume) -SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume,NULL ) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, rtsx_pci_runtime_idle) };static struct pci_driver rtsx_pci_driver = {
include/linux/rtsx_pci.h +0 -3
@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;
@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1)
Signature · 1 line
2.33.1
RE: [PATCH v6 2/4] misc: rtsx: Rework runtime power management flow
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Tuesday, January 25, 2022 1:50 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Yang Li <[email protected]>; Christophe JAILLET <[email protected]>; [email protected]
Subject: [PATCH v6 2/4] misc: rtsx: Rework runtime power management flowCommit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") uses "rtd3_work" and "idle_work" to manage it's own runtime PM state machine.
Quoted 8 lines
When its child device,
rtsx_pci_sdmmc, uses runtime PM refcount correctly, all the additional works can be managed by generic runtime PM helpers.So consolidate "
idle_work" and "rtd3_work" into generic runtime idle callback and runtime suspend callback, respectively.Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>
Quoted 291 lines
Signed-off-by Kai-Heng Feng <[email protected]>---
v6:
- Change autosuspend delay to 10s as Realtek suggested.v5:
v4:
- No change.v3:
- Allow runtime PM for all devices, but only schedule runtime suspend for devices withrtd3_enflagged.v2:
- Remove unusedidle_workandrtd3_workfromrtsx_pcr.drivers/misc/cardreader/rtsx_pcr.c | 118 ++++++++++------------------- include/linux/rtsx_pci.h | 3 - 2 files changed, 39 insertions(+), 82 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +0
-40@@ -152,20 +152,12 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr)if (pcr->remove_pci)return ; -if (pcr->rtd3_en) -if (pcr->is_runtime_suspended) { -pm_runtime_get (&(pcr->pci->dev)); - pcr->is_runtime_suspended = false; - } -if (pcr->state !=PDEV_STAT_RUN ) { pcr->state =PDEV_STAT_RUN ;if (pcr->ops->enable_auto_blink) pcr->ops->enable_auto_blink (pcr);rtsx_pm_full_on (pcr); } - -mod_delayed_work (system_wq, &pcr->idle_work,msecs_to_jiffies (200 )); }EXPORT_SYMBOL_GPL (rtsx_pci_start_run);@@ -1094,40 +1086,6 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_pci_rtd3_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, rtd3_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); -if (!pcr->is_runtime_suspended) -pm_runtime_put (&(pcr->pci->dev)); -} - -static void rtsx_pci_idle_work(struct work_struct *work) -{ -struct delayed_work *dwork =to_delayed_work (work); - struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); - -pcr_dbg (pcr,"--> %s\n" , __func__); - -mutex_lock (&pcr->pcr_mutex); - - pcr->state =PDEV_STAT_IDLE ; - -if (pcr->ops->disable_auto_blink) - pcr->ops->disable_auto_blink (pcr); -if (pcr->ops->turn_off_led) - pcr->ops->turn_off_led (pcr); - -rtsx_pm_power_saving (pcr); - -mutex_unlock (&pcr->pcr_mutex); - -if (pcr->rtd3_en) -mod_delayed_work (system_wq, &pcr->rtd3_work, msecs_to_jiffies(10000)); -} -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state){
drivers/misc/cardreader/rtsx_pcr.c +5
-12/* Set relink_time to 0 */ @@ -1598,7 +1556,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->card_inserted =0 ; pcr->card_removed =0 ;INIT_DELAYED_WORK (&pcr->carddet_work, rtsx_pci_card_detect); -INIT_DELAYED_WORK (&pcr->idle_work, rtsx_pci_idle_work); pcr->msi_en = msi_en;if (pcr->msi_en) {@@ -1623,20 +1580,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, rtsx_pcr_cells[i].pdata_size =sizeof (*handle); } -if (pcr->rtd3_en) { -INIT_DELAYED_WORK (&pcr->rtd3_work, rtsx_pci_rtd3_work); -pm_runtime_allow (&pcidev->dev); -pm_runtime_enable (&pcidev->dev); - pcr->is_runtime_suspended = false; - } - ret =mfd_add_devices (&pcidev->dev, pcr->id, rtsx_pcr_cells,ARRAY_SIZE (rtsx_pcr_cells),NULL ,0 ,NULL );if (ret <0 ) goto free_slots; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); +pm_runtime_allow (&pcidev->dev); +pm_runtime_put (&pcidev->dev);return 0 ;@@ -1668,11 +1619,11 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)struct pcr_handle *handle =pci_get_drvdata (pcidev);struct rtsx_pcr *pcr = handle->pcr; -if (pcr->rtd3_en) -pm_runtime_get_noresume (&pcr->pci->dev); - pcr->remove_pci = true; +pm_runtime_get_sync (&pcidev->dev); +pm_runtime_forbid (&pcidev->dev); +/* Disable interrupts at the pcr level */ spin_lock_irq (&pcr->lock);drivers/misc/cardreader/rtsx_pcr.c +0
-8rtsx_pci_writel (pcr,RTSX_BIER ,0 );@@ -1680,9 +1631,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)spin_unlock_irq (&pcr->lock);cancel_delayed_work_sync (&pcr->carddet_work); -cancel_delayed_work_sync (&pcr->idle_work); -if (pcr->rtd3_en) -cancel_delayed_work_sync (&pcr->rtd3_work);mfd_remove_devices (&pcidev->dev);@@ -1700,11 +1648,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)idr_remove (&rtsx_pci_idr, pcr->id);spin_unlock (&rtsx_pci_lock); -if (pcr->rtd3_en) { -pm_runtime_disable (&pcr->pci->dev); -pm_runtime_put_noidle (&pcr->pci->dev); - } -kfree (pcr->slots);kfree (pcr);drivers/misc/cardreader/rtsx_pcr.c +0
-3kfree (handle);@@ -1726,7 +1669,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) pcr = handle->pcr;cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->idle_work);mutex_lock (&pcr->pcr_mutex);@@ -1760,8 +1702,6 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)if (ret) goto out; -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); - out:mutex_unlock (&pcr->pcr_mutex);drivers/misc/cardreader/rtsx_pcr.c +26
-0return ret;@@ -1786,6 +1726,33 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)pci_disable_msi (pcr->pci); } +static int rtsx_pci_runtime_idle (struct device *device) { +struct pci_dev *pcidev =to_pci_dev (device); +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; + +dev_dbg (device,"--> %s\n" , __func__); + +mutex_lock (&pcr->pcr_mutex); + + pcr->state =PDEV_STAT_IDLE ; + +if (pcr->ops->disable_auto_blink) + pcr->ops->disable_auto_blink (pcr); +if (pcr->ops->turn_off_led) + pcr->ops->turn_off_led (pcr); + +rtsx_pm_power_saving (pcr); + +mutex_unlock (&pcr->pcr_mutex); + +if (pcr->rtd3_en) +pm_schedule_suspend (device,10000 ); + +return -EBUSY ; +} +static int rtsx_pci_runtime_suspend (struct device *device) { struct pci_dev *pcidev = to_pci_dev(device); @@ -1794,31 +1761,26 @@static int
rtsx_pci_runtime_suspend(struct device *device)drivers/misc/cardreader/rtsx_pcr.c +6
-13handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -cancel_delayed_work (&pcr->carddet_work); -cancel_delayed_work (&pcr->rtd3_work); -cancel_delayed_work (&pcr->idle_work); +dev_dbg (device,"--> %s\n" , __func__); + +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 );mutex_unlock (&pcr->pcr_mutex); - pcr->is_runtime_suspended = true; -return 0 ; }static int rtsx_pci_runtime_resume (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr; - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); +dev_dbg (device,"--> %s\n" , __func__);mutex_lock (&pcr->pcr_mutex);@@ -1834,8 +1796,6 @@ static int rtsx_pci_runtime_resume(struct device *device) pcr->slots[RTSX_SD_CARD].p_dev); } -schedule_delayed_work (&pcr->idle_work,msecs_to_jiffies (200 )); -mutex_unlock (&pcr->pcr_mutex);return 0 ;}
drivers/misc/cardreader/rtsx_pcr.c +2
-1@@ -1850,7 +1810,7 @@ static int rtsx_pci_runtime_resume(struct device *device)static const struct dev_pm_ops rtsx_pci_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (rtsx_pci_suspend, rtsx_pci_resume) - SET_RUNTIME_PM_OPS(rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, NULL) +SET_RUNTIME_PM_OPS (rtsx_pci_runtime_suspend, rtsx_pci_runtime_resume, +rtsx_pci_runtime_idle) }; static struct pci_driver rtsx_pci_driver = { diff --git a/include/linux/rtsx_pci.h
b/include/linux/rtsx_pci.hindex4ab7bfc675f11..89b7d34e25b63100644include/linux/rtsx_pci.h +0
-4@@ -1201,8 +1201,6 @@ struct rtsx_pcr {unsigned int card_exist;struct delayed_work carddet_work; -struct delayed_work idle_work; -struct delayed_work rtd3_work;spinlock_t lock;struct mutex pcr_mutex;@@ -1212,7 +1210,6 @@ struct rtsx_pcr {unsigned int cur_clock;bool remove_pci;bool msi_en; -bool is_runtime_suspended;#define EXTRA_CAPS_SD_SDR50 (1 << 0)#define EXTRA_CAPS_SD_SDR104 (1 << 1) --2.33.1
PATCH v6 3/4 misc: rtsx: Cleanup power management ops
In reply to Kai-Heng Feng- Use cancel_delayed_work_sync to ensure there's no race with carddet_work.
- Remove device_wakeup_disable to save some CPU cycles. If the device really has ACPI _DSW then the wakeup should be disabled in probe routine.
- Remove fetch_vendor_settings from runtime resume routine, since they are already saved in "struct rtsx_pcr".
- Move variable assignments to the top of the functions.
---
v6:
v5:
- No change.
v4:
- Move variable assignments to the top of the functions.
v3:
v2:
- No change.
drivers/misc/cardreader/rtsx_pcr.c | 34 ++++++++---------------------- 1 file changed, 9 insertions(+), 25 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +9 -25
@@ -1660,22 +1660,17 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)static int __maybe_unused rtsx_pci_suspend (struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; - -cancel_delayed_work (&pcr->carddet_work); +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); -device_wakeup_disable (dev_d); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1683,15 +1678,12 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)static int __maybe_unused rtsx_pci_resume (struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;int ret =0 ;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -mutex_lock (&pcr->pcr_mutex); ret =rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 );
@@ -1711,13 +1703,11 @@ static int __maybe_unused rtsx_pci_resume(struct device *dev_d)static void rtsx_pci_shutdown (struct pci_dev *pcidev) { -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr;rtsx_pci_power_off (pcr,HOST_ENTER_S1 );pci_disable_device (pcidev);
@@ -1756,11 +1746,8 @@ static int rtsx_pci_runtime_idle(struct device *device)static int rtsx_pci_runtime_suspend (struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; - - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (device,"--> %s\n" , __func__);
@@ -1786,9 +1773,6 @@ static int rtsx_pci_runtime_resume(struct device *device)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 ); -if (pcr->ops->fetch_vendor_settings) - pcr->ops->fetch_vendor_settings (pcr); -rtsx_pci_init_hw (pcr);if (pcr->slots[RTSX_SD_CARD ].p_dev !=NULL ) {
Signature · 1 line
2.33.1
RE: [PATCH v6 3/4] misc: rtsx: Cleanup power management ops
Quoted 19 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Tuesday, January 25, 2022 1:50 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Christophe JAILLET <[email protected]>; Yang Li <[email protected]>; [email protected]
Subject: [PATCH v6 3/4] misc: rtsx: Cleanup power management ops- Use
cancel_delayed_work_syncto ensure there's no race withcarddet_work.- Remove
device_wakeup_disableto save some CPU cycles. If the device really has ACPI_DSWthen the wakeup should be disabled in probe routine.
Quoted 6 lines
- Remove
fetch_vendor_settingsfrom runtime resume routine, since they are already saved in "structrtsx_pcr".- Move variable assignments to the top of the functions.
Cc Ricky WU <[email protected]>
Quoted 107 lines
Signed-off-by Kai-Heng Feng <[email protected]>---
v6:
v5:
- No change.v4:
- Move variable assignments to the top of the functions.v3:
v2:
- No change.drivers/misc/cardreader/rtsx_pcr.c | 34 ++++++++---------------------- 1 file changed, 9 insertions(+), 25 deletions(-)drivers/misc/cardreader/rtsx_pcr.c +3
-8@@ -1660,22 +1660,17 @@ static void rtsx_pci_remove(struct pci_dev *pcidev) static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) {struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; - -cancel_delayed_work (&pcr->carddet_work); +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); -device_wakeup_disable (dev_d); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }@@ -1683,15 +1678,12 @@ static int __maybe_unused
rtsx_pci_suspend(struct device *dev_d)static int__maybe_unusedrtsx_pci_resume(struct device *dev_d){drivers/misc/cardreader/rtsx_pcr.c +2
-6struct pci_dev *pcidev =to_pci_dev (dev_d); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;int ret =0 ;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; -mutex_lock (&pcr->pcr_mutex); ret = rtsx_pci_write_register(pcr, HOST_SLEEP_STATE, 0x03, 0x00); @@ -1711,13 +1703,11 @@ static int __maybe_unused rtsx_pci_resume(structdevice
*dev_d)static void
rtsx_pci_shutdown(struct pci_dev *pcidev){drivers/misc/cardreader/rtsx_pcr.c +4
-12-struct pcr_handle *handle; -struct rtsx_pcr *pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr;rtsx_pci_power_off (pcr,HOST_ENTER_S1 );pci_disable_device (pcidev);@@ -1756,11 +1746,8 @@ static int rtsx_pci_runtime_idle(struct device *device) static int rtsx_pci_runtime_suspend(struct device *device) {struct pci_dev *pcidev =to_pci_dev (device); -struct pcr_handle *handle; -struct rtsx_pcr *pcr; - - handle =pci_get_drvdata (pcidev); - pcr = handle->pcr; +struct pcr_handle *handle =pci_get_drvdata (pcidev); +struct rtsx_pcr *pcr = handle->pcr;dev_dbg (device,"--> %s\n" , __func__);@@ -1786,9 +1773,6 @@ static int rtsx_pci_runtime_resume(struct device *device)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 ); -if (pcr->ops->fetch_vendor_settings) - pcr->ops->fetch_vendor_settings (pcr); -rtsx_pci_init_hw (pcr);if (pcr->slots[RTSX_SD_CARD].p_dev != NULL) {
--
2.33.1
PATCH v6 4/4 misc: rtsx: Quiesce rts5249 on system suspend
In reply to Kai-Heng FengSet more registers in force_power_down callback to avoid S3 wakeup from hotplugging cards.
This is originally written by Ricky WU.
---
v6:
v5:
v4:
v3:
v2:
- No change.
drivers/misc/cardreader/rtl8411.c | 2 +- drivers/misc/cardreader/rts5209.c | 2 +- drivers/misc/cardreader/rts5228.c | 2 +- drivers/misc/cardreader/rts5229.c | 2 +- drivers/misc/cardreader/rts5249.c | 31 ++++++++++++++++++++++++++++-- drivers/misc/cardreader/rts5261.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 14 +++++++------- drivers/misc/cardreader/rtsx_pcr.h | 1 + include/linux/rtsx_pci.h | 2 +- 9 files changed, 43 insertions(+), 15 deletions(-)
drivers/misc/cardreader/rtl8411.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -74,7 +74,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); - pcr->rtd3_en =rtsx_reg_to_rtd3_uhsii (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)) pcr->extra_caps |=EXTRA_CAPS_NO_MMC ;
@@ -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, };
drivers/misc/cardreader/rts5261.c +1 -1
@@ -91,7 +91,7 @@ static void rtsx5261_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_3v3 =rts5261_reg_to_sd30_drive_sel_3v3 (reg); } -static void rts5261_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rts5261_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/rtsx_pcr.c +7 -7
@@ -1086,7 +1086,7 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr) {/* Set relink_time to 0 */ rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,MASK_8_BIT_DEF ,0 );
@@ -1100,7 +1100,7 @@ static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)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) +static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 pm_state,bool runtime) {if (pcr->ops->turn_off_led) pcr->ops->turn_off_led (pcr);
@@ -1112,9 +1112,9 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 , pm_state);if (pcr->ops->force_power_down) - pcr->ops->force_power_down (pcr, pm_state); + pcr->ops->force_power_down (pcr, pm_state, runtime);else -rtsx_base_force_power_down (pcr, pm_state); +rtsx_base_force_power_down (pcr); }void rtsx_pci_enable_ocp (struct rtsx_pcr *pcr)
@@ -1669,7 +1669,7 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , false);mutex_unlock (&pcr->pcr_mutex);return 0 ;
@@ -1708,7 +1708,7 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -rtsx_pci_power_off (pcr,HOST_ENTER_S1 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S1 , false);pci_disable_device (pcidev);free_irq (pcr->irq, (void *)pcr);
@@ -1754,7 +1754,7 @@ static int rtsx_pci_runtime_suspend(struct device *device)cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , true);mutex_unlock (&pcr->pcr_mutex);
drivers/misc/cardreader/rtsx_pcr.h +1 -0
@@ -25,6 +25,7 @@#define REG_EFUSE_POWEROFF 0x00#define RTS5250_CLK_CFG3 0xFF79#define RTS525A_CFG_MEM_PD 0xF0 +#define RTS524A_AUTOLOAD_CFG1 0xFF7C#define RTS524A_PM_CTRL3 0xFF7E#define RTS525A_BIOS_CFG 0xFF2D#define RTS525A_LOAD_BIOS_FLAG 0x01
include/linux/rtsx_pci.h +1 -1
@@ -1095,7 +1095,7 @@ struct pcr_ops {unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);int (*conv_clk_and_div_n)(int clk,int dir);void (*fetch_vendor_settings)(struct rtsx_pcr *pcr); -void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state); +void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state,bool runtime);void (*stop_cmd)(struct rtsx_pcr *pcr);void (*set_aspm)(struct rtsx_pcr *pcr,bool enable);
Signature · 1 line
2.33.1
RE: [PATCH v6 4/4] misc: rtsx: Quiesce rts5249 on system suspend
Quoted 13 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Tuesday, January 25, 2022 1:50 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Yang Li <[email protected]>; Christophe JAILLET <[email protected]>; [email protected]
Subject: [PATCH v6 4/4] misc: rtsx: Quiesce rts5249 on system suspendSet more registers in
force_power_downcallback to avoid S3 wakeup from hotplugging cards.
Quoted 6 lines
This is originally written by Ricky WU.
Link:
https://lore.kernel.org/lkml/[email protected]
m/
Cc: Ricky WU <[email protected]>
Quoted 264 lines
Signed-off-by Kai-Heng Feng <[email protected]>---
v6:
v5:
v4:
v3:
v2:
- No change.drivers/misc/cardreader/rtl8411.c | 2 +- drivers/misc/cardreader/rts5209.c | 2 +- drivers/misc/cardreader/rts5228.c | 2 +- drivers/misc/cardreader/rts5229.c | 2 +- drivers/misc/cardreader/rts5249.c | 31 ++++++++++++++++++++++++++++-- drivers/misc/cardreader/rts5261.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 14 +++++++------- drivers/misc/cardreader/rtsx_pcr.h | 1 + include/linux/rtsx_pci.h | 2 +- 9 files changed, 43 insertions(+), 15 deletions(-)drivers/misc/cardreader/rtl8411.c +2
-1@@ -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); } diff --git
a/drivers/misc/cardreader/rts5209.cb/drivers/misc/cardreader/rts5209.cindex29f5414072bf1..52b0a476ba51f100644drivers/misc/cardreader/rts5209.c +2
-1@@ -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); } diff --git
a/drivers/misc/cardreader/rts5228.cb/drivers/misc/cardreader/rts5228.cindexffc128278613b..ffe3afbf8bfed100644drivers/misc/cardreader/rts5228.c +2
-1@@ -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); diff --git
a/drivers/misc/cardreader/rts5229.cb/drivers/misc/cardreader/rts5229.c
indexc748eaf1ec1f9..b0edd8006d52f100644drivers/misc/cardreader/rts5229.c +2
-1@@ -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); } diff --git
a/drivers/misc/cardreader/rts5249.cb/drivers/misc/cardreader/rts5249.cindex53f3a1f45c4a7..91d240dd68faa100644drivers/misc/cardreader/rts5249.c +2
-1@@ -74,7 +74,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); - pcr->rtd3_en =rtsx_reg_to_rtd3_uhsii (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))
pcr->extra_caps|=EXTRA_CAPS_NO_MMC; @@ -143,6 +144,27
@@ static intrts5249_init_from_hw(struct rtsx_pcr *pcr)drivers/misc/cardreader/rts5249.c +4
-0return 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);
drivers/misc/cardreader/rts5249.c +1
-0+ rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 2, MASK_8_BIT_DEF,0);
drivers/misc/cardreader/rts5249.c +14
-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);drivers/misc/cardreader/rts5249.c +6
-1+} +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 structpcr_opsrts524a_pcr_ops= {drivers/misc/cardreader/rts5249.c +2
-0.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, };drivers/misc/cardreader/rts5261.c +2
-1@@ -91,7 +91,7 @@ static void rtsx5261_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_3v3 = rts5261_reg_to_sd30_drive_sel_3v3(reg); } -static void rts5261_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rts5261_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); diff --git
a/drivers/misc/cardreader/rtsx_pcr.cb/drivers/misc/cardreader/rtsx_pcr.c
index3c97d3b50456e..1cb6425e83697100644drivers/misc/cardreader/rtsx_pcr.c +1
-1@@ -1086,7 +1086,7 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr) {/* Set relink_time to 0 */ rtsx_pci_write_register(pcr,
AUTOLOAD_CFG_BASE+ 1,MASK_8_BIT_DEF,
0); @@ -1100,7 +1100,7 @@ static voidrtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)
rtsx_pci_write_register(pcr, FPDCTL,ALL_POWER_DOWN,ALL_POWER_DOWN); }-static void
__maybe_unusedrtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)drivers/misc/cardreader/rtsx_pcr.c +4
-2+static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 +pm_state,bool runtime) {if (pcr->ops->turn_off_led) pcr->ops->turn_off_led (pcr);@@ -1112,9 +1112,9 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state) rtsx_pci_write_register(pcr, HOST_SLEEP_STATE, 0x03, pm_state);if (pcr->ops->force_power_down) - pcr->ops->force_power_down (pcr, pm_state); + pcr->ops->force_power_down (pcr, pm_state, runtime);else -rtsx_base_force_power_down (pcr, pm_state); +rtsx_base_force_power_down (pcr); }void
rtsx_pci_enable_ocp(struct rtsx_pcr *pcr)@@ -1669,7 +1669,7 @@
static int__maybe_unusedrtsx_pci_suspend(struct device *dev_d)drivers/misc/cardreader/rtsx_pcr.c +2
-2mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , false);mutex_unlock (&pcr->pcr_mutex);return 0 ;@@ -1708,7 +1708,7 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)dev_dbg (&(pcidev->dev),"--> %s\n" , __func__); -rtsx_pci_power_off (pcr,HOST_ENTER_S1 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S1 , false);pci_disable_device (pcidev);drivers/misc/cardreader/rtsx_pcr.c +1
-1free_irq (pcr->irq, (void *)pcr);@@ -1754,7 +1754,7 @@ static int rtsx_pci_runtime_suspend(struct device *device)cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , true);mutex_unlock (&pcr->pcr_mutex);drivers/misc/cardreader/rtsx_pcr.h +1
-0@@ -25,6 +25,7 @@#define REG_EFUSE_POWEROFF 0x00#define RTS5250_CLK_CFG3 0xFF79#define RTS525A_CFG_MEM_PD 0xF0 +#define RTS524A_AUTOLOAD_CFG1 0xFF7C#define RTS524A_PM_CTRL3 0xFF7E#define RTS525A_BIOS_CFG 0xFF2D#define RTS525A_LOAD_BIOS_FLAG 0x01include/linux/rtsx_pci.h index renamed from include/linux/rtsx_pci.h +0
-0
89b7d34e25b63..3d780b44e678a100644include/linux/rtsx_pci.h +1
-1@@ -1095,7 +1095,7 @@ struct pcr_ops {unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);int (*conv_clk_and_div_n)(int clk,int dir);void (*fetch_vendor_settings)(struct rtsx_pcr *pcr); -void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state); +void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state,bool runtime);void (*stop_cmd)(struct rtsx_pcr *pcr);void (*set_aspm)(struct
rtsx_pcr*pcr, bool enable);
--
2.33.1
Quoted 15 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Tuesday, January 25, 2022 1:50 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; Kai-Heng Feng <[email protected]>; Ricky WU <[email protected]>; Thomas Hebb <[email protected]>; [email protected]; [email protected]
Subject: [PATCH v6 1/4] mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PMCommit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver,rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.
Quoted 4 lines
So use those helpers at right places to properly manage runtime PM.
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>
Quoted 225 lines
Signed-off-by Kai-Heng Feng <[email protected]>---
v6:
- Change the auto suspend delay to 200ms as Realtek suggested.v5:
- Revert back to v3 as Realtek suggested.v4:
- Decrease the autosuspend delay to 200ms for more power saving.v3:
v2:
- No change.drivers/mmc/host/rtsx_pci_sdmmc.c | 44 +++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 11 deletions(-)drivers/mmc/host/rtsx_pci_sdmmc.c +20
-0@@ -806,6 +806,7 @@ static void sd_request(struct work_struct *work)struct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; +struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;@@ -822,6 +823,7 @@ static void sd_request(struct work_struct *work) }mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);@@ -858,6 +860,8 @@ static void sd_request(struct work_struct *work) data->bytes_xfered = data->blocks * data->blksz; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:@@ -1080,6 +1084,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;if (host->eject)return ;@@ -1088,6 +1093,7 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) return;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);@@ -1121,6 +1127,8 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) rtsx_pci_switch_clock(pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); mutex_unlock(&pcr->pcr_mutex); }@@ -1128,6 +1136,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;@@ -1135,6 +1144,7 @@ static int sdmmc_get_ro(struct mmc_host *mmc)return -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);@@ -1144,6 +1154,8 @@ static int sdmmc_get_ro(struct mmc_host *mmc)if (val &SD_WRITE_PROTECT ) ro =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;@@ -1153,6 +1165,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;@@ -1160,6 +1173,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc)return cd;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);@@ -1169,6 +1183,8 @@ static int sdmmc_get_cd(struct mmc_host *mmc)if (val &SD_EXIST ) cd =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;@@ -1251,6 +1267,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;@@ -1265,6 +1282,7 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);@@ -1294,6 +1312,8 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);drivers/mmc/host/rtsx_pci_sdmmc.c +4
-0return err;@@ -1303,6 +1323,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)@@ -1313,6 +1334,7 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode)return err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);@@ -1345,6 +1367,8 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);drivers/mmc/host/rtsx_pci_sdmmc.c +6
-11return err;@@ -1495,12 +1519,12 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)realtek_init_host (host ); -if (pcr->rtd3_en) { -pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); -pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev); - } - +pm_runtime_no_callbacks (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,200 ); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_use_autosuspend (&pdev->dev);mmc_add_host (mmc);@@ -1521,11 +1545,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) pcr->slots[RTSX_SD_CARD].card_event = NULL; mmc = host->mmc; -if (pcr->rtd3_en) { -pm_runtime_dont_use_autosuspend (&pdev->dev); -pm_runtime_disable (&pdev->dev); - } -cancel_work_sync (&host->work);drivers/mmc/host/rtsx_pci_sdmmc.c +3
-0mutex_lock (&host->host_mutex);@@ -1548,6 +1567,9 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) flush_work(&host->work); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc);dev_dbg(&(pdev->dev),
--
2.33.1
Quoted 11 lines · Kai-Heng Feng
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver,rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.So use those helpers at right places to properly manage runtime PM.
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>
The runtime PM reference counting for the mmc host device is managed by the mmc core. Have a look at __mmc_claim_host() and mmc_release_host().
In other words, the runtime PM reference counting should not be needed in the mmc host driver, unless there are some specific cases, like for example during ->probe|remove().
So perhaps it's only the changes in the ->probe|remove() functions that you need to fix the problems? No?
[...]
Kind regards
Uffe
Quoted 18 lines · Ulf Hansson
Quoted 11 lines · Kai-Heng Feng
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver,rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.So use those helpers at right places to properly manage runtime PM.
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>The runtime PM reference counting for the mmc host device is managed by the mmc core. Have a look at
__mmc_claim_host()andmmc_release_host().
Quoted 6 lines
In other words, the runtime PM reference counting should not be needed in the mmc host driver, unless there are some specific cases, like for example during ->probe|remove().
So perhaps it's only the changes in the ->probe|remove() functions that you need to fix the problems? No?
Yes you are right. Let me send a patch to remove redundant PM helpers from this patch.
Kai-Heng
Quoted 5 lines
[...]
Kind regards
Uffe
Quoted 24 lines · Kai-Heng Feng
Quoted 22 lines · Ulf Hansson
Quoted 11 lines · Kai-Heng Feng
Commit
5b4258f6721f("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver,rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.So use those helpers at right places to properly manage runtime PM.
Fixes 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM")Cc Ricky WU <[email protected]>Signed-off-by Kai-Heng Feng <[email protected]>The runtime PM reference counting for the mmc host device is managed by the mmc core. Have a look at
__mmc_claim_host()andmmc_release_host().In other words, the runtime PM reference counting should not be needed in the mmc host driver, unless there are some specific cases, like for example during ->probe|remove().
Quoted 5 lines
Quoted 2 lines
So perhaps it's only the changes in the ->probe|remove() functions that you need to fix the problems? No?
Yes you are right. Let me send a patch to remove redundant PM helpers from this patch.
Ohh, I didn't know that Greg already queued this up. Seems like I don't get more than one week to review. :-)
Alright, I will look at your new patch then.
Kind regards
Uffe
PATCH 3/4 misc: rtsx: Cleanup power management ops
In reply to Kai-Heng Feng- Use cancel_delayed_work_sync to ensure there's no race with carddet_work.
- Remove device_wakeup_disable to save some CPU cycles. If the device really has ACPI _DSW then the wakeup should be disabled in probe routine.
- Remove fetch_vendor_settings from runtime resume routine, since they are already saved in "struct rtsx_pcr".
--- drivers/misc/cardreader/rtsx_pcr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +1 -6
@@ -1671,14 +1671,12 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -cancel_delayed_work (&pcr->carddet_work); +cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex);rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); -device_wakeup_disable (dev_d); -mutex_unlock (&pcr->pcr_mutex);return 0 ; }
@@ -1791,9 +1789,6 @@ static int rtsx_pci_runtime_resume(struct device *device)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 ,0x00 ); -if (pcr->ops->fetch_vendor_settings) - pcr->ops->fetch_vendor_settings (pcr); -rtsx_pci_init_hw (pcr);if (pcr->slots[RTSX_SD_CARD ].p_dev !=NULL ) {
Signature · 1 line
2.33.1
PATCH 4/4 misc: rtsx: Quiesce rts5249 on system suspend
In reply to Kai-Heng FengSet more registers in force_power_down callback to avoid S3 wakeup from hotplugging cards.
This is originally written by Ricky WU.
--- drivers/misc/cardreader/rtl8411.c | 2 +- drivers/misc/cardreader/rts5209.c | 2 +- drivers/misc/cardreader/rts5228.c | 2 +- drivers/misc/cardreader/rts5229.c | 2 +- drivers/misc/cardreader/rts5249.c | 31 ++++++++++++++++++++++++++++-- drivers/misc/cardreader/rts5261.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 14 +++++++------- drivers/misc/cardreader/rtsx_pcr.h | 1 + include/linux/rtsx_pci.h | 2 +- 9 files changed, 43 insertions(+), 15 deletions(-)
drivers/misc/cardreader/rtl8411.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -74,7 +74,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); - pcr->rtd3_en =rtsx_reg_to_rtd3_uhsii (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)) pcr->extra_caps |=EXTRA_CAPS_NO_MMC ;
@@ -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, };
drivers/misc/cardreader/rts5261.c +1 -1
@@ -91,7 +91,7 @@ static void rtsx5261_fetch_vendor_settings(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_3v3 =rts5261_reg_to_sd30_drive_sel_3v3 (reg); } -static void rts5261_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rts5261_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/rtsx_pcr.c +7 -7
@@ -1086,7 +1086,7 @@ static void rtsx_pm_power_saving(struct rtsx_pcr *pcr)rtsx_comm_pm_power_saving (pcr); } -static void rtsx_base_force_power_down (struct rtsx_pcr *pcr,u8 pm_state) +static void rtsx_base_force_power_down (struct rtsx_pcr *pcr) {/* Set relink_time to 0 */ rtsx_pci_write_register (pcr,AUTOLOAD_CFG_BASE +1 ,MASK_8_BIT_DEF ,0 );
@@ -1100,7 +1100,7 @@ static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)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) +static void __maybe_unused rtsx_pci_power_off (struct rtsx_pcr *pcr,u8 pm_state,bool runtime) {if (pcr->ops->turn_off_led) pcr->ops->turn_off_led (pcr);
@@ -1112,9 +1112,9 @@ static void __maybe_unused rtsx_pci_power_off(struct rtsx_pcr *pcr, u8 pm_state)rtsx_pci_write_register (pcr,HOST_SLEEP_STATE ,0x03 , pm_state);if (pcr->ops->force_power_down) - pcr->ops->force_power_down (pcr, pm_state); + pcr->ops->force_power_down (pcr, pm_state, runtime);else -rtsx_base_force_power_down (pcr, pm_state); +rtsx_base_force_power_down (pcr); }void rtsx_pci_enable_ocp (struct rtsx_pcr *pcr)
@@ -1675,7 +1675,7 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d)mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , false);mutex_unlock (&pcr->pcr_mutex);return 0 ;
@@ -1719,7 +1719,7 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev) handle =pci_get_drvdata (pcidev); pcr = handle->pcr; -rtsx_pci_power_off (pcr,HOST_ENTER_S1 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S1 , false);pci_disable_device (pcidev);free_irq (pcr->irq, (void *)pcr);
@@ -1770,7 +1770,7 @@ static int rtsx_pci_runtime_suspend(struct device *device)cancel_delayed_work_sync (&pcr->carddet_work);mutex_lock (&pcr->pcr_mutex); -rtsx_pci_power_off (pcr,HOST_ENTER_S3 ); +rtsx_pci_power_off (pcr,HOST_ENTER_S3 , true);mutex_unlock (&pcr->pcr_mutex);
drivers/misc/cardreader/rtsx_pcr.h +1 -0
@@ -25,6 +25,7 @@#define REG_EFUSE_POWEROFF 0x00#define RTS5250_CLK_CFG3 0xFF79#define RTS525A_CFG_MEM_PD 0xF0 +#define RTS524A_AUTOLOAD_CFG1 0xFF7C#define RTS524A_PM_CTRL3 0xFF7E#define RTS525A_BIOS_CFG 0xFF2D#define RTS525A_LOAD_BIOS_FLAG 0x01
include/linux/rtsx_pci.h +1 -1
@@ -1095,7 +1095,7 @@ struct pcr_ops {unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr);int (*conv_clk_and_div_n)(int clk,int dir);void (*fetch_vendor_settings)(struct rtsx_pcr *pcr); -void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state); +void (*force_power_down)(struct rtsx_pcr *pcr,u8 pm_state,bool runtime);void (*stop_cmd)(struct rtsx_pcr *pcr);void (*set_aspm)(struct rtsx_pcr *pcr,bool enable);
Signature · 1 line
2.33.1