From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD6A5C433E0 for ; Tue, 26 May 2020 19:17:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8377720776 for ; Tue, 26 May 2020 19:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520629; bh=WF515+u3fTVSxI5Vy7kdHYf2rPsuGfWzFa+WZRzo3+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mqVqMhM5AL2Q/XHtd7R27hX/B3Kgl5/LGr/Waa0/U6Mhk8Q9/fTyn489oCIYU4gE5 RaTK4ilvaya2g4zXulZ3sA2V3Cx0/UV7A8IgmLf+5eQ4GHOwSNknWLQlnnpA5y35uE RwGJWYQljpzt9JK3tQcvlAdqO/fgSI1FObZL8M3g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404383AbgEZTO5 (ORCPT ); Tue, 26 May 2020 15:14:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:46186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392088AbgEZTO4 (ORCPT ); Tue, 26 May 2020 15:14:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 348D420888; Tue, 26 May 2020 19:14:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520495; bh=WF515+u3fTVSxI5Vy7kdHYf2rPsuGfWzFa+WZRzo3+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tdzhZtzmxfJemTIA10k2AwYpfn31qFi+TiaODyWOOLaWZUzpfTgxNUgA7dk/OIxlt gtCNqhXosPiD5mjvsGzMYlSQdHLi4LIeA3pf2bu3XdIWhk19XC7FVcD/2H55QZLwji 2bmSTNA6RNsqp/v410pa53od9RuZ6JOeMWj103XM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Klaus Doth Subject: [PATCH 5.6 101/126] misc: rtsx: Add short delay after exit from ASPM Date: Tue, 26 May 2020 20:53:58 +0200 Message-Id: <20200526183946.219228178@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183937.471379031@linuxfoundation.org> References: <20200526183937.471379031@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Klaus Doth 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 Cc: stable Link: https://lore.kernel.org/r/4434eaa7-2ee3-a560-faee-6cee63ebd6d4@doth.eu Signed-off-by: Greg Kroah-Hartman --- drivers/misc/cardreader/rtsx_pcr.c | 3 +++ 1 file changed, 3 insertions(+) --- 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_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);