From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93A5DC2BA19 for ; Sat, 11 Apr 2020 23:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63E4420787 for ; Sat, 11 Apr 2020 23:33:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647987; bh=+4Y6v8urmBV3oLeXdI2OGYkt1R2bCR4FKeRojWZdLqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hRcrvlk0J7O67xD8BW80H9gFyMSqBBxCxAfha7XrdlS32vow0H5zUDabaa2U9BvMo 8MrMtJFbeWWb/BrlKAMw0r4wEVAKPWcdT2T+DkWpge0y7zpg9yPQ3MfRr7LRoq9FdT 3Tech0OFREm/MtbbWQIFPJRQr7rBoc4rDynxoeMY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729275AbgDKXdG (ORCPT ); Sat, 11 Apr 2020 19:33:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729359AbgDKXJw (ORCPT ); Sat, 11 Apr 2020 19:09:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0EE7420CC7; Sat, 11 Apr 2020 23:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646592; bh=+4Y6v8urmBV3oLeXdI2OGYkt1R2bCR4FKeRojWZdLqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lO3i0jQ3Q94UH+TI9gqT3mlj5/JbsIBLiauK2zErfx0p2JQg3/npB7ZNaaxSEHkv/ cVAxOsDaZsiMJO37kBimdBE6xyRDeJD/60EHHzVW4YodXAWxtJLtXNHWggEmv1ZtqB cx+RMP4SFRGi8elK1jSIZv2AWXD56Q8gsCneJW5g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haibo Chen , Adrian Hunter , Linus Walleij , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 007/108] mmc: sdhci: do not enable card detect interrupt for gpio cd type Date: Sat, 11 Apr 2020 19:08:02 -0400 Message-Id: <20200411230943.24951-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230943.24951-1-sashal@kernel.org> References: <20200411230943.24951-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Haibo Chen [ Upstream commit e65bb38824711559844ba932132f417bc5a355e2 ] Except SDHCI_QUIRK_BROKEN_CARD_DETECTION and MMC_CAP_NONREMOVABLE, we also do not need to handle controller native card detect interrupt for gpio cd type. If we wrong enabled the card detect interrupt for gpio case, it will cause a lot of unexpected card detect interrupts during data transfer which should not happen. Signed-off-by: Haibo Chen Acked-by: Adrian Hunter Reviewed-by: Linus Walleij Link: https://lore.kernel.org/r/1582100563-20555-2-git-send-email-haibo.chen@nxp.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4478b94d47915..0c6ecf610e6a5 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -152,7 +152,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) u32 present; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) || - !mmc_card_is_removable(host->mmc)) + !mmc_card_is_removable(host->mmc) || mmc_can_gpio_cd(host->mmc)) return; if (enable) { -- 2.20.1