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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 35C0CC3815B for ; Fri, 17 Apr 2020 18:30:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11F362223F for ; Fri, 17 Apr 2020 18:30:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="Vp63hBEt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbgDQSaD (ORCPT ); Fri, 17 Apr 2020 14:30:03 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:18512 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727840AbgDQSaC (ORCPT ); Fri, 17 Apr 2020 14:30:02 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 17 Apr 2020 11:29:02 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 17 Apr 2020 11:30:02 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 17 Apr 2020 11:30:02 -0700 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 17 Apr 2020 18:30:02 +0000 Received: from [10.2.171.241] (10.124.1.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 17 Apr 2020 18:30:00 +0000 Subject: Re: [PATCH v2 1/2] sdhci: tegra: Implement Tegra specific set_timeout callback To: Ulf Hansson CC: Naresh Kamboju , Greg Kroah-Hartman , Sasha Levin , Adrian Hunter , "(Exiting) Baolin Wang" , Kate Stewart , Thomas Gleixner , Bradley Bolen , Thierry Reding , Jon Hunter , "Aniruddha Tvs Rao" , linux-tegra , open list , "linux-mmc@vger.kernel.org" , , linux- stable References: <1583886030-11339-1-git-send-email-skomatineni@nvidia.com>

<753ec108-858c-660e-af0a-f57922134609@nvidia.com> <512441d1-a9ba-912f-ed2e-46edad22278b@nvidia.com> From: Sowjanya Komatineni Message-ID: <13223820-12aa-6ed6-45e1-e7a901155d38@nvidia.com> Date: Fri, 17 Apr 2020 11:29:59 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To DRHQMAIL107.nvidia.com (10.27.9.16) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1587148142; bh=OHgh/M4k8j/xMO4UFbtY4yF+8SoYkg3ofzTWmXSe2xk=; h=X-PGP-Universal:Subject:To:CC:References:From:Message-ID:Date: User-Agent:MIME-Version:In-Reply-To:X-Originating-IP: X-ClientProxiedBy:Content-Type:Content-Transfer-Encoding: Content-Language; b=Vp63hBEtXY9UN245O7tUVQK+RS016qvlizEhnyCdcGlX4qe4hkkguBTbKwvA2ndW2 kVjEKUzb/ZWjyJYj/oR9t8sFPI3g0Jwho9pnKRmCBRWh6Qo0XgE6403jcJCLVBbwGH 1V3IP3DuHw7FYDSrz0h6zk0zT9Rv6DyT1ijZ6VKkxbLssWC+8GeGNZsFt29R/Tefi8 K4sxLHnOl1y8ecQpfMNcuTMFdIkWSvSIdi38xXHu2uNDpfi77rC5q10HuSw0hStjAU QijjYMtsYe7tR9OBd8L8WYdAfsQL3ZKbgoXy6Ht8WWrLf9f51TM1U5QaRJhwrEuH5l geSW2OD5Rscng== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org On 4/17/20 1:04 AM, Ulf Hansson wrote: > External email: Use caution opening links or attachments > > > On Thu, 16 Apr 2020 at 21:39, Sowjanya Komatineni > wrote: >> >> On 4/16/20 9:29 AM, Sowjanya Komatineni wrote: >>> On 4/16/20 3:59 AM, Ulf Hansson wrote: >>>> External email: Use caution opening links or attachments >>>> >>>> >>>> On Wed, 15 Apr 2020 at 19:55, Naresh Kamboju >>>> wrote: >>>>> On Fri, 13 Mar 2020 at 06:41, Sowjanya Komatineni >>>>> wrote: >>>>>> Tegra host supports HW busy detection and timeouts based on the >>>>>> count programmed in SDHCI_TIMEOUT_CONTROL register and max busy >>>>>> timeout it supports is 11s in finite busy wait mode. >>>>>> >>>>>> Some operations like SLEEP_AWAKE, ERASE and flush cache through >>>>>> SWITCH commands take longer than 11s and Tegra host supports >>>>>> infinite HW busy wait mode where HW waits forever till the card >>>>>> is busy without HW timeout. >>>>>> >>>>>> This patch implements Tegra specific set_timeout sdhci_ops to allow >>>>>> switching between finite and infinite HW busy detection wait modes >>>>>> based on the device command expected operation time. >>>>>> >>>>>> Signed-off-by: Sowjanya Komatineni >>>>>> --- >>>>>> drivers/mmc/host/sdhci-tegra.c | 31 +++++++++++++++++++++++++++++= ++ >>>>>> 1 file changed, 31 insertions(+) >>>>>> >>>>>> diff --git a/drivers/mmc/host/sdhci-tegra.c >>>>>> b/drivers/mmc/host/sdhci-tegra.c >>>>>> index a25c3a4..fa8f6a4 100644 >>>>>> --- a/drivers/mmc/host/sdhci-tegra.c >>>>>> +++ b/drivers/mmc/host/sdhci-tegra.c >>>>>> @@ -45,6 +45,7 @@ >>>>>> #define SDHCI_TEGRA_CAP_OVERRIDES_DQS_TRIM_SHIFT 8 >>>>>> >>>>>> #define SDHCI_TEGRA_VENDOR_MISC_CTRL 0x120 >>>>>> +#define SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT BIT(0) >>>>>> #define SDHCI_MISC_CTRL_ENABLE_SDR104 0x8 >>>>>> #define SDHCI_MISC_CTRL_ENABLE_SDR50 0x10 >>>>>> #define SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300 0x20 >>>>>> @@ -1227,6 +1228,34 @@ static u32 sdhci_tegra_cqhci_irq(struct >>>>>> sdhci_host *host, u32 intmask) >>>>>> return 0; >>>>>> } >>>>>> >>>>>> +static void tegra_sdhci_set_timeout(struct sdhci_host *host, >>>>>> + struct mmc_command *cmd) >>>>>> +{ >>>>>> + u32 val; >>>>>> + >>>>>> + /* >>>>>> + * HW busy detection timeout is based on programmed data >>>>>> timeout >>>>>> + * counter and maximum supported timeout is 11s which may >>>>>> not be >>>>>> + * enough for long operations like cache flush, sleep >>>>>> awake, erase. >>>>>> + * >>>>>> + * ERASE_TIMEOUT_LIMIT bit of VENDOR_MISC_CTRL register allo= ws >>>>>> + * host controller to wait for busy state until the card is >>>>>> busy >>>>>> + * without HW timeout. >>>>>> + * >>>>>> + * So, use infinite busy wait mode for operations that may >>>>>> take >>>>>> + * more than maximum HW busy timeout of 11s otherwise use >>>>>> finite >>>>>> + * busy wait mode. >>>>>> + */ >>>>>> + val =3D sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL); >>>>>> + if (cmd && cmd->busy_timeout >=3D 11 * HZ) >>>>>> + val |=3D SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; >>>>>> + else >>>>>> + val &=3D ~SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; >>>>>> + sdhci_writel(host, val, SDHCI_TEGRA_VENDOR_MISC_CTRL); >>>>>> + >>>>>> + __sdhci_set_timeout(host, cmd); >>>>> kernel build on arm and arm64 architecture failed on stable-rc 4.19 >>>>> (arm), 5.4 (arm64) and 5.5 (arm64) >>>>> >>>>> drivers/mmc/host/sdhci-tegra.c: In function 'tegra_sdhci_set_timeout'= : >>>>> drivers/mmc/host/sdhci-tegra.c:1256:2: error: implicit declaration of >>>>> function '__sdhci_set_timeout'; did you mean >>>>> 'tegra_sdhci_set_timeout'? [-Werror=3Dimplicit-function-declaration] >>>>> __sdhci_set_timeout(host, cmd); >>>>> ^~~~~~~~~~~~~~~~~~~ >>>>> tegra_sdhci_set_timeout >>>>> >>>>> Full build log, >>>>> https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc= -5.5/DISTRO=3Dlkft,MACHINE=3Dam57xx-evm,label=3Ddocker-lkft/83/consoleText >>>>> >>>>> https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc= -5.4/DISTRO=3Dlkft,MACHINE=3Djuno,label=3Ddocker-lkft/158/consoleText >>>>> >>>>> https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc= -4.19/DISTRO=3Dlkft,MACHINE=3Dam57xx-evm,label=3Ddocker-lkft/511/consoleTex= t >>>>> >>>>> >>>>> - Naresh >>>> Thanks for reporting! What a mess. >>>> >>>> It turns out that the commit that was queued for stable that is >>>> causing the above errors, also requires another commit. >>>> >>>> The commit that was queued: >>>> 5e958e4aacf4 ("sdhci: tegra: Implement Tegra specific set_timeout >>>> callback") >>>> >>>> The additional commit needed (which was added in v5.6-rc1): >>>> 7d76ed77cfbd ("mmc: sdhci: Refactor sdhci_set_timeout()") >>>> >>>> However, the above commit needs a manual backport (quite trivial, but >>>> still) for the relevant stable kernels, to allow it to solve the build >>>> problems. >>>> >>>> Greg, Sasha - I suggest you to drop the offending commit from the >>>> stable kernels, for now. I think it's better to let Sowjanya deal with >>>> the backports, then send them in small series instead. >>>> >>>> Kind regards >>>> Uffe >>> Hi Ufee, >>> >>> Will back-porting below commit cause any issues to other vendors? >>> >>> 7d76ed77cfbd ("mmc: sdhci: Refactor sdhci_set_timeout()") >>> >> sdhci-tegra driver in 4.19 is using same sdhci_ops for Tegra114 and >> Tegra210 and separate sdhci_ops for T210 started from 4.20. >> >> 5e958e4aacf4 ("sdhci: tegra: Implement Tegra specific set_timeout callba= ck") >> >> So above commit can't be applied to 4.19. So probably a separate patch >> need to be created to apply for 4.19 and back port above commit along >> with its dependency commit (7d76ed77cfbd ("mmc: sdhci: Refactor >> sdhci_set_timeout()") for 5.4 and 5.4. > Alright, seems reasonable. Just keep me/Adrian on cc when/if you post > the patches so we can ack them. > > Kind regards > Uffe Sure, will send patches to backport both below changes to 4.19 5e958e4aacf4 ("sdhci: tegra: Implement Tegra specific set_timeout callback") 7d76ed77cfbd ("mmc: sdhci: Refactor sdhci_set_timeout()") But on 5.5 and on 5.4.33,=C2=A0 patch "mmc: sdhci: Refactor=20 sdhci_set_timeout() already committed but not on 5.4.32 and prior. So, not sure why kbuild reported error on 5.4 and 5.5 with=20 __sdhci_set_timeout when this patch is already committed on 5.4.33=20 (26711cc7e064) and 5.5.18 (71bab39fa67d) Can you please help clarify this? drivers/mmc/host/sdhci-tegra.c: In function 'tegra_sdhci_set_timeout': drivers/mmc/host/sdhci-tegra.c:1256:2: error: implicit declaration of function '__sdhci_set_timeout'; did you mean 'tegra_sdhci_set_timeout'? [-Werror=3Dimplicit-function-declaration] __sdhci_set_timeout(host, cmd); Thanks Sowjanya