From patchwork Wed Oct 26 19:42:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp453933wru; Wed, 26 Oct 2022 12:46:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM70Uv3KI3GIag87SYcwnaPY/8K7FmqDls2lEwHGvSxyjbUWyCkhh+lM/YgttuZWp/bbF/MN X-Received: by 2002:a63:8548:0:b0:46e:c0de:9762 with SMTP id u69-20020a638548000000b0046ec0de9762mr23669190pgd.189.1666813571433; Wed, 26 Oct 2022 12:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666813571; cv=none; d=google.com; s=arc-20160816; b=CJvoKjq+BlDkMclJH4+LFil3YDBp9zOt8B9e7mwaYpDV14O654UKG8l1Zw7QzabVic eaDX73eEcnkEFIOrd7y/Gqr+8yCxwdt+zTamlyon9qqHqAo697VD7eFMkDvT568aJoMh 6dtKRCpKaHaeSHgNd2xVz7mg0l9lM37dyj/n74qTVxhEM5vFZfFMJc4LEPkjzvWoD5/M F+AL1iapMXdwHfbZL17/6SS3l+x+fK8HNFMKeemtITDKM8gmNd+dnUXt6PNRkRgFWjH+ I6v/vABv7Ueg93a+GI0IWkvT/ciy9CvYgLWNCsSojWthK2CgaMrCWYgvyB+crIJeZayM kKcQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=8kvE/d8310xZl2YgDA7SStCHTp5iEbyeEE+ffhvPBuQ=; b=hDCToCKcoqpVeHiFoxaKsMrI/Klp1KF7DHS9/GTqzK+d231Knva2duCz6FN9mbQFh4 thZUZ1mDJ0jsVtzqxX5txx+siNM7WK5BORmUY0kJP/9Jhhi8VjKZf1w1WaZeI7qDuhbf NwNwgg4+FpYKDQbrQvbJs+hn2ZEGXWKCeEejGt3Fmefcptsbe/V4RuZ8KZ7NEx4JR05N n/5xni/Tgn4OVSkHVQzhkf82e3Ov/CcS4Wmvk+jj7CXC2OheR0UoOmcfylxNjo2qSsh3 167o8J1by6tx/ZdYc0hMgqpMuzhi91xUa0Oe3v28xnXVnr4wJUeZz8hOKr9F742NQwHE ELVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RSMDkrX2; 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 a7-20020a056a000c8700b0055214e179d5si8629892pfv.63.2022.10.26.12.45.58; Wed, 26 Oct 2022 12:46:11 -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=RSMDkrX2; 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 S235105AbiJZTm7 (ORCPT + 99 others); Wed, 26 Oct 2022 15:42:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235046AbiJZTmm (ORCPT ); Wed, 26 Oct 2022 15:42:42 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9A24CABEB for ; Wed, 26 Oct 2022 12:42:26 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id f5-20020a17090a4a8500b002131bb59d61so4107812pjh.1 for ; Wed, 26 Oct 2022 12:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8kvE/d8310xZl2YgDA7SStCHTp5iEbyeEE+ffhvPBuQ=; b=RSMDkrX2V+zcNpiTdQ1wkxMpY0MkQFoEcr10UQqRUSMpHme9v3lNADkdRSrpPn0qMo ytXgpJn02JU+LhXiBVYIKj85cYxlt/zdYcwXEpnSUh3jfgjqTM7jTU8rFpcab/FhqSN+ WJ99JXJJGfIpl62F+5NGC2M2ztPtpVbHBEp+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8kvE/d8310xZl2YgDA7SStCHTp5iEbyeEE+ffhvPBuQ=; b=MeQlPpJUJeUpn2dZzB90f0Z777ublFs2ylcGaZCFIMhSSxiPh4MZSjeBC/p3yppDM+ Rni6U0PzpqAHAoVqy53c4TJBnnSwu3/p6PWiis6++H6G6DNWdlAPtXGqhpKgGTDaTNym rL/zfJn6hCeAthBn7vuIXwdc5rZVj+WoJR3Vb/IytHTEe4pHImqekOMwysG4uOzRklUx 3FRazzdDaMEZa4WvPehOam0J7btE/ibI2i1GUjWRBwRuK7F1KdDqojUnd+RfN9y5hxUM APG/RmEOSi91VQ49IjsXjVBGW12edCepZxc90bKhZ4Zb1Pl1QnCeDJ/RE07vRQMcTT37 Pzzg== X-Gm-Message-State: ACrzQf32QF82mc8g/y1bK9qHjt1gC+VXfghYymejrpX8FxcGLmzOmfqr i+yaP1xy+9xbbsDyDFJINaQ/qQ== X-Received: by 2002:a17:90b:4a04:b0:213:587b:204e with SMTP id kk4-20020a17090b4a0400b00213587b204emr4770856pjb.98.1666813346142; Wed, 26 Oct 2022 12:42:26 -0700 (PDT) Received: from localhost ([2620:15c:9d:2:c9e3:74f3:6b2b:135]) by smtp.gmail.com with UTF8SMTPSA id mn22-20020a17090b189600b0020d24ea4400sm1441113pjb.38.2022.10.26.12.42.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Oct 2022 12:42:25 -0700 (PDT) From: Brian Norris To: Ulf Hansson Cc: Shawn Guo , linux-mmc@vger.kernel.org, Adrian Hunter , Shawn Lin , Michal Simek , Sascha Hauer , Bjorn Andersson , Thierry Reding , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Broadcom internal kernel review list , Jonathan Hunter , Andy Gross , Pengutronix Kernel Team , linux-kernel@vger.kernel.org, Konrad Dybcio , Al Cooper , Fabio Estevam , Florian Fainelli , NXP Linux Team , Haibo Chen , Sowjanya Komatineni , Brian Norris Subject: [PATCH v4 0/7] mmc: sdhci controllers: Fix SDHCI_RESET_ALL for CQHCI Date: Wed, 26 Oct 2022 12:42:02 -0700 Message-Id: <20221026194209.3758834-1-briannorris@chromium.org> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 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,URIBL_BLOCKED autolearn=ham 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?1747780707527506395?= X-GMAIL-MSGID: =?utf-8?q?1747780707527506395?= This is a series of identical fixes for several SDHCI host drivers. Patch #2 (for sdhci-of-arasan; plus its dependency in patch #1) is the only one I've tested, and I wrote it due to a bug described there. I then noticed that several other drivers do the same thing, and that commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers") points out the likely-repeated bug. So the fix is now factored into a separate sdhci_and_cqhci_reset() helper, and it's likely that most/all drivers that support a combo SDHCI/CQHCI controller will want to use it. Thus, I include additional patches (compile-tested only) that apply this helper/fix to the other drivers which call cqhci_init() but not cqhci_deactivate(). They contain appropriate disclaimers and the relevant parties are CC'd. I would suggest only merging them if you get some kind of ACK from people familiar with the relevant hardware. Notably, I do *not* patch drivers/mmc/host/mtk-sd.c although it uses CQHCI, because it doesn't seem to be an SDHCI-based controller, and so even if it has a similar bug, it's not clear to me how to patch it. - Brian Changes in v4: - Improve for-stable cherry-picking notes - Add Adrian's Ack - Also fix sdhci_am654_ops, sdhci_j721e_8bit_ops Changes in v3: - Refactor to a "SDHCI and CQHCI" helper -- sdhci_and_cqhci_reset() Changes in v2: - Rely on cqhci_deactivate() to safely handle (ignore) not-yet-initialized CQE support Brian Norris (7): mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci-*: Convert drivers to new sdhci_and_cqhci_reset() drivers/mmc/host/sdhci-brcmstb.c | 3 ++- drivers/mmc/host/sdhci-cqhci.h | 24 ++++++++++++++++++++++++ drivers/mmc/host/sdhci-esdhc-imx.c | 3 ++- drivers/mmc/host/sdhci-msm.c | 10 ++-------- drivers/mmc/host/sdhci-of-arasan.c | 3 ++- drivers/mmc/host/sdhci-pci-core.c | 11 ++--------- drivers/mmc/host/sdhci-pci-gli.c | 11 ++--------- drivers/mmc/host/sdhci-tegra.c | 3 ++- drivers/mmc/host/sdhci_am654.c | 7 ++++--- 9 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 drivers/mmc/host/sdhci-cqhci.h