From patchwork Wed Oct 19 21:54:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 5861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp554779wrs; Wed, 19 Oct 2022 15:03:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6bKRwbgSZ9kRJJy+S6id/8MW3hflb3cTZz6fBLIIsHxJBc3SnCh3UWBjTisBqcMGuJA6a0 X-Received: by 2002:a63:1326:0:b0:439:40b5:77cc with SMTP id i38-20020a631326000000b0043940b577ccmr9217297pgl.473.1666217023724; Wed, 19 Oct 2022 15:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666217023; cv=none; d=google.com; s=arc-20160816; b=XOczaOS8cjOhO1b8cgyEJqpnxeIFQaEDjfLSdNpsdeTUzlKSp52chRSWKrM+FGu5Fc IYiADGpTeGIQ7G5fQ53/bWrxCGLJcAElQ+wxWTXtLgGnQXMS700DQL2v1kvFxTNg5qAs LbuqiaUDYGRvOY0uq1Z2b7lfcXXPsI7N79Mc2827f0Dun9qT8o4wXtAsGg/FwILVvgdZ RqAkmC/YlJr4CCt6pl8BlR3PY4KFKgvavNEl3dpeYxEogl1f+M/XxedKT/TbzxPzR/Ws v/GhhMBvY9WZgJ7dm0VPYjeD6GUTSdGhcRlwCWrewGaaAHiWz6PxeQo0KQUFv/RTSJLO 6w0w== 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=Wydu2mgXy/Ti5pZeMNO0oB2V13SqCsRFUj9VGtENhPc=; b=FMrMgYML8kylmnYIiPFR9Gf83hfxJGUd2+FqoRZAQBtcMm8U1eoBrjxvuy8J8NMDZE Y7LwmaqiYcsfNAPiRSa88DMcKzhxaKWMiJtXRl6lTPPvSap86oK6e11Zkpsbj9BcBFOV 78scsxIV8soJrCSuF/IfLTmqQbtQamdl8GAfYth6U4Qh6r7z7ZZhc02LWdxNe6u2+NCZ HHdd70rwY4tHP+TyuSZJBXlaDZ+ArunJvGSNWEEXoA5q7rKpeNBRi6VC9VE69Iq1/RX7 SPL7C/xvYBB7cfFH5CPEAcDGHJWp1zGuAblCBSQJ25zIs3vvjtXNXGl+ZZSgSLxpG4vs J+gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ChDSlokP; 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 38-20020a630d66000000b004616889d5c2si20927927pgn.495.2022.10.19.15.03.08; Wed, 19 Oct 2022 15:03:43 -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=ChDSlokP; 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 S231610AbiJSVzt (ORCPT + 99 others); Wed, 19 Oct 2022 17:55:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231387AbiJSVzX (ORCPT ); Wed, 19 Oct 2022 17:55:23 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC47116CA66 for ; Wed, 19 Oct 2022 14:55:20 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-132af5e5543so22327887fac.8 for ; Wed, 19 Oct 2022 14:55:20 -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=Wydu2mgXy/Ti5pZeMNO0oB2V13SqCsRFUj9VGtENhPc=; b=ChDSlokPNsjy2o/57nhAg7mfMjZkGB61uN8KGokp5uFWwk9gAqAvvQdsKuPhhf4Er9 wmKVQHHL8CkIAihTw0hRaEFTwdI+sSmSvrHn8I7fE03IUF48Nd0r5X/3gjaqFYEsNSKg 5Er7iJ8I6HnyOcMvqA10t1iAAiUYMokHH21IE= 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=Wydu2mgXy/Ti5pZeMNO0oB2V13SqCsRFUj9VGtENhPc=; b=rJYPR0iwDSbox8fylZTbUxMg/kzAMKlqsBo5CoAjhLaYcECLXQY/VccJTO6q8GHD/+ 0KwDWTMhPGsQ+mWu/yk9Oz1xXfZxcJK5qkCXDzLEebex1N6RXCYkSblw0fIZYaRFqXUk 7oqA561P7Y1Uyhgp0H53cv1D2+HtTiyBl4kEhSSlnIETNewPBKWiwZtk8kFS3I/yoO22 52YgcGB/vBH4wABw6XbPhJ45YYS5g8eu4r0n42ivhzTRyMu/yP/y7hH3N7o5c4H/U/B8 xAKj5rEOeW+SSIhd8oOx3Fy4Xa9zUO87lWZVHPUR5Fu3HjhJAihxgv/VUiNrO79czn3L rlag== X-Gm-Message-State: ACrzQf1GAMicMBptYrN0rAkXUeCn6KmFKBpvDnZK179o/oxl+eX12GDQ B+UPH55Y8YHYDM0j9iW96IZn1nUT+yisYQ== X-Received: by 2002:a17:90a:c782:b0:202:c73e:5488 with SMTP id gn2-20020a17090ac78200b00202c73e5488mr47000873pjb.202.1666216509347; Wed, 19 Oct 2022 14:55:09 -0700 (PDT) Received: from localhost ([2620:15c:9d:2:57b7:1f0e:44d1:f252]) by smtp.gmail.com with UTF8SMTPSA id l10-20020a170903244a00b0017f637b3e87sm11258807pls.279.2022.10.19.14.55.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Oct 2022 14:55:08 -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 4/7] mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI Date: Wed, 19 Oct 2022 14:54:37 -0700 Message-Id: <20221019145246.v2.4.I7d01f9ad11bacdc9213dee61b7918982aea39115@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?1747155182103866098?= X-GMAIL-MSGID: =?utf-8?q?1747155182103866098?= [[ 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: bb6e358169bf ("mmc: sdhci-esdhc-imx: add CMDQ support") Signed-off-by: Brian Norris Reviewed-by: Haibo Chen --- Changes in v2: - Drop unnecessary ESDHC_FLAG_CQHCI check drivers/mmc/host/sdhci-esdhc-imx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 55981b0f0b10..c07df7b71b22 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1288,6 +1288,9 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing) static void esdhc_reset(struct sdhci_host *host, u8 mask) { + if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL)) + cqhci_deactivate(host->mmc); + sdhci_reset(host, mask); sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);