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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DB0CC4167D for ; Thu, 2 Nov 2023 11:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347115AbjKBLBj (ORCPT ); Thu, 2 Nov 2023 07:01:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346098AbjKBLBf (ORCPT ); Thu, 2 Nov 2023 07:01:35 -0400 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93158E7; Thu, 2 Nov 2023 04:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698922890; x=1730458890; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=5l/VMWQ8JdKoe9RvD9ynbrAHQ1OLi3Ln5DeIgNvmDuo=; b=E9CxEVt8X7+8RJ/5ssz/7666nSMeVsvu+/sFzmOG3YEb0Vfx49NCBVnp bS2Jr83vgG9uVf+Lxf98K8KJXvzE3x30oyLQM+XL1TO/DngqQV/9KjzVe /fL83SJWCjXxoOGKSPRaz28KAAMWfng1CfdaJa4nGZsVS3b6jBfgermp3 uviK1nUQ0fzxMZLbUy3JQLdp2mMS9S+943vlET1/nETYWL3X8imaFkkc3 UzMTjScYTC+mh/sD7kGvBA9yebYVZRePEzFolQVd3jPeChowACctjtNlC a+3VPlSXlZ9IDN3ggbcp1YFM5EH69CUBF3geuU3DeYMc9o5DpiXxI6ceH Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="1613667" X-IronPort-AV: E=Sophos;i="6.03,271,1694761200"; d="scan'208";a="1613667" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2023 04:01:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="851884348" X-IronPort-AV: E=Sophos;i="6.03,271,1694761200"; d="scan'208";a="851884348" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.252.34.206]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2023 04:01:27 -0700 Message-ID: <63e54bfd-9bb3-423b-a965-e0a9b399671c@intel.com> Date: Thu, 2 Nov 2023 13:01:22 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] mmc: cqhci: Add a quirk to clear stale TC Content-Language: en-US To: =?UTF-8?Q?Kornel_Dul=C4=99ba?= Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Ulf Hansson , Radoslaw Biernacki , Gwendal Grignou References: <20231027145623.2258723-1-korneld@chromium.org> <20231027145623.2258723-2-korneld@chromium.org> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/11/23 11:21, Kornel Dulęba wrote: > On Mon, Oct 30, 2023 at 8:31 PM Adrian Hunter wrote: >> >> On 27/10/23 17:56, Kornel Dulęba wrote: >>> This fix addresses a stale task completion event issued right after the >>> CQE recovery. As it's a hardware issue the fix is done in form of a >>> quirk. >>> >>> When error interrupt is received the driver runs recovery logic is run. >>> It halts the controller, clears all pending tasks, and then re-enables >>> it. On some platforms a stale task completion event is observed, >>> regardless of the CQHCI_CLEAR_ALL_TASKS bit being set. >>> >>> This results in either: >>> a) Spurious TC completion event for an empty slot. >>> b) Corrupted data being passed up the stack, as a result of premature >>> completion for a newly added task. >>> >>> To fix that re-enable the controller, clear task completion bits, >>> interrupt status register and halt it again. >>> This is done at the end of the recovery process, right before interrupts >>> are re-enabled. >>> >>> Signed-off-by: Kornel Dulęba >>> --- >>> drivers/mmc/host/cqhci-core.c | 42 +++++++++++++++++++++++++++++++++++ >>> drivers/mmc/host/cqhci.h | 1 + >>> 2 files changed, 43 insertions(+) >>> >>> diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c >>> index b3d7d6d8d654..e534222df90c 100644 >>> --- a/drivers/mmc/host/cqhci-core.c >>> +++ b/drivers/mmc/host/cqhci-core.c >>> @@ -1062,6 +1062,45 @@ static void cqhci_recover_mrqs(struct cqhci_host *cq_host) >>> /* CQHCI could be expected to clear it's internal state pretty quickly */ >>> #define CQHCI_CLEAR_TIMEOUT 20 >>> >>> +/* >>> + * During CQE recovery all pending tasks are cleared from the >>> + * controller and its state is being reset. >>> + * On some platforms the controller sets a task completion bit for >>> + * a stale(previously cleared) task right after being re-enabled. >>> + * This results in a spurious interrupt at best and corrupted data >>> + * being passed up the stack at worst. The latter happens when >>> + * the driver enqueues a new request on the problematic task slot >>> + * before the "spurious" task completion interrupt is handled. >>> + * To fix it: >>> + * 1. Re-enable controller by clearing the halt flag. >>> + * 2. Clear interrupt status and the task completion register. >>> + * 3. Halt the controller again to be consistent with quirkless logic. >>> + * >>> + * This assumes that there are no pending requests on the queue. >>> + */ >>> +static void cqhci_quirk_clear_stale_tc(struct cqhci_host *cq_host) >>> +{ >>> + u32 reg; >>> + >>> + WARN_ON(cq_host->qcnt); >>> + cqhci_writel(cq_host, 0, CQHCI_CTL); >>> + if ((cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT)) { >>> + pr_err("%s: cqhci: CQE failed to exit halt state\n", >>> + mmc_hostname(cq_host->mmc)); >>> + } >>> + reg = cqhci_readl(cq_host, CQHCI_TCN); >>> + cqhci_writel(cq_host, reg, CQHCI_TCN); >>> + reg = cqhci_readl(cq_host, CQHCI_IS); >>> + cqhci_writel(cq_host, reg, CQHCI_IS); >>> + >>> + /* >>> + * Halt the controller again. >>> + * This is only needed so that we're consistent across quirk >>> + * and quirkless logic. >>> + */ >>> + cqhci_halt(cq_host->mmc, CQHCI_FINISH_HALT_TIMEOUT); >>> +} >> >> Thanks a lot for tracking this down! >> >> It could be that the "un-halt" starts a task, so it would be >> better to force the "clear" to work if possible, which >> should be the case if CQE is disabled. >> >> Would you mind trying the code below? Note the increased >> CQHCI_START_HALT_TIMEOUT helps avoid trying to clear tasks >> when CQE has not halted. > > I've run a quick test and it works just fine. Thank you! > Your approach looks better than what I proposed, since as you > mentioned, doing it like this avoids some weird side effects, e.g. DMA > to freed memory. > Do you plan to include it in the other series that you posted yesterday? Yes I will do that