From patchwork Wed Oct 19 21:54:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 5860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp554740wrs; Wed, 19 Oct 2022 15:03:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5v5QJSRuq6+lDH94Y5J5oEQF3Sgq/7AKyD+CoNFZKtAWKPPRDACZd0pRp2EzyzCeMbb0n+ X-Received: by 2002:a17:902:d4c5:b0:183:6e51:503 with SMTP id o5-20020a170902d4c500b001836e510503mr10540804plg.84.1666217019978; Wed, 19 Oct 2022 15:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666217019; cv=none; d=google.com; s=arc-20160816; b=aBCASnbMPhEDFtmIiDZOHe2SAW1/8DsTh7oLwv3Oqhc4jQjpLwgTLDYhENgDjKb9Om UqUV7E0iHCgMHsDVcOMB2mPe8lAddtjiKJr6B+2yU6BRokYHPA5nauudzJjsgjrhxBvU bZRGeyEGz5Ll8I1k29c903oThvM7CROLtKSFSiJ44SseiPmzjxX/a75klOcEfRh7Y2YZ kUz/WHOyqIQ+X9xwp8bB8hZZtnFKhmOjtTE2PBT0DX4aLUhmlkD0W7HAEMGZ15yja5JA avSMbsWGKoLGjcMis6IcwI/64gextokIaIpXlCSaC0XoeNzuw653w4n0dZFQWdbAZkki wb+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NYKDq3nQvcWGiMSg+hxeuum9J23X3dmFHWVwl7YaDYc=; b=I6RXRaKtmDkw9t72Q905KL7A7xHh9vVenU4sbBlsqwU73u0zPONLU/Gp/cP4cpf13J //a3PPSRAT255kJkrHm+JjIq7m+ewFY4JfEBntvfJGRFRf6oW86KGjK52i+D96WYdMc1 i7mS5EHc9qZaEbJQoKe6KUOAkEtM9hEC2TL3F5K55Q3Nzw+TbE9eEJT7V5InuOLjYDsI XWjb+iS87zbiEKToiiSFnE2FAO5yqCYT7M/cX7Zl8Rfd4Z8/lrOJQJshn4gtc4vTGi6p RBtIa3+MvCFrwBeDolEtB3VxXAXAAmPKES2QBkNkY8ocNUmStghZi/1sJ9LRbvsPeSYZ gktQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=CfYbZ+nJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r27-20020a63441b000000b0045497c0ba94si19071594pga.635.2022.10.19.15.02.58; Wed, 19 Oct 2022 15:03:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=CfYbZ+nJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231461AbiJSVzc (ORCPT + 99 others); Wed, 19 Oct 2022 17:55:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231394AbiJSVzS (ORCPT ); Wed, 19 Oct 2022 17:55:18 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D837150F8D for ; Wed, 19 Oct 2022 14:55:13 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id d24so18523848pls.4 for ; Wed, 19 Oct 2022 14:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NYKDq3nQvcWGiMSg+hxeuum9J23X3dmFHWVwl7YaDYc=; b=CfYbZ+nJXXk7KoFnE1sVg2XDbJnWj3hQVyrHcC6PGar9i+6OAIY/BwhB1o8E++95Wq lxcU180XOgaqUAVgRDa9NNPFTsOvZ+KK189p0I1A1jg1II+X4whI4JV1qME/yqC+qRqb x4ksvICFtNq8gEHVfGwf9KMw/70IcLQL2C1ok= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NYKDq3nQvcWGiMSg+hxeuum9J23X3dmFHWVwl7YaDYc=; b=1CrrvkqRuRCtMR6TE3NensWrHwpF9Zy1256w7yCNzCVZrMIlumkaAbo/um/PfkrMm7 n7u+zhVLALBvqoEl7Cf3Of/tTFm3DMU72XTd5QK/BxdjPT80vf7ccubRj15lbEyyTquG vz2/dxDp6XjZER8lvU+9GIQPA6BIDA5grLdmRGcTnCQTJawj4c8Dp+bjk8+tgQa/bIrc nznHQmc/PfSAcOwmIw8VQrJAihg6P7/K2BWYa7U2wzy6TVkUGuwbZ6y2KT10VKN1Mw40 gnljjiV/pWl5rIR5QNL+5J3hVhbCPyVTwvMe07VuVX2YqbB5iSoOr+xTiWHdRy+SiC9P gcWQ== X-Gm-Message-State: ACrzQf1iasRBHeAmAGrNNAWGvc3M6mvPlm/sH0fBdoKFTngL+JzrTib/ o8w1QfT+tI0Jpr3NUYw+Iht/Cg== X-Received: by 2002:a17:902:82ca:b0:185:75d:ee2c with SMTP id u10-20020a17090282ca00b00185075dee2cmr10547061plz.145.1666216512060; Wed, 19 Oct 2022 14:55:12 -0700 (PDT) Received: from localhost ([2620:15c:9d:2:57b7:1f0e:44d1:f252]) by smtp.gmail.com with UTF8SMTPSA id w14-20020a17090a5e0e00b0020ad53b5883sm422006pjf.14.2022.10.19.14.55.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Oct 2022 14:55:11 -0700 (PDT) From: Brian Norris To: Ulf Hansson Cc: Shawn Lin , Shawn Guo , Fabio Estevam , Haibo Chen , Broadcom internal kernel review list , NXP Linux Team , Pengutronix Kernel Team , Florian Fainelli , Michal Simek , Faiz Abbas , linux-mmc@vger.kernel.org, Jonathan Hunter , Al Cooper , linux-arm-kernel@lists.infradead.org, Sowjanya Komatineni , linux-kernel@vger.kernel.org, Thierry Reding , Adrian Hunter , Sascha Hauer , Brian Norris Subject: [PATCH v2 5/7] mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI Date: Wed, 19 Oct 2022 14:54:38 -0700 Message-Id: <20221019145246.v2.5.I418c9eaaf754880fcd2698113e8c3ef821a944d7@changeid> X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog In-Reply-To: <20221019215440.277643-1-briannorris@chromium.org> References: <20221019215440.277643-1-briannorris@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747155178352052143?= X-GMAIL-MSGID: =?utf-8?q?1747155178352052143?= [[ NOTE: this is completely untested by the author, but included solely because, as noted in commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers"), "other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL." We've now seen the same bug on at least MSM, Arasan, and Intel hardware. ]] SDHCI_RESET_ALL resets will reset the hardware CQE state, but we aren't tracking that properly in software. When out of sync, we may trigger various timeouts. It's not typical to perform resets while CQE is enabled, but this may occur in some suspend or error recovery scenarios. Fixes: 3c4019f97978 ("mmc: tegra: HW Command Queue Support for Tegra SDMMC") Signed-off-by: Brian Norris --- Changes in v2: - Drop unnecessary 'enable_hwcq' check drivers/mmc/host/sdhci-tegra.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 413925bce0ca..0a80335a42ec 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -367,6 +367,9 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data; u32 misc_ctrl, clk_ctrl, pad_ctrl; + if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL)) + cqhci_deactivate(host->mmc); + sdhci_reset(host, mask); if (!(mask & SDHCI_RESET_ALL))