From: Brian Norris <briannorris@chromium.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Shawn Lin <shawn.lin@rock-chips.com>,
Shawn Guo <shawnguo@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
Haibo Chen <haibo.chen@nxp.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Florian Fainelli <f.fainelli@gmail.com>,
Michal Simek <michal.simek@xilinx.com>,
Faiz Abbas <faiz_abbas@ti.com>,
linux-mmc@vger.kernel.org, Jonathan Hunter <jonathanh@nvidia.com>,
Al Cooper <alcooperx@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Sowjanya Komatineni <skomatineni@nvidia.com>,
linux-kernel@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Brian Norris <briannorris@chromium.org>,
stable@vger.kernel.org
Subject: [PATCH v2 1/7] mmc: cqhci: Handle deactivate() when not yet initialized
Date: Wed, 19 Oct 2022 14:54:34 -0700 [thread overview]
Message-ID: <20221019145246.v2.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@changeid> (raw)
In-Reply-To: <20221019215440.277643-1-briannorris@chromium.org>
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. Such drivers also tend to initialize CQHCI
support after they've already performed one or more resets.
Rather than rely on careful ordering of cqhci_init() within the host
setup and reset sequence, let's do a simple NULL check -- deactivating a
non-initialized CQHCI instance is harmless.
This 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 v2:
- New in v2
drivers/mmc/host/cqhci-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
index b3d7d6d8d654..1fa1d24abb2e 100644
--- a/drivers/mmc/host/cqhci-core.c
+++ b/drivers/mmc/host/cqhci-core.c
@@ -315,7 +315,7 @@ int cqhci_deactivate(struct mmc_host *mmc)
{
struct cqhci_host *cq_host = mmc->cqe_private;
- if (cq_host->enabled && cq_host->activated)
+ if (cq_host && cq_host->enabled && cq_host->activated)
__cqhci_disable(cq_host);
return 0;
--
2.38.0.413.g74048e4d9e-goog
WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <briannorris@chromium.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Shawn Lin <shawn.lin@rock-chips.com>,
Shawn Guo <shawnguo@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
Haibo Chen <haibo.chen@nxp.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Florian Fainelli <f.fainelli@gmail.com>,
Michal Simek <michal.simek@xilinx.com>,
Faiz Abbas <faiz_abbas@ti.com>,
linux-mmc@vger.kernel.org, Jonathan Hunter <jonathanh@nvidia.com>,
Al Cooper <alcooperx@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Sowjanya Komatineni <skomatineni@nvidia.com>,
linux-kernel@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Brian Norris <briannorris@chromium.org>,
stable@vger.kernel.org
Subject: [PATCH v2 1/7] mmc: cqhci: Handle deactivate() when not yet initialized
Date: Wed, 19 Oct 2022 14:54:34 -0700 [thread overview]
Message-ID: <20221019145246.v2.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@changeid> (raw)
In-Reply-To: <20221019215440.277643-1-briannorris@chromium.org>
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. Such drivers also tend to initialize CQHCI
support after they've already performed one or more resets.
Rather than rely on careful ordering of cqhci_init() within the host
setup and reset sequence, let's do a simple NULL check -- deactivating a
non-initialized CQHCI instance is harmless.
This 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 v2:
- New in v2
drivers/mmc/host/cqhci-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
index b3d7d6d8d654..1fa1d24abb2e 100644
--- a/drivers/mmc/host/cqhci-core.c
+++ b/drivers/mmc/host/cqhci-core.c
@@ -315,7 +315,7 @@ int cqhci_deactivate(struct mmc_host *mmc)
{
struct cqhci_host *cq_host = mmc->cqe_private;
- if (cq_host->enabled && cq_host->activated)
+ if (cq_host && cq_host->enabled && cq_host->activated)
__cqhci_disable(cq_host);
return 0;
--
2.38.0.413.g74048e4d9e-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-10-19 21:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 21:54 [PATCH v2 0/7] mmc: sdhci controllers: Fix SDHCI_RESET_ALL for CQHCI Brian Norris
2022-10-19 21:54 ` Brian Norris
2022-10-19 21:54 ` Brian Norris [this message]
2022-10-19 21:54 ` [PATCH v2 1/7] mmc: cqhci: Handle deactivate() when not yet initialized Brian Norris
2022-10-19 21:54 ` [PATCH v2 2/7] mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI Brian Norris
2022-10-19 21:54 ` Brian Norris
2022-10-19 21:59 ` Florian Fainelli
2022-10-19 21:59 ` Florian Fainelli
2022-10-19 22:19 ` Brian Norris
2022-10-19 22:19 ` Brian Norris
2022-10-20 6:29 ` Adrian Hunter
2022-10-20 6:29 ` Adrian Hunter
2022-10-21 17:45 ` Florian Fainelli
2022-10-21 17:45 ` Florian Fainelli
2022-10-23 16:47 ` Adrian Hunter
2022-10-23 16:47 ` Adrian Hunter
2022-10-19 21:54 ` [PATCH v2 3/7] mmc: sdhci-brcmstb: " Brian Norris
2022-10-19 21:54 ` Brian Norris
2022-10-19 21:54 ` [PATCH v2 4/7] mms: sdhci-esdhc-imx: " Brian Norris
2022-10-19 21:54 ` Brian Norris
2022-10-21 2:35 ` Bough Chen
2022-10-21 2:35 ` Bough Chen
2022-10-19 21:54 ` [PATCH v2 5/7] mmc: sdhci-tegra: " Brian Norris
2022-10-19 21:54 ` Brian Norris
2022-10-19 21:54 ` [PATCH v2 6/7] mmc: sdhci_am654: " Brian Norris
2022-10-19 21:54 ` Brian Norris
2022-10-19 21:54 ` [PATCH v2 7/7] mmc: sdhci-pci-*: Drop redundant ->cqe_private check Brian Norris
2022-10-19 21:54 ` Brian Norris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221019145246.v2.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@changeid \
--to=briannorris@chromium.org \
--cc=adrian.hunter@intel.com \
--cc=alcooperx@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=faiz_abbas@ti.com \
--cc=festevam@gmail.com \
--cc=haibo.chen@nxp.com \
--cc=jonathanh@nvidia.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=s.hauer@pengutronix.de \
--cc=shawn.lin@rock-chips.com \
--cc=shawnguo@kernel.org \
--cc=skomatineni@nvidia.com \
--cc=stable@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.