summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Doth <kdlnx@doth.eu>2020-05-22 13:56:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-27 18:48:24 +0300
commit973c9dbcc74938bcdfe4b87eec8c7d67935ad860 (patch)
treeb65420824d402a40afc7de06d89224b442870d22
parentdf94bc7197f5747f0fc2d17e2c7216e150e86669 (diff)
downloadlinux-973c9dbcc74938bcdfe4b87eec8c7d67935ad860.tar.xz
misc: rtsx: Add short delay after exit from ASPM
commit 7a839dbab1be59f5ed3b3b046de29e166784c9b4 upstream. DMA transfers to and from the SD card stall for 10 seconds and run into timeout on RTS5260 card readers after ASPM was enabled. Adding a short msleep after disabling ASPM fixes the issue on several Dell Precision 7530/7540 systems I tested. This function is only called when waking up after the chip went into power-save after not transferring data for a few seconds. The added msleep does therefore not change anything in data transfer speed or induce any excessive waiting while data transfers are running, or the chip is sleeping. Only the transition from sleep to active is affected. Signed-off-by: Klaus Doth <kdlnx@doth.eu> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/4434eaa7-2ee3-a560-faee-6cee63ebd6d4@doth.eu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/cardreader/rtsx_pcr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index 06038b325b02..55da6428ceb0 100644
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -142,6 +142,9 @@ static void rtsx_comm_pm_full_on(struct rtsx_pcr *pcr)
rtsx_disable_aspm(pcr);
+ /* Fixes DMA transfer timout issue after disabling ASPM on RTS5260 */
+ msleep(1);
+
if (option->ltr_enabled)
rtsx_set_ltr_latency(pcr, option->ltr_active_latency);