| Message ID | 20221019145246.v2.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@changeid |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp554916wrs;
Wed, 19 Oct 2022 15:04:01 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM6eJaOy7VyqdbIeZu/oKsSBHLrgYQAc7KYdCj54c1FUKOq36GWwXM/isfl1wPJtAckSjCYT
X-Received: by 2002:a17:90b:1f86:b0:205:d3d0:1931 with SMTP id
so6-20020a17090b1f8600b00205d3d01931mr12276209pjb.211.1666217041440;
Wed, 19 Oct 2022 15:04:01 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666217041; cv=none;
d=google.com; s=arc-20160816;
b=fHJTxqsWz2I+kqGAEeYl+PCl/uQBdtpJl036QQWipxUUUPzGuPvxshmLGzwwKoO9LZ
dUmnt4KRNdnct5qG1MTsMDNU07KS9KR+nGl6V6ycDM+fKM885cjmwPzs+iTXU3nOpNks
+grsMH4cnQCsWzCw6vPJHFtQoWeY6RQxrE5Ne05biEm7UtVvf/zi4qQLvfNvXzf4Ol1O
6wY0TZAjqd5PqfB4E7xXuWJB/4yP9Il9zN/gQaBQ+WnRhfWpQJymmJ3BTwSgGBTsdLiT
M9U45FbqbyofY64ulVj9DrUAh74MqOWqw+RtGG6nCaQe1BHqecJ+KFMgjuZxuv9wjNhH
EZAw==
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=IbNbprVwcMSh5axZvXvg/6/Lf17+C73zGfmFV0q4APA=;
b=tIHmB2CCjcySk1KudSUK+TosQIAmXVuCt2U1+eOvJbZ1u6p5NIh1k6IXF0GACIsKhF
08+ed7i0kEoHeQ43M1fhrAnrAZj0OJqpWhaTUC2GrkfSYaZ5g5xQjoT2193JnFk8nlD8
Xspxl7Ena0DxiR9NhkeaakWJt/3LjgfZ1ujuTvZP6uz18j4epVCbeXmgzdxeoehxUgBE
nApkFyWtsvCdi4E0IcPtnVwsbiXX1sREp8v+tFJ09bsvnXiuqQFrw5fuu2zVHS3iUkPH
uy4pCoWpTlTH5hzejws9ql7XGW7ocabgK9B1fwxgmltb6OD6qk7AYfrxAc8+rbJ59owv
EBrA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@chromium.org header.s=google header.b=jtc5lQ40;
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
n126-20020a634084000000b0045ecb2679f1si19345474pga.45.2022.10.19.15.03.25;
Wed, 19 Oct 2022 15:04:01 -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=jtc5lQ40;
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 S231354AbiJSVzQ (ORCPT <rfc822;samuel.l.nystrom@gmail.com>
+ 99 others); Wed, 19 Oct 2022 17:55:16 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52250 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230104AbiJSVzE (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 19 Oct 2022 17:55:04 -0400
Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com
[IPv6:2607:f8b0:4864:20::1032])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1CC6108276
for <linux-kernel@vger.kernel.org>;
Wed, 19 Oct 2022 14:55:01 -0700 (PDT)
Received: by mail-pj1-x1032.google.com with SMTP id pb15so1158207pjb.5
for <linux-kernel@vger.kernel.org>;
Wed, 19 Oct 2022 14:55:01 -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=IbNbprVwcMSh5axZvXvg/6/Lf17+C73zGfmFV0q4APA=;
b=jtc5lQ401QtVqG1hgM5C8nhqiLVLg/sUDSKTS1D2u8U8fBBwlC0CdcdAz0f5osiCdj
2xjAgzGdyS3CHjlU1Sk4hXJybQubvQjcO7XWn3h9H8+wa4RBvF1yedA6C43RCQURquc8
1Kx+U/fZ4Czw7qxoo3ox60jKt3Bdk8T81A02Y=
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=IbNbprVwcMSh5axZvXvg/6/Lf17+C73zGfmFV0q4APA=;
b=qnQjPwy//NR7k19rybBsfbuuWJ3jNY5t6iNQgyeaVzD6qw/wLfGRTcs1dFXsW+VfIL
RdSfb4IPJHeeSVUxWE+I/6zdUq6erA4KSu0fuD5U1yKWzFXWhLBO85BfYitPYz6yK4qH
NAXDwf1Eey7+MZma2Vg44xyuoifIqI7uXAy9FImjRiCImrRaUeKqU4MbJhYwGurzdETL
OzyJZCF2z7lL0+n7WcX9I1ExBb519QQL+DyMPEEum1NX2uyFL3b3hKD1jQgj0c2+R01E
JC4GIA+CCr7l8sGREVTLOCLrNDWZPoinjvmy1bDZxkYYxt89dXem/DHGjLjH1XRtv0LA
8eMw==
X-Gm-Message-State: ACrzQf0ZpzjIJcNR/3UlxIAXSGRbzGlzQLf5WqAk6b/AlLx2CAM3NaX5
CpcBQFik5tdDv0VtfMIumHBeaA==
X-Received: by 2002:a17:902:bd46:b0:17e:8ee5:7b61 with SMTP id
b6-20020a170902bd4600b0017e8ee57b61mr10878542plx.44.1666216501002;
Wed, 19 Oct 2022 14:55:01 -0700 (PDT)
Received: from localhost ([2620:15c:9d:2:57b7:1f0e:44d1:f252])
by smtp.gmail.com with UTF8SMTPSA id
q13-20020a170902f34d00b0017680faa1a8sm11113715ple.112.2022.10.19.14.54.59
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Wed, 19 Oct 2022 14:55:00 -0700 (PDT)
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
Message-Id:
<20221019145246.v2.1.Ie85faa09432bfe1b0890d8c24ff95e17f3097317@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
Content-Transfer-Encoding: 8bit
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: <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?1747155200605511996?=
X-GMAIL-MSGID: =?utf-8?q?1747155200605511996?=
|
| Series |
mmc: sdhci controllers: Fix SDHCI_RESET_ALL for CQHCI
|
|
Commit Message
Brian Norris
Oct. 19, 2022, 9: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. 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;