Message ID | 20221024105229.v3.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@changeid |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp614840wru; Mon, 24 Oct 2022 12:24:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6LIUfbpj006EqDxId7WzLh2GB7j4tCgMoTok0ayiOKsJtO1DlgdcrXzh3dN/qlJ24+xsjV X-Received: by 2002:a17:90b:380b:b0:20b:8dd:4f5f with SMTP id mq11-20020a17090b380b00b0020b08dd4f5fmr76887952pjb.158.1666639497677; Mon, 24 Oct 2022 12:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666639497; cv=none; d=google.com; s=arc-20160816; b=I96ia7k7sez30M2tvJ/b1dlfqc7dYs3VyYPGEnS2gH0qNq6Rgx3fmDGS+8lcpt4j3D OpVD4V4LQlMIE6rPXILMmDqsJ2/zRPC0P64vBbHNkMu7tP+OrS+B8zjy1gI9eqOlVjoz 9cB5sdCZYlVjAPtqwyiPjUHoWT6eVPD5TJ1aZhKL87fwff7k9M92HUjsHOuCN8zeJVI0 z6MV+RfvmU4fXMNyRBrQWwrFjqO2FUdcMueu4azyuFYPX/raPHH6Tcm+uF1QbCKmd+T/ 7aeynH2dBJIEXqFBzFEaq5xotPZlQIhKF42O0uRiYKuLpoQNzXB/xchwZIzcaSo1L20h zpjw== 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=aHRjtpJRM3U1ghY1hCFtCgckU5MadMj28s/UZ9ZqXJY=; b=R7Cd3zg7gKvOW2hKXTynUx0yDJ6rGgC3/7BrmeIaeOtOPtE8SqJKgTmwnG4cDQLS4s xQvIZVDTEXiz1CCHpSuuY6/Rtd6peEJj2aLUTRq7PjKGWpcMvwW630b5WNJjPSjCZN4U GhapADbbwy+E7Py30xBVP7bTX9Mm56TIcPPEbEFy3xSs2ze+AJw8mfFxK8tgTWYmUspt ZKFvsugoFXalvYvvRkfM4e/+EbeSnksH16s3cDrnALpqwlEuPFsQeWENTWQIhpTCJfCI NL3j27DPqFSKli1sp+U6b4Sb9kLJ/faVtX1nSlyOureMA3/anEc6z1F30q8CrKAZbxw5 lSqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=huM5ypBT; 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 b16-20020a637150000000b0046b208e7298si219793pgn.782.2022.10.24.12.24.41; Mon, 24 Oct 2022 12:24:57 -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=huM5ypBT; 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 S230185AbiJXTWC (ORCPT <rfc822;pwkd43@gmail.com> + 99 others); Mon, 24 Oct 2022 15:22:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbiJXTVN (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 24 Oct 2022 15:21:13 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6071E501A6 for <linux-kernel@vger.kernel.org>; Mon, 24 Oct 2022 10:56:53 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id jo13so5494953plb.13 for <linux-kernel@vger.kernel.org>; Mon, 24 Oct 2022 10:56:53 -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=aHRjtpJRM3U1ghY1hCFtCgckU5MadMj28s/UZ9ZqXJY=; b=huM5ypBTUsffC1by9Jd9TL5QHxmbKm3XfeGX4DjCG2CA1f88rtNfIcdskO8MVHkZ96 Vesb6S2I1QxVDYiE1YZC336xhLf5LG+Ffg3a3xgl52ahBWt7nRsFgYugqfogVOhTYztP bJvp7aFAa5/SlYxVzpmhRUN73Lh+HFi81d6cw= 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=aHRjtpJRM3U1ghY1hCFtCgckU5MadMj28s/UZ9ZqXJY=; b=0/vZmvujSsO7I1wrg8DFIoK3P7Rm5t4L0ps6Ih+dj/Br/0yk9xy/LrLWTk7iB8eASI G99LVBNcpGHyUYFbrdCEwPbCMfInBNmWKEMwCmN0gTD4l7C9tTkMD3DHEPr8TSBV5PTR NUuk2g+g/20mLvTqO7jy4GW/zseE450qn4K4XgUFCycbM5cX7sicO84B20l9PJDhfAbI Ht2RHv1FDF64+g1X3cdg0Wwo2cTvkaSIx48Tde2QWuU3Wq+rxxIpFYCBSxDyEPR5Eu9d tkm7/QJq3tIFz6Za5IBSqcEfV5mY7ezOoYXKjqHOB+kTkMCVc+sXy2pm8WGdV/kc7Y4F DPkA== X-Gm-Message-State: ACrzQf0nLa0rum6f7BLIezR7exLZ71Y0Obi27rUtugQxdOPrlfWEczvN phZrr6nd8d1owrtC4b7Wvy73Gg== X-Received: by 2002:a17:90a:1690:b0:212:f865:4f0e with SMTP id o16-20020a17090a169000b00212f8654f0emr11266624pja.197.1666634172695; Mon, 24 Oct 2022 10:56:12 -0700 (PDT) Received: from localhost ([2620:15c:9d:2:808b:e2f6:edcf:ccb0]) by smtp.gmail.com with UTF8SMTPSA id d28-20020aa797bc000000b0056c0d129edfsm90824pfq.121.2022.10.24.10.56.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Oct 2022 10:56:12 -0700 (PDT) From: Brian Norris <briannorris@chromium.org> To: Ulf Hansson <ulf.hansson@linaro.org> Cc: Shawn Lin <shawn.lin@rock-chips.com>, linux-mmc@vger.kernel.org, Al Cooper <alcooperx@gmail.com>, Bjorn Andersson <andersson@kernel.org>, Sowjanya Komatineni <skomatineni@nvidia.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, Sascha Hauer <s.hauer@pengutronix.de>, Konrad Dybcio <konrad.dybcio@somainline.org>, Florian Fainelli <f.fainelli@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, Thierry Reding <thierry.reding@gmail.com>, Fabio Estevam <festevam@gmail.com>, Michal Simek <michal.simek@xilinx.com>, linux-kernel@vger.kernel.org, Shawn Guo <shawnguo@kernel.org>, Adrian Hunter <adrian.hunter@intel.com>, Pengutronix Kernel Team <kernel@pengutronix.de>, linux-arm-msm@vger.kernel.org, Haibo Chen <haibo.chen@nxp.com>, Andy Gross <agross@kernel.org>, linux-arm-kernel@lists.infradead.org, Faiz Abbas <faiz_abbas@ti.com>, Jonathan Hunter <jonathanh@nvidia.com>, Brian Norris <briannorris@chromium.org>, stable@vger.kernel.org Subject: [PATCH v3 1/7] mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI Date: Mon, 24 Oct 2022 10:54:55 -0700 Message-Id: <20221024105229.v3.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@changeid> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog In-Reply-To: <20221024175501.2265400-1-briannorris@chromium.org> References: <20221024175501.2265400-1-briannorris@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747598177545854287?= X-GMAIL-MSGID: =?utf-8?q?1747598177545854287?= |
Series |
mmc: sdhci controllers: Fix SDHCI_RESET_ALL for CQHCI
|
|
Commit Message
Brian Norris
Oct. 24, 2022, 5:54 p.m. UTC
Several SDHCI drivers need to deactivate command queueing in their reset
hook (see sdhci_cqhci_reset() / sdhci-pci-core.c, for example), and
several more are coming.
Those reset implementations have some small subtleties (e.g., ordering
of initialization of SDHCI vs. CQHCI might leave us resetting with a
NULL ->cqe_private), and are often identical across different host
drivers.
We also don't want to force a dependency between SDHCI and CQHCI, or
vice versa; non-SDHCI drivers use CQHCI, and SDHCI drivers might support
command queueing through some other means.
So, implement a small helper, to avoid repeating the same mistakes in
different drivers. Simply stick it in a header, because it's so small it
doesn't deserve its own module right now, and inlining to each driver is
pretty reasonable.
This is marked for -stable, as it is an important prerequisite patch for
several SDHCI controller bugfixes that follow.
Cc: <stable@vger.kernel.org>
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
Changes in v3:
- New in v3 (replacing a simple 'cqe_private == NULL' patch in v2)
drivers/mmc/host/sdhci-cqhci.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 drivers/mmc/host/sdhci-cqhci.h
Comments
On 10/24/22 10:54, Brian Norris wrote: > Several SDHCI drivers need to deactivate command queueing in their reset > hook (see sdhci_cqhci_reset() / sdhci-pci-core.c, for example), and > several more are coming. > > Those reset implementations have some small subtleties (e.g., ordering > of initialization of SDHCI vs. CQHCI might leave us resetting with a > NULL ->cqe_private), and are often identical across different host > drivers. > > We also don't want to force a dependency between SDHCI and CQHCI, or > vice versa; non-SDHCI drivers use CQHCI, and SDHCI drivers might support > command queueing through some other means. > > So, implement a small helper, to avoid repeating the same mistakes in > different drivers. Simply stick it in a header, because it's so small it > doesn't deserve its own module right now, and inlining to each driver is > pretty reasonable. > > This is marked for -stable, as it is an important prerequisite patch for > several SDHCI controller bugfixes that follow. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On 24/10/22 20:54, Brian Norris wrote: > Several SDHCI drivers need to deactivate command queueing in their reset > hook (see sdhci_cqhci_reset() / sdhci-pci-core.c, for example), and > several more are coming. > > Those reset implementations have some small subtleties (e.g., ordering > of initialization of SDHCI vs. CQHCI might leave us resetting with a > NULL ->cqe_private), and are often identical across different host > drivers. > > We also don't want to force a dependency between SDHCI and CQHCI, or > vice versa; non-SDHCI drivers use CQHCI, and SDHCI drivers might support > command queueing through some other means. > > So, implement a small helper, to avoid repeating the same mistakes in > different drivers. Simply stick it in a header, because it's so small it > doesn't deserve its own module right now, and inlining to each driver is > pretty reasonable. > > This is marked for -stable, as it is an important prerequisite patch for > several SDHCI controller bugfixes that follow. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> One cosmetic nit, otherwise: Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > > Changes in v3: > - New in v3 (replacing a simple 'cqe_private == NULL' patch in v2) > > drivers/mmc/host/sdhci-cqhci.h | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > create mode 100644 drivers/mmc/host/sdhci-cqhci.h > > diff --git a/drivers/mmc/host/sdhci-cqhci.h b/drivers/mmc/host/sdhci-cqhci.h > new file mode 100644 > index 000000000000..270ab1f1de3c > --- /dev/null > +++ b/drivers/mmc/host/sdhci-cqhci.h > @@ -0,0 +1,25 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright 2022 The Chromium OS Authors > + * > + * Support that applies to the combination of SDHCI and CQHCI, while not > + * expressing a dependency between the two modules. > + */ > + > +#ifndef __MMC_HOST_SDHCI_CQHCI_H__ > +#define __MMC_HOST_SDHCI_CQHCI_H__ > + > +#include "cqhci.h" > +#include "sdhci.h" > + > +static inline void sdhci_and_cqhci_reset(struct sdhci_host *host, u8 mask) > +{ > + if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) && > + host->mmc->cqe_private) > + cqhci_deactivate(host->mmc); > + > + sdhci_reset(host, mask); > +} > + > + Double blank line > +#endif /* __MMC_HOST_SDHCI_CQHCI_H__ */
diff --git a/drivers/mmc/host/sdhci-cqhci.h b/drivers/mmc/host/sdhci-cqhci.h new file mode 100644 index 000000000000..270ab1f1de3c --- /dev/null +++ b/drivers/mmc/host/sdhci-cqhci.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright 2022 The Chromium OS Authors + * + * Support that applies to the combination of SDHCI and CQHCI, while not + * expressing a dependency between the two modules. + */ + +#ifndef __MMC_HOST_SDHCI_CQHCI_H__ +#define __MMC_HOST_SDHCI_CQHCI_H__ + +#include "cqhci.h" +#include "sdhci.h" + +static inline void sdhci_and_cqhci_reset(struct sdhci_host *host, u8 mask) +{ + if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) && + host->mmc->cqe_private) + cqhci_deactivate(host->mmc); + + sdhci_reset(host, mask); +} + + +#endif /* __MMC_HOST_SDHCI_CQHCI_H__ */