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: 13021198 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1E7CC38A2D for ; Wed, 26 Oct 2022 19:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3L8HX6+jiVl98XK/b8bPrkCJ60YNeJcDFlVDqGeFF1E=; b=hk+wWL6wYAEfRs ivFNbRRsq61kPQxgeVIEQ7rE+EYwz3MI9osyjiiMLzc68wX/1cpZ7yL0RoNsc7nYOMdQNwSpbagRK uB2pgYD/+XzShaaYIb9J3C+XfLyKquXayw7/Bo+3J6lUaJpCZs88BIlhpJGV/zC+DcFDkdw1evq0m cXGWRx6EkxsharJUjvqLW1IVJnDyDgURZrXCEP/1O2Rv72Clf40dhbhavEBC75GAcTfdPzx5Y29yc GwKFfh1s99qiIpXJ+YBPkkPMVhkZRmcuyJ1iXmvLTmhl4MZEZCp03s3EwHENGOVR5O9AK5ACeKOLN 6rVSTkpbZVmPhUCjbkgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1onmIZ-00Aol2-21; Wed, 26 Oct 2022 19:42:47 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1onmIH-00AoeQ-Q5 for linux-arm-kernel@lists.infradead.org; Wed, 26 Oct 2022 19:42:31 +0000 Received: by mail-pj1-x102c.google.com with SMTP id c15-20020a17090a1d0f00b0021365864446so1356488pjd.4 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=hU4GvtGrFYaVXH5byTBivnGFzv+e7dJUNZt91DKRjC6GB15ORbFGtMWlzX34t7h3yR KH4BPA45LNQmSJe6QZCBz06BhnO/zopiGyns+KgvuOIhthjqmLPVZiMAK2cbxm3ZIa8z XbDvBhgyXuuCxQrFHlrP0EO8s1ljW7kJE5Yg605Ku+f5S26OzI2rMHQVJiEQzGmk/7oC 5X2Fe0W3hRNcrhRO0TT4qGAcYuzyxzo5/CFe5zEedQEF3HVPQDlJRMyHQPODtz55K+AH SgnquyIKqWpWnB7tnGsCQYBm1cQWkbxZ+DPXtlsAlBl5/a5lwOz7dNXnnHOHgCXQyQdZ pmgA== X-Gm-Message-State: ACrzQf399kQ4aFQlWhLJ/rYd3nFqMCAHdaDiLgolG77l5tPv74rF/ZP4 3ECcRx9qC0/DT1okaRcQ8GIxag== X-Google-Smtp-Source: AMsMyM6hZj9GDeltOVu0pxtCH5Ge/4TwElCv/M6SAFnmN6j13C5wankmCzTWxSILJ+5vGUOoy3PfIg== 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221026_124229_894071_F22F13E5 X-CRM114-Status: GOOD ( 17.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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