From patchwork Fri Jun 30 12:00:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 114699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10309205vqr; Fri, 30 Jun 2023 05:09:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlE8m677oCb57kdnQopRaOAZBQmJRHLn2pFp9aHwrVe+yvITtHA+zjy3l/qI282cONbiCnD7 X-Received: by 2002:a05:6358:f50:b0:127:f2fb:d103 with SMTP id c16-20020a0563580f5000b00127f2fbd103mr2736580rwj.16.1688126981507; Fri, 30 Jun 2023 05:09:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688126981; cv=none; d=google.com; s=arc-20160816; b=pemciWSom8wwxIlHMLlofx8RBcufaXDdJ5ThDhfjgPv5FKa52/swFbsoWqn3CWbnej 91J0OXNeZiTbAUJDq2SF8mUnOgSnlInup7l14D62FOjiJ6FBBw27DvgguwPH4uA034ev 5hTQlnqcs5ohw5QshPeRJFLG+XskAFuYBXyIZLKUdpUMdxdTcuJj7L8mKYpSkpmrSmxv a6/fkStyDU68S7C1sC2FUgohiq7T/X3bO7GJe8ddhS7zip3yo0niSyTWlIWIJqCo2aJf UbvbKsJWWcQNPouxfz6zGWTUq+O7a54SA5OhO++Sz9FyWjUsw0hNvwz+syLFeqJw00gM XL7w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=14D7DHntwp60GlIftqa4afNY/9x1F06cw0RktL6nRlU=; fh=BmD59GftRI8ibsaoxTHcoJzE/LhXDszo/cXQAT+EOXw=; b=vQvjFkNBUPwBpDxCBqtz5EHlSl/c7KweJ3uLj86mz5zQd9Wzdj5E04sUyvb7d3WoKg 5QSTl83R967zzew8jf7e5D0WUBd2qsehL8ow6l17CX1yPI6u7D9Bjpb1tGe3+6OLBOzl MBLKhrlN/8IVDr6pRSoQdOD5hjzfr6m6cGIXpKDehzy8/1YtICv6u+M4kcUBnjfg0vNV RjfxfIQWjSuDjpqMRF3ZaBZuNtANWOPwRis6syRiLqeUFi3LjB0G302P9uDU45tTyvEm 9oZQszR6cKRQ9RwJooD6RLoPGy1hw1+C4YLq90WGz/3ypdINfFvFrwG51DxLuthhdC7O 1fZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fy1MI5UX; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 11-20020a630f4b000000b00553c2f85085si12636613pgp.220.2023.06.30.05.09.26; Fri, 30 Jun 2023 05:09:41 -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=@linaro.org header.s=google header.b=fy1MI5UX; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231956AbjF3MAe (ORCPT + 99 others); Fri, 30 Jun 2023 08:00:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231950AbjF3MAb (ORCPT ); Fri, 30 Jun 2023 08:00:31 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 997D71BE9 for ; Fri, 30 Jun 2023 05:00:25 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-4fb863edcb6so3014673e87.0 for ; Fri, 30 Jun 2023 05:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688126424; x=1690718424; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=14D7DHntwp60GlIftqa4afNY/9x1F06cw0RktL6nRlU=; b=fy1MI5UX56UXUrFu0J8cpIXdjPPG33um5E6owC4D67V1Th2H/9dmoDZEfyc3eJNVZ7 osU0qAc2Xi57FirxHF5YqGd/hc5tj/CJlsuik/Gq0BuXz0PT5WZtci84yu5fxT3Jqpol NIMKFmVYK1kYjJzsvyxeriMC+MG9wcmUnq+Ih7aWAbteTAKBc/mFVJGDYyPFasA9umI4 0uzO4XU0LlMVN0RPwJ2eYXHzwkTznWgNbbamO3EEU7kLPQcohvAYjeMZ5qZJc40c5UcK SLYIdstt45fjDisPwcRBFDCAI5uGYk9BV5n2zkauKfPAj9NI3whdpXKQI4LJ1HSJzFOx t2eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688126424; x=1690718424; 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=14D7DHntwp60GlIftqa4afNY/9x1F06cw0RktL6nRlU=; b=gdyoL5a2aNy5Ec2eovGYPqQhcv7DHlcqN7caHH6Vqu7RyNZKVwnaLBG/JBlWeqz8b3 KsEzlmFL9/3dVGT9zLl0JQ5/lWPUY66BL/jtrjvQPgsqYDv5ejiNnGbSkM0VK3pEYG5f DkRlFsLz51L36OMgplNsD+VOF1sDL+GGICnyc5gA5cVbMet5/Ymdt+PhgdwIkAVt8vU0 EYD8X+ldKmEni7leaIaqXS4mO3V8N2Qcq/XVyisE/4yqL092b+3T94vfU1wJdJFnhzTY TkvCco0LG7RPtaP8IqZ7Ghk02sfCrtB2F9jwEDik+4SKz/l75RqHRsceBuvP/d4sdEAG 6Dng== X-Gm-Message-State: ABy/qLbq9xp/oZefXJDDvYYs443R/+uHYRjdojwriBkDGI2gnJ47rIPn EcYbtUONGELgBfYOF7DFMdVc6g== X-Received: by 2002:a05:6512:3146:b0:4fa:5255:4fa3 with SMTP id s6-20020a056512314600b004fa52554fa3mr1912440lfi.5.1688126423715; Fri, 30 Jun 2023 05:00:23 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id g24-20020ac25398000000b004efae490c51sm488936lfh.240.2023.06.30.05.00.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 05:00:22 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Dennis Zhou , Geert Uytterhoeven , Biju Das , Wolfram Sang , linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mmc: Revert "mmc: core: Allow mmc_start_host() synchronously detect a card" Date: Fri, 30 Jun 2023 14:00:15 +0200 Message-Id: <20230630120015.363982-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770129437495965852?= X-GMAIL-MSGID: =?utf-8?q?1770129437495965852?= It has turned out that some mmc host drivers were not ready to deal with this change. Let's fix those host drivers first, then we can give this a new try. Fixes: 2cc83bf7d411 (mmc: core: Allow mmc_start_host() synchronously detect a card) Cc: Dennis Zhou Reported-by: Geert Uytterhoeven Reported-by: Biju Das Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index ec4108a3e5b9..3d3e0ca52614 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2199,8 +2199,10 @@ int mmc_card_alternative_gpt_sector(struct mmc_card *card, sector_t *gpt_sector) } EXPORT_SYMBOL(mmc_card_alternative_gpt_sector); -static void __mmc_rescan(struct mmc_host *host) +void mmc_rescan(struct work_struct *work) { + struct mmc_host *host = + container_of(work, struct mmc_host, detect.work); int i; if (host->rescan_disable) @@ -2272,14 +2274,6 @@ static void __mmc_rescan(struct mmc_host *host) mmc_schedule_delayed_work(&host->detect, HZ); } -void mmc_rescan(struct work_struct *work) -{ - struct mmc_host *host = - container_of(work, struct mmc_host, detect.work); - - __mmc_rescan(host); -} - void mmc_start_host(struct mmc_host *host) { host->f_init = max(min(freqs[0], host->f_max), host->f_min); @@ -2292,8 +2286,7 @@ void mmc_start_host(struct mmc_host *host) } mmc_gpiod_request_cd_irq(host); - host->detect_change = 1; - __mmc_rescan(host); + _mmc_detect_change(host, 0, false); } void __mmc_stop_host(struct mmc_host *host)