From patchwork Fri Apr 25 11:13:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 885227 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC569242D91 for ; Fri, 25 Apr 2025 11:14:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; cv=none; b=f8s4tXfN8/UI11rn1Nvjth8KNlmpCzyZ+RKDEimixUPLUqhL0nomfGwAc1lbmK/4T1y1U5OJ6kAmxPm1PVjXeWVtWgjRq/AsLrjQlBN2KVRQmU5HH5JgROTMP+Xmanmx9xHPX/YR0hZCwR0/23d+6t9YDEbm23r2xJtmKIkcwDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; c=relaxed/simple; bh=VSs1ZANAFUhU6l5mzwZq8u2kPjLwcCGO2Ip/Nzjqtgg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dtBOn8HU2vWkziwACL8E8BLnWC8NukRQwAIVODrAn45rJkL+OdU5yLUUMudr11XrahRUS8VQNO/dx24ptJYjtB1C7yQsXP919/KId42tdyvrvGj6/uhpW3dNH1s8bibM2d6bns5xeux1rjhbgj07WPT3DQtqiG/yeKUvxk033LU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=LGuTv9Wx; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="LGuTv9Wx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=ceVBVVUMdRLfCSHFeF8WDzT0M+dOm9siBST3UhcyzPg=; b=LGuTv9 WxrN1klnJXrCa55EkLg8SmdDUzm4/9S/FtviE9rUIn0dpwrj+vFnsEMSVWxQP7Io toEkYzxluQw9w9v+e0HQCgdYQv7VL+oHGEc//5tA+Hxuri5H1HTmG9oaWKUnU434 roKRFEqIR09scpOg7QAB2IqvOy/kqV5JmPwhD0QufjdlUGgZFLfpYyVXF5MBuhMV 3bPojP7957/q1Sp83WHRCKs1+Zuk/VNOsG7f1hx+mSpZWNMYvOJz7BSgovGZqbw5 zVCOJLIzZdYNV6IdXpPuGB8XaZbBLCTba/DSrQknI/TkEEn/jSHOdyrpCsTH4oo5 TZ+McT5Tz3ukYa2g== Received: (qmail 3801103 invoked from network); 25 Apr 2025 13:14:17 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:17 +0200 X-UD-Smtp-Session: l3s3148p1@/ntgb5gzYIYujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 01/11] mmc: rename mmc_retune_enable() to mmc_host_retune_enable() Date: Fri, 25 Apr 2025 13:13:57 +0200 Message-ID: <20250425111414.2522-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 2 +- drivers/mmc/core/host.c | 4 ++-- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/mmc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index a0e2dce70434..b0901d3a0f67 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -948,7 +948,7 @@ int mmc_execute_tuning(struct mmc_card *card) err = host->ops->execute_tuning(host, opcode); if (!err) { mmc_retune_clear(host); - mmc_retune_enable(host); + mmc_host_retune_enable(host); return 0; } diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index dacb5bd9bb71..e7bd8d415c6a 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -104,10 +104,10 @@ void mmc_unregister_host_class(void) } /** - * mmc_retune_enable() - enter a transfer mode that requires retuning + * mmc_host_retune_enable() - enter a transfer mode that requires retuning * @host: host which should retune now */ -void mmc_retune_enable(struct mmc_host *host) +void mmc_host_retune_enable(struct mmc_host *host) { host->can_retune = 1; if (host->retune_period) diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index 48c4952512a5..8989aa73c2a1 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -13,7 +13,7 @@ int mmc_register_host_class(void); void mmc_unregister_host_class(void); -void mmc_retune_enable(struct mmc_host *host); +void mmc_host_retune_enable(struct mmc_host *host); void mmc_retune_disable(struct mmc_host *host); void mmc_retune_hold(struct mmc_host *host); void mmc_retune_release(struct mmc_host *host); diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index e499835b05a9..621022348f33 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1240,7 +1240,7 @@ static int mmc_select_hs400(struct mmc_card *card) if (host->ops->execute_hs400_tuning) { mmc_retune_disable(host); err = host->ops->execute_hs400_tuning(host, card); - mmc_retune_enable(host); + mmc_host_retune_enable(host); if (err) goto out_err; } From patchwork Fri Apr 25 11:13:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 885229 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC5C8244685 for ; Fri, 25 Apr 2025 11:14:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579665; cv=none; b=T6drxuDHMBwxy4T85JRxRUmYGNdz0/JkTXXnZXdWAA9DCEo3X3PHGtFaX7Yt6OEnyByxi87bBJ7batryTdNjj8XeUIUUY0sCHjOA6H2uNEABxYgNxdtpGzd9yxjT2jBSP9OAYiPKwuMXAZgBcJfcnYeHLdrOXHv/s6pZ6+dTCZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579665; c=relaxed/simple; bh=z87LNsYZi3fNdqV6cBynWTcc70A4CLYgzMZ4KHbIYyg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WU2D6sdXlhqc4qcgmG8IK0m4/BaQO6/YDDMcjpHl11OUQJ9T4yN7hVDY92UTeBsNkRNKXU7ll6o5zVhQLgz+XcncWBTZ2O0Y0GDQrQXt6DZEvGF60j0OJZL98szFlVwXNfwnRbq8h+v64LP+VjMVyFG4ZfZo0pXQi6LmSD1UVok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=OC4XCblA; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="OC4XCblA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=LK3O1YZdFpxihwZ+bfJfdOOvo+X2bYNcL70oK3S25Bw=; b=OC4XCb lAjarn4ZSSAY+cQft+VyJiHK7gzEWPEL3GWb5XsL/Z4whh0jXX6dPr7U0p+EOQIU UaojVpI1+RH5IjCCTPFt3Fev3IWsi9xpgVh4gW/ek+XYFsqUMnt9WZnDmrqR8xZ/ gCMXLK3OIKh8TRCVYsRYgNr+hQ4bvJVsSYH5LTA8fr8I6GeNrJ/gj0VJCd9Mz+jY 6Wecq0NhzowY0sDvRGD4XKDsDtfqGOXqt6kVlgsyVgcsHs16Pg1tnttPtYHG63hq 6t7Dy3/BSgNR4vcD4aC9MmuYc7O1+tRvvuT/5PN6JN2m3LSvynuwlnTjIIixppQE 9cf4WcvL6NvMDKdw== Received: (qmail 3801134 invoked from network); 25 Apr 2025 13:14:18 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:18 +0200 X-UD-Smtp-Session: l3s3148p1@9eJvb5gzZoYujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 02/11] mmc: rename mmc_retune_disable() to mmc_host_retune_disable() Date: Fri, 25 Apr 2025 13:13:58 +0200 Message-ID: <20250425111414.2522-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 2 +- drivers/mmc/core/host.c | 4 ++-- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/mmc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index b0901d3a0f67..faa935ba30f0 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -988,7 +988,7 @@ void mmc_set_initial_state(struct mmc_host *host) if (host->cqe_on) host->cqe_ops->cqe_off(host); - mmc_retune_disable(host); + mmc_host_retune_disable(host); if (mmc_host_is_spi(host)) host->ios.chip_select = MMC_CS_HIGH; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index e7bd8d415c6a..b0d261bd54b8 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -138,12 +138,12 @@ void mmc_retune_unpause(struct mmc_host *host) EXPORT_SYMBOL(mmc_retune_unpause); /** - * mmc_retune_disable() - exit a transfer mode that requires retuning + * mmc_host_retune_disable() - exit a transfer mode that requires retuning * @host: host which should not retune anymore * * It is not meant for temporarily preventing retuning! */ -void mmc_retune_disable(struct mmc_host *host) +void mmc_host_retune_disable(struct mmc_host *host) { mmc_retune_unpause(host); host->can_retune = 0; diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index 8989aa73c2a1..cf3a3894c2c8 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -14,7 +14,7 @@ int mmc_register_host_class(void); void mmc_unregister_host_class(void); void mmc_host_retune_enable(struct mmc_host *host); -void mmc_retune_disable(struct mmc_host *host); +void mmc_host_retune_disable(struct mmc_host *host); void mmc_retune_hold(struct mmc_host *host); void mmc_retune_release(struct mmc_host *host); int mmc_retune(struct mmc_host *host); diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 621022348f33..413af7cf3143 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1238,7 +1238,7 @@ static int mmc_select_hs400(struct mmc_card *card) mmc_set_bus_speed(card); if (host->ops->execute_hs400_tuning) { - mmc_retune_disable(host); + mmc_host_retune_disable(host); err = host->ops->execute_hs400_tuning(host, card); mmc_host_retune_enable(host); if (err) From patchwork Fri Apr 25 11:13:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 884695 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45CB5242D89 for ; Fri, 25 Apr 2025 11:14:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579666; cv=none; b=hYZPJai4z7buuwsVOQi78hJ51565eh6ykfge3VaFkSc6POVpYtOvrzxEMVVBhkEdUl9WhXAU+hjDqUPzn20k+LkccfaFDZK5jQ7SPNLjgetDmvdsT+ACYg1aJT35sWJKFS2CaHRj1DgTa4QrJ3fDcIKEvUvPG+VjfZgSV1WBSjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579666; c=relaxed/simple; bh=tKC+vURWtCOOe+c8P12arVQ7lL19yJem2nFbdcVhmtA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CtreYC0hXaNJAuhNSRLw7McroK5rOqq0FtH+JCpqpinzMgLZPrlSJMUndkRxguXWc9NqazFUVl0sfsm0yHrUSZ1aY8CTbq2ZkRjLi4Hbr3FHmhegdY3w8ZOhl8EDvmZx8wlvLdq8OUPkUK+5IH3eJU9jXkE2i0jiDnrjY/0X0qc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=bxS0M1YF; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="bxS0M1YF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=Gk5tmTYAGk3brXFN9hAeEf/E6QAIGn7Y1+P44izsl8U=; b=bxS0M1 YFNzbGdszCboSA4f4VTQgYDwF6MBzr4mceOulCV4dkJAecY7+47v/KIi7jJRAYTZ +f0cTWkDCTmmOGSPxfjo5N/8TXSTL7VMGrvugUP3qVGJA5seyUHWHXn/XaChA5rm 8Ic387Zw5bk2QeuS7mYPTbnfw1sFWekM44MoORK0fKEPbh9CXX1V686ix0NI6Tcu 1iU5XJqEr8TWCvKKjcRb0S2liBXwJJORFZZT3kyvh+pWx0JtTEzLlgUjz1wP9g4m bX7L9n0Jd4t1EBaiHviO1aRtx/q5qd5KIUfyUFv+7bEEa0UqdKKnJS+g81HLrMSf VJZHJIXvY2Y5GygQ== Received: (qmail 3801161 invoked from network); 25 Apr 2025 13:14:19 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:19 +0200 X-UD-Smtp-Session: l3s3148p1@FCt/b5gzdoYujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 03/11] mmc: rename mmc_retune_hold() to mmc_host_retune_hold() Date: Fri, 25 Apr 2025 13:13:59 +0200 Message-ID: <20250425111414.2522-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 4 ++-- drivers/mmc/core/host.c | 4 ++-- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/mmc.c | 2 +- drivers/mmc/core/mmc_ops.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index faa935ba30f0..5626444ec5a2 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -340,7 +340,7 @@ int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) init_completion(&mrq->cmd_completion); - mmc_retune_hold(host); + mmc_host_retune_hold(host); if (mmc_card_removed(host->card)) return -ENOMEDIUM; @@ -1612,7 +1612,7 @@ static int mmc_do_erase(struct mmc_card *card, sector_t from, bool use_r1b_resp; int err; - mmc_retune_hold(card->host); + mmc_host_retune_hold(card->host); /* * qty is used to calculate the erase timeout which depends on how many diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index b0d261bd54b8..d4cb207dcdac 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -123,7 +123,7 @@ void mmc_retune_pause(struct mmc_host *host) { if (!host->retune_paused) { host->retune_paused = 1; - mmc_retune_hold(host); + mmc_host_retune_hold(host); } } EXPORT_SYMBOL(mmc_retune_pause); @@ -157,7 +157,7 @@ void mmc_retune_timer_stop(struct mmc_host *host) } EXPORT_SYMBOL(mmc_retune_timer_stop); -void mmc_retune_hold(struct mmc_host *host) +void mmc_host_retune_hold(struct mmc_host *host) { if (!host->hold_retune) host->retune_now = 1; diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index cf3a3894c2c8..3d8c7c9039b4 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -15,7 +15,7 @@ void mmc_unregister_host_class(void); void mmc_host_retune_enable(struct mmc_host *host); void mmc_host_retune_disable(struct mmc_host *host); -void mmc_retune_hold(struct mmc_host *host); +void mmc_host_retune_hold(struct mmc_host *host); void mmc_retune_release(struct mmc_host *host); int mmc_retune(struct mmc_host *host); void mmc_retune_pause(struct mmc_host *host); diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 413af7cf3143..32e77f5194fa 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1977,7 +1977,7 @@ static int mmc_sleep(struct mmc_host *host) int err; /* Re-tuning can't be done once the card is deselected */ - mmc_retune_hold(host); + mmc_host_retune_hold(host); err = mmc_deselect_cards(host); if (err) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 66283825513c..bc30fd70fd99 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -610,7 +610,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, bool use_r1b_resp; unsigned char old_timing = host->ios.timing; - mmc_retune_hold(host); + mmc_host_retune_hold(host); if (!timeout_ms) { pr_warn("%s: unspecified timeout for CMD6 - use generic\n", @@ -989,7 +989,7 @@ void mmc_run_bkops(struct mmc_card *card) card->ext_csd.raw_bkops_status < EXT_CSD_BKOPS_LEVEL_2) return; - mmc_retune_hold(card->host); + mmc_host_retune_hold(card->host); /* * For urgent BKOPS status, LEVEL_2 and higher, let's execute @@ -1056,7 +1056,7 @@ int mmc_sanitize(struct mmc_card *card, unsigned int timeout_ms) pr_debug("%s: Sanitize in progress...\n", mmc_hostname(host)); - mmc_retune_hold(host); + mmc_host_retune_hold(host); err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_SANITIZE_START, 1, timeout_ms, 0, true, false, 0); From patchwork Fri Apr 25 11:14:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 884694 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35D5524338F for ; Fri, 25 Apr 2025 11:14:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579666; cv=none; b=VqkLMLjxhl+ywKQz4fi3vWCptgevwTScTuIMVy6E+yudSULT+svOJnrTBu2rpz7qh3FP0GeaZnuLiD85lGmnv5GQy28YBouQYIT85Bh8XoU2b3rVfpi0U6j1UfRfgLItMEhbGlegLkT5BzlGOylUTChsC9AMSl8xe3dV19oHyus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579666; c=relaxed/simple; bh=BIKLVPe7a5aP3E30bfSCTDdKD7JYhw49regtlxhDazE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fzS87P6yri6Xq9zh26Fr4YDXihy3tPXtgGvLxsMlbssFOhWdwi4WbLC+U1LI/MTyWbhqXp6WNAeY2iS+uDeq3qcfP6GPojcFZYTv2LRVkjiXgZPjrvqY3hWQvsyMqeQVvKwV2Dw4gRvFvNbfJCrjY+bGcO0ZHhEUZTOCN4dTsEM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=lJyEM1/u; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="lJyEM1/u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=0sldHov8U2ZO74+mv5x9GpBZzJ/9pnZ0/KweijKzcUM=; b=lJyEM1 /uqYGQ+0FkSExtYAbA4NYETZoa2el3N5ZTNDkZkWgR4KMjI91fu1ntLv1L+Plfn6 6eBEaOh76oeNgBNcZjtElAldUKXWW5kmTTNTwQSvdJ+VinLzMo4A/TKsdDc2/AkT HF7elWd9EcCwklSEGnSS9E1apTv6SuixEVFVC/ArLAt9KkJYi17e/d/HD2Z8naEA bwwqja+exh7TkFaed+d0/vNLT4u6+Xmtb1vojWVglDnZ/DvQGlGPm/ysOYeYyvb8 1+4u2e46VH39plUYaUkelEM/zfdMcdj7W/btMugQnxk3kq7rRUhpjun9Fw3ms50+ lFK7WzwIzk2uPcCQ== Received: (qmail 3801194 invoked from network); 25 Apr 2025 13:14:20 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:20 +0200 X-UD-Smtp-Session: l3s3148p1@ngWXb5gzgoYujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 04/11] mmc: rename mmc_retune_release() to mmc_host_retune_release() Date: Fri, 25 Apr 2025 13:14:00 +0200 Message-ID: <20250425111414.2522-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/block.c | 8 ++++---- drivers/mmc/core/core.c | 6 +++--- drivers/mmc/core/host.c | 6 +++--- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/mmc.c | 2 +- drivers/mmc/core/mmc_ops.c | 6 +++--- drivers/mmc/core/mmc_test.c | 2 +- drivers/mmc/core/sdio.c | 2 +- drivers/mmc/core/sdio_io.c | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 63320cc441c1..8d2c6b6fdead 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1813,7 +1813,7 @@ static int mmc_blk_fix_state(struct mmc_card *card, struct request *req) err = mmc_poll_for_busy(card, timeout, false, MMC_BUSY_IO); - mmc_retune_release(card->host); + mmc_host_retune_release(card->host); return err; } @@ -1948,7 +1948,7 @@ static void mmc_blk_mq_rw_recovery(struct mmc_queue *mq, struct request *req) if (err || mmc_blk_status_error(req, status)) brq->data.bytes_xfered = 0; - mmc_retune_release(card->host); + mmc_host_retune_release(card->host); /* * Try again to get the status. This also provides an opportunity for @@ -2207,7 +2207,7 @@ static void mmc_blk_mq_poll_completion(struct mmc_queue *mq, mmc_blk_mq_rw_recovery(mq, req); } else { mmc_blk_rw_reset_success(mq, req); - mmc_retune_release(host); + mmc_host_retune_release(host); } mmc_blk_urgent_bkops(mq, mqrq); @@ -2431,7 +2431,7 @@ static int mmc_blk_mq_issue_rw_rq(struct mmc_queue *mq, /* Release re-tuning here where there is no synchronization required */ if (err || mmc_host_done_complete(host)) - mmc_retune_release(host); + mmc_host_retune_release(host); out_post_req: if (err) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 5626444ec5a2..7c9c22a25684 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -421,7 +421,7 @@ void mmc_wait_for_req_done(struct mmc_host *host, struct mmc_request *mrq) __mmc_start_request(host, mrq); } - mmc_retune_release(host); + mmc_host_retune_release(host); } EXPORT_SYMBOL(mmc_wait_for_req_done); @@ -574,7 +574,7 @@ int mmc_cqe_recovery(struct mmc_host *host) if (err) err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); - mmc_retune_release(host); + mmc_host_retune_release(host); return err; } @@ -1713,7 +1713,7 @@ static int mmc_do_erase(struct mmc_card *card, sector_t from, err = mmc_poll_for_busy(card, busy_timeout, false, MMC_BUSY_ERASE); out: - mmc_retune_release(card->host); + mmc_host_retune_release(card->host); return err; } diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index d4cb207dcdac..9be1727d8d5d 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -132,7 +132,7 @@ void mmc_retune_unpause(struct mmc_host *host) { if (host->retune_paused) { host->retune_paused = 0; - mmc_retune_release(host); + mmc_host_retune_release(host); } } EXPORT_SYMBOL(mmc_retune_unpause); @@ -164,14 +164,14 @@ void mmc_host_retune_hold(struct mmc_host *host) host->hold_retune += 1; } -void mmc_retune_release(struct mmc_host *host) +void mmc_host_retune_release(struct mmc_host *host) { if (host->hold_retune) host->hold_retune -= 1; else WARN_ON(1); } -EXPORT_SYMBOL(mmc_retune_release); +EXPORT_SYMBOL(mmc_host_retune_release); int mmc_retune(struct mmc_host *host) { diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index 3d8c7c9039b4..426e6e54bac6 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -16,7 +16,7 @@ void mmc_unregister_host_class(void); void mmc_host_retune_enable(struct mmc_host *host); void mmc_host_retune_disable(struct mmc_host *host); void mmc_host_retune_hold(struct mmc_host *host); -void mmc_retune_release(struct mmc_host *host); +void mmc_host_retune_release(struct mmc_host *host); int mmc_retune(struct mmc_host *host); void mmc_retune_pause(struct mmc_host *host); void mmc_retune_unpause(struct mmc_host *host); diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 32e77f5194fa..d441137c477a 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2009,7 +2009,7 @@ static int mmc_sleep(struct mmc_host *host) err = __mmc_poll_for_busy(host, 0, timeout_ms, &mmc_sleep_busy_cb, host); out_release: - mmc_retune_release(host); + mmc_host_retune_release(host); return err; } diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index bc30fd70fd99..4728318cf6f7 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -660,7 +660,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, mmc_set_timing(host, old_timing); } out: - mmc_retune_release(host); + mmc_host_retune_release(host); return err; } @@ -1009,7 +1009,7 @@ void mmc_run_bkops(struct mmc_card *card) pr_warn("%s: Error %d running bkops\n", mmc_hostname(card->host), err); - mmc_retune_release(card->host); + mmc_host_retune_release(card->host); } EXPORT_SYMBOL(mmc_run_bkops); @@ -1071,7 +1071,7 @@ int mmc_sanitize(struct mmc_card *card, unsigned int timeout_ms) if (err == -ETIMEDOUT && !mmc_interrupt_hpi(card)) pr_warn("%s: Sanitize aborted\n", mmc_hostname(host)); - mmc_retune_release(host); + mmc_host_retune_release(host); pr_debug("%s: Sanitize completed\n", mmc_hostname(host)); return err; diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index be2d2895b4c4..503e4b2a7424 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c @@ -810,7 +810,7 @@ static int mmc_test_start_areq(struct mmc_test_card *test, if (!err && mrq) { err = mmc_start_request(host, mrq); if (err) - mmc_retune_release(host); + mmc_host_retune_release(host); } if (prev_mrq) diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 4b19b8a16b09..7f317b619c29 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1098,7 +1098,7 @@ static int mmc_sdio_resume(struct mmc_host *host) */ mmc_retune_hold_now(host); err = sdio_enable_4bit_bus(host->card); - mmc_retune_release(host); + mmc_host_retune_release(host); } if (err) diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c index b774bf51981d..d190ab4253f8 100644 --- a/drivers/mmc/core/sdio_io.c +++ b/drivers/mmc/core/sdio_io.c @@ -809,6 +809,6 @@ EXPORT_SYMBOL_GPL(sdio_retune_hold_now); */ void sdio_retune_release(struct sdio_func *func) { - mmc_retune_release(func->card->host); + mmc_host_retune_release(func->card->host); } EXPORT_SYMBOL_GPL(sdio_retune_release); From patchwork Fri Apr 25 11:14:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 885226 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1427A245037 for ; Fri, 25 Apr 2025 11:14:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; cv=none; b=kq3yRqU9sbfDhLU8PcJTBYp4snjcbkn8LBM8VzENskBGefCMLMm76kDuduVitK2cvz7Pe01C9iNjkkS0ECNrJr6uiYNKQsGw530sxsDq0SxyhTsXFg3Qf46UBmGhc8qYhDq10Ye9+y6208EPbPj10U6/+GMFSnRGdd5CbtNPLj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; c=relaxed/simple; bh=KEXEmArvJ2+878NdvS1KB5pTxOtVSIn8QpADchQV9+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iDc2zRRRHjcgRpPyR43aNCgbX3oBDY3oikQ7AeJ6Th0LvYBDZgPFJqseSWpuewQncVqc3P5xf4OtYNuwUZL+yuH4u41EBBsr+GogjBJx+tkKk37dY/nChcfFrNrMjBhE9u04KdWVf+YAgBVTx2msGI1umDYTp59ASd8xbAdLgCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=TuEIId/v; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="TuEIId/v" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=2sZ/XRw+duqLpjUjmN04ZhzxnzICBfuOo6enpDvw5z8=; b=TuEIId /vgkKEo2GeK8JAPMoLlyMCzxelXoMpc2GoP1mNwlxUDwMn0f6Z2Fv0vLBXYT9XiP gr0AySxNneDAovlhl2P8oySYOK6McjVq0Hpw0xY6UsTetVLk/UHXYdaOY4IOqoK8 JWb/l7D6icgWoup06lxIwlHd8AIV0STsIILYcWWl98thGkb2ylCvkE5tl3wnWDwU hrolpzNoq+kujB8Z37EWEY/uUyWOkM6LTgJZqRD8oZOElIhjdmawVeWXltduzEGd EmIpPeVDDCIe0v+9r+qKhAitaFDHcJupqf2XQNDE4/vPPaoD3gsdWpk++UEth/Cl kAFcyAcpmR5KLrMA== Received: (qmail 3801218 invoked from network); 25 Apr 2025 13:14:21 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:21 +0200 X-UD-Smtp-Session: l3s3148p1@Ttqkb5gzBJgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 05/11] mmc: rename mmc_retune() to mmc_host_retune() Date: Fri, 25 Apr 2025 13:14:01 +0200 Message-ID: <20250425111414.2522-6-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 4 ++-- drivers/mmc/core/host.c | 2 +- drivers/mmc/core/host.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 7c9c22a25684..352db90785cb 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -217,7 +217,7 @@ static void __mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) int err; /* Assumes host controller has been runtime resumed by mmc_claim_host */ - err = mmc_retune(host); + err = mmc_host_retune(host); if (err) { mrq->cmd->error = err; mmc_request_done(host, mrq); @@ -443,7 +443,7 @@ int mmc_cqe_start_req(struct mmc_host *host, struct mmc_request *mrq) * active requests i.e. this is the first. Note, re-tuning will call * ->cqe_off(). */ - err = mmc_retune(host); + err = mmc_host_retune(host); if (err) goto out_err; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 9be1727d8d5d..b0c958f761da 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -173,7 +173,7 @@ void mmc_host_retune_release(struct mmc_host *host) } EXPORT_SYMBOL(mmc_host_retune_release); -int mmc_retune(struct mmc_host *host) +int mmc_host_retune(struct mmc_host *host) { bool return_to_hs400 = false; int err; diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index 426e6e54bac6..45200070d318 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -17,7 +17,7 @@ void mmc_host_retune_enable(struct mmc_host *host); void mmc_host_retune_disable(struct mmc_host *host); void mmc_host_retune_hold(struct mmc_host *host); void mmc_host_retune_release(struct mmc_host *host); -int mmc_retune(struct mmc_host *host); +int mmc_host_retune(struct mmc_host *host); void mmc_retune_pause(struct mmc_host *host); void mmc_retune_unpause(struct mmc_host *host); From patchwork Fri Apr 25 11:14:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 884693 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A49FE2451D7 for ; Fri, 25 Apr 2025 11:14:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; cv=none; b=oE06dPGeO95T40qjThMz1TuF6CYFewLZaJ7BsGTVAEDQRo2Ui18xFfNvcmLL5iRlOqvEqyL30bbciOKvua1EVDuvMWPlSQWje8cd1xJWlfaEcuG77Z8M80rpwIIw3W3UR6E8ckhDkHNCeFfAVziJZAo9Ky3pLjA1hUh8+BJxefA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; c=relaxed/simple; bh=Yb9u6zNsILt6J0d1h2j49WT+R0SN4cUlJSQGWciMs5Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S2iojerpVmKqLYXFRCzBaNGdRH7jRRB3o95BjbF/3OKPT6z6YDwf5EDt9JHmpoqODGZ96BjffGNvcTAGYWWsBW7a+WzcNcKqeGiXORGyZemgMzzEEqSZiXOJQVV4V6GvZnDLvtmQoymUNNuRWFQab5EQdyN4C1desZkeSaMoVZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=YYF0Dy4B; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="YYF0Dy4B" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=+RBI1vPta0neq5DNX4gAYXGxAf6p2HH9SJJFXxkjR04=; b=YYF0Dy 4BgovLkpglu4wh/OG/ZGzAH31Bo+nmgfGzJ9H/QW/j3aR01hugRvzRdXdf8KRNE1 ZkjcG8R9lCNnlpnfDjx4MQS75vKdcRFQJuinMI2jF9e1A3i8/hUmYUVEbZjv6rPY COgpS7o3MsQ95Ip4+afCAV5D5y+S36z6eBJstIgkA22hQ0qyiQpa5SyDmpXSa9Qs iJlbB8wlzQDa29Gjzqoq6J37fJUXqtuHoqpF8Rj9YULC5gOzhrRsiBS6scSCeV3R T5j23i/JzA14krFM49+8hq0NtucuSAl8kqQTkJ7TGklYmXND0jE0mRq1w4ePmW89 +qZNFpEkKffbJVbA== Received: (qmail 3801241 invoked from network); 25 Apr 2025 13:14:22 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:22 +0200 X-UD-Smtp-Session: l3s3148p1@gruwb5gzEpgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 06/11] mmc: rename mmc_retune_pause() to mmc_host_retune_pause() Date: Fri, 25 Apr 2025 13:14:02 +0200 Message-ID: <20250425111414.2522-7-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/block.c | 2 +- drivers/mmc/core/host.c | 4 ++-- drivers/mmc/core/host.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 8d2c6b6fdead..69469239bea4 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -931,7 +931,7 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card, if (ret) return ret; } - mmc_retune_pause(card->host); + mmc_host_retune_pause(card->host); } return ret; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index b0c958f761da..db1f2ad6e7c6 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -119,14 +119,14 @@ void mmc_host_retune_enable(struct mmc_host *host) * Pause re-tuning for a small set of operations. The pause begins after the * next command. */ -void mmc_retune_pause(struct mmc_host *host) +void mmc_host_retune_pause(struct mmc_host *host) { if (!host->retune_paused) { host->retune_paused = 1; mmc_host_retune_hold(host); } } -EXPORT_SYMBOL(mmc_retune_pause); +EXPORT_SYMBOL(mmc_host_retune_pause); void mmc_retune_unpause(struct mmc_host *host) { diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index 45200070d318..e7757423e0fa 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -18,7 +18,7 @@ void mmc_host_retune_disable(struct mmc_host *host); void mmc_host_retune_hold(struct mmc_host *host); void mmc_host_retune_release(struct mmc_host *host); int mmc_host_retune(struct mmc_host *host); -void mmc_retune_pause(struct mmc_host *host); +void mmc_host_retune_pause(struct mmc_host *host); void mmc_retune_unpause(struct mmc_host *host); static inline void mmc_retune_clear(struct mmc_host *host) From patchwork Fri Apr 25 11:14:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 884692 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86E81242D94 for ; Fri, 25 Apr 2025 11:14:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; cv=none; b=mxJ+/o82RPmjPbi7CNKAIngRXAzg1l4nVRk8mMINT/i+T/t9X7vlxPpw8ff4FQNqM1aX+f3kfTxPdinrwohuA3U4p5kKt2wFl2I0B+nIrIPKO3Yfy8qwZfK+naTbivLdoKfHo6+Lzpc79bf+XzMEvlZ5mss/ovPEACCwcttf28E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579667; c=relaxed/simple; bh=skAAao0twSQMDv8UagWZqdlByqTEeRtAliVHhVHTyIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fDFwLZoYwm7+9oTQo1rMSSj/RMIsM2kxoaxVChQ5zCOBjnvJI3e7FyhGRI17TAxDqRkkViXmopBG/pdUp4kKkW+6TUMFd5FnwUagyRGEsrbJ05IRocTlWnU31ftRUH/i1FLnk1WFjCa8hCUYZxpWB1/4X8yj4QQuxgxCAjo1ADk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=h9Er39cD; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="h9Er39cD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=8LnXtDCmxsVfPQ183EGlLMrJB92qetzGxF8LFfq6maw=; b=h9Er39 cDO+ICS6YhT9Zmxg1TnLgxjmooYOxLpIUBR1KLhh/EghP6Myka8qsnd2+UCEajow Mx7WD2v+It4zLJXRJ63r8jKkNdDfKaK8tQYL0mtTM4gLshLApGUGwjOL4h9mPsuJ iojeTi3BI4i1zdBI+m6oW8e6bxmt5LHo858Y62cQ6+AWQW+/RXPfECsjfiW+Td1j wqSE2s3Cxq0sDi98hYNYRqpnNvISHu9yoycGKvlrjhinHaCebWHvWbXCLYSn3LT0 xbuNgdKjcnei4f0sWnP7HWFmPa8pkWEueO+1D5dXR1a4Xpk/b8iSNJYb08fZZMUy jt+pU/+v79PuOi2w== Received: (qmail 3801263 invoked from network); 25 Apr 2025 13:14:23 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:23 +0200 X-UD-Smtp-Session: l3s3148p1@gM28b5gzHJgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 07/11] mmc: rename mmc_retune_unpause() to mmc_host_retune_unpause() Date: Fri, 25 Apr 2025 13:14:03 +0200 Message-ID: <20250425111414.2522-8-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/block.c | 2 +- drivers/mmc/core/host.c | 6 +++--- drivers/mmc/core/host.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 69469239bea4..97181d40dfcf 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -945,7 +945,7 @@ static int mmc_blk_part_switch_post(struct mmc_card *card, int ret = 0; if ((part_type & mask) == rpmb) { - mmc_retune_unpause(card->host); + mmc_host_retune_unpause(card->host); if (card->reenable_cmdq && !card->ext_csd.cmdq_en) ret = mmc_cmdq_enable(card); } diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index db1f2ad6e7c6..0e67b6b2ea5b 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -128,14 +128,14 @@ void mmc_host_retune_pause(struct mmc_host *host) } EXPORT_SYMBOL(mmc_host_retune_pause); -void mmc_retune_unpause(struct mmc_host *host) +void mmc_host_retune_unpause(struct mmc_host *host) { if (host->retune_paused) { host->retune_paused = 0; mmc_host_retune_release(host); } } -EXPORT_SYMBOL(mmc_retune_unpause); +EXPORT_SYMBOL(mmc_host_retune_unpause); /** * mmc_host_retune_disable() - exit a transfer mode that requires retuning @@ -145,7 +145,7 @@ EXPORT_SYMBOL(mmc_retune_unpause); */ void mmc_host_retune_disable(struct mmc_host *host) { - mmc_retune_unpause(host); + mmc_host_retune_unpause(host); host->can_retune = 0; timer_delete_sync(&host->retune_timer); mmc_retune_clear(host); diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index e7757423e0fa..7db1239c91e0 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -19,7 +19,7 @@ void mmc_host_retune_hold(struct mmc_host *host); void mmc_host_retune_release(struct mmc_host *host); int mmc_host_retune(struct mmc_host *host); void mmc_host_retune_pause(struct mmc_host *host); -void mmc_retune_unpause(struct mmc_host *host); +void mmc_host_retune_unpause(struct mmc_host *host); static inline void mmc_retune_clear(struct mmc_host *host) { From patchwork Fri Apr 25 11:14:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 885225 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD730242D62 for ; Fri, 25 Apr 2025 11:14:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579668; cv=none; b=FzZxkGavYCu19y3K50QgxE6360habXsHV51Jtx+nMdmvGyw3i/EZgWvlmbrmLGpFDcf+LkmK0NUDGOf09gsZ/rdBDbiZUAIeLwiadllYZZq/uiRLfgbFRA1S2cSWVMCq/FTY91ZEl2q1ibKsrNxyfR4RqaF323XzpeWlK148WzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579668; c=relaxed/simple; bh=mmR0W1vXVi+xNHYLsvHs5YMSU7hYdanuaBY4YfkaZkQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B8cf8nlvBkMk9voMGsg5A3yKVNfwmQiy37Gp/H3aIAaHp8ufAaSdamu4h4qJGIWL6qFVBRBXgKnQN6dGy5cYIijcCJOMYRhHAiMLCLWrMcfx32nTa66MMZr5Ep0woZenxtHXMjhmf4n585p8EdKOQ2riIk73zl9xnu3IVkwKsIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=AzxL5Ffu; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="AzxL5Ffu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=yehkrVqIYA1VSv84XKK+aGBzTLQQRKHS7yLajE9th+8=; b=AzxL5F fumta4+uJ/hItuCFYfMNdb8lOjEwFa0i+mkhFNkaUzK7Z2b54+VndBfq/wR++gjz 4SddQk96rmrShRpRZojkBk7cQwzJyqZsNQK5ocRZm5xGTzFDepuAomxz8NMn/Fkj ja7FW/H84gvs0qLNCMXjgyUe70F3ATmgKx8SABbopEieR5tn9clq2V5B1ZkZ/q9s 37IqFb7AX9CHPX8x9UubKyMHa+cDWQeeuxDG7yu80NK6uiXY87fzex0E1eo1r3kE HCBEZ9/ZvbcNbIDLZL63XMHJxA2RJ5f5pVu1nqRG3E2kdYbe8bP6gPMswlkk5wOz 1CazO2kRqZAZ5uLQ== Received: (qmail 3801284 invoked from network); 25 Apr 2025 13:14:23 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:23 +0200 X-UD-Smtp-Session: l3s3148p1@YATJb5gzHpgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 08/11] mmc: rename mmc_retune_clear() to mmc_host_retune_clear() Date: Fri, 25 Apr 2025 13:14:04 +0200 Message-ID: <20250425111414.2522-9-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 2 +- drivers/mmc/core/host.c | 2 +- drivers/mmc/core/host.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 352db90785cb..81657449fee1 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -947,7 +947,7 @@ int mmc_execute_tuning(struct mmc_card *card) err = host->ops->execute_tuning(host, opcode); if (!err) { - mmc_retune_clear(host); + mmc_host_retune_clear(host); mmc_host_retune_enable(host); return 0; } diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 0e67b6b2ea5b..651c62ea0848 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -148,7 +148,7 @@ void mmc_host_retune_disable(struct mmc_host *host) mmc_host_retune_unpause(host); host->can_retune = 0; timer_delete_sync(&host->retune_timer); - mmc_retune_clear(host); + mmc_host_retune_clear(host); } void mmc_retune_timer_stop(struct mmc_host *host) diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index 7db1239c91e0..cf2d05706283 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -21,7 +21,7 @@ int mmc_host_retune(struct mmc_host *host); void mmc_host_retune_pause(struct mmc_host *host); void mmc_host_retune_unpause(struct mmc_host *host); -static inline void mmc_retune_clear(struct mmc_host *host) +static inline void mmc_host_retune_clear(struct mmc_host *host) { host->retune_now = 0; host->need_retune = 0; From patchwork Fri Apr 25 11:14:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 884691 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BF8B2459D8 for ; Fri, 25 Apr 2025 11:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579669; cv=none; b=TKzsL5ROJ8sX8aGcxX5xrjL9iuzta9vC9/4sY5uvmTMQuy1H1bfbdBTsnyoLx/QLK1ucPKog2FgTFZW/H7Nx5PbbtoWzDPYBnCUy/Rre5xMzmsQLjYzEKuNmRHrwr9vLnf+PmJM0rIcHWpvGdOnkDjLbwqqYgl8SILGhawQyM3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579669; c=relaxed/simple; bh=1BgSzRh44L1m+Jua57TCwrub9FfVAeqh5zaLB4ELfXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SEaccvybyUhY/wYI3PDyPHNmOt0H0dUylvxOIZuiRmg6C8hTOxlSAXMCzUlj6VnObMbpbhGgF022eBuU4UP1HetNtR6wVIXnE0dAy1id4Rrhx/3notBNPwT/T4dWFeWFc1cCaUtsHfD/gsMS6cyizuDQZKTh28tiAy3ZkVFjPLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=P97PNpAy; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="P97PNpAy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=uoV8j1RiPbKJEO17oQT2uITRKMxiSOMMBGim8oLD3ik=; b=P97PNp Ay5rHUn0VRuZAogo6iC3CJ+ohMsPTysd8U0go1tesatbypPKfMEqBtrAU6z+Usaq 9EZk9GoNmbkdNRiEACXQLdoMBOMkpyMBZkh7badtzI74Ot9CAHf+lhWwMA/maidV /Ozr4jtShFN1W5UGyRrPq4ouTqDPqV+/IRE4T5jjZa41EGYLup7uHNMojvMRgtDs 0CYiohyg0nC2pCmtvAexed+BkhOCj7XZQGwu071ZgL9j/ZVWtH4djimIsxexI2HN RwxrGouZWMimcCnMjASdL57aQi+t9o2MP6CFYoXXZpOs04sRuIlN5vug3WEWHdWM g1Nvz/KrNhJ9wmCw== Received: (qmail 3801310 invoked from network); 25 Apr 2025 13:14:24 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:24 +0200 X-UD-Smtp-Session: l3s3148p1@IEjYb5gzLpgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 09/11] mmc: rename mmc_retune_hold_now() to mmc_host_retune_hold_now() Date: Fri, 25 Apr 2025 13:14:05 +0200 Message-ID: <20250425111414.2522-10-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/block.c | 4 ++-- drivers/mmc/core/core.c | 2 +- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/sdio.c | 2 +- drivers/mmc/core/sdio_io.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 97181d40dfcf..fdea78878048 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1807,7 +1807,7 @@ static int mmc_blk_fix_state(struct mmc_card *card, struct request *req) unsigned int timeout = mmc_blk_data_timeout_ms(card->host, &brq->data); int err; - mmc_retune_hold_now(card->host); + mmc_host_retune_hold_now(card->host); mmc_blk_send_stop(card, timeout); @@ -2266,7 +2266,7 @@ void mmc_blk_mq_recovery(struct mmc_queue *mq) mq->rw_wait = false; if (mmc_blk_rq_error(&mqrq->brq)) { - mmc_retune_hold_now(host); + mmc_host_retune_hold_now(host); mmc_blk_mq_rw_recovery(mq, req); } diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 81657449fee1..c553eecce1ab 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -544,7 +544,7 @@ int mmc_cqe_recovery(struct mmc_host *host) struct mmc_command cmd; int err; - mmc_retune_hold_now(host); + mmc_host_retune_hold_now(host); /* * Recovery is expected seldom, if at all, but it reduces performance, diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index cf2d05706283..fb1a9d7b5c91 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -27,7 +27,7 @@ static inline void mmc_host_retune_clear(struct mmc_host *host) host->need_retune = 0; } -static inline void mmc_retune_hold_now(struct mmc_host *host) +static inline void mmc_host_retune_hold_now(struct mmc_host *host) { host->retune_now = 0; host->hold_retune += 1; diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 7f317b619c29..3fa1bae6845c 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1096,7 +1096,7 @@ static int mmc_sdio_resume(struct mmc_host *host) * need to hold retuning, because tuning only supprt * 4-bit mode or 8 bit mode. */ - mmc_retune_hold_now(host); + mmc_host_retune_hold_now(host); err = sdio_enable_4bit_bus(host->card); mmc_host_retune_release(host); } diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c index d190ab4253f8..af14be603863 100644 --- a/drivers/mmc/core/sdio_io.c +++ b/drivers/mmc/core/sdio_io.c @@ -793,7 +793,7 @@ EXPORT_SYMBOL_GPL(sdio_retune_crc_enable); */ void sdio_retune_hold_now(struct sdio_func *func) { - mmc_retune_hold_now(func->card->host); + mmc_host_retune_hold_now(func->card->host); } EXPORT_SYMBOL_GPL(sdio_retune_hold_now); From patchwork Fri Apr 25 11:14:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 885224 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCFCA2459DD for ; Fri, 25 Apr 2025 11:14:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579669; cv=none; b=gw7zkzhiOc9td93QmnBUJymGATDyqnjxYWmnhTclU4scbJaScyXd86C6Nl9rBm1VJgift/mS6d97Z3cpJ+laIL/Nof74/dcNNntnLiTpnX498quQi7042J4fYeevp1OZLGBFbZ+VnGSJL11YzoXIzdibFaS00VJEai3CAXB4yVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579669; c=relaxed/simple; bh=SvyXNukR7T5uUKvSuunEQdZ0t4sqR4oxxbZH47LZ8Js=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UYnXO+hWdQ95Xmo8N/pDNPrrbt4YD6QdlU6mWmZLjwIzMrrSZ74Ir3AT77joqzN4Z8WKZSzTLKJYnRCsS7HEcm/OtUHXNtfJsgYDqtHL6ZSh6IMFxUBL8qiCjcxiWTAwS55uziInLzd4i27x/33kUQB/0tOtqF/0/+3sXL3E4bQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=bulccgdf; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="bulccgdf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=nzcjNl2sJfZ1fAZT+Onu+MVEJlHvRUQ2cqlGBbQ1J3Y=; b=bulccg dfkVlMQFPytBJZHTiWj6NOGqD9dgTNKqDDoiLUK5+uZC9vqkM8UJVnuyZBsbm0Ei U5QesKHnjcfLYJtvsaEtMGa3NXtxTw7OiyOwJG7kY7k+X9XeKgaGj2WZCcgbnaxk CPqudKKIcdml+BqNPMrbipjDRuaD7oWY9lsqdhdvXapO/4AkFlmiOBl/WQQvLNzY Rmb5FzyERXyrzvdyLj9sGa1HjjMgCnFd9GRkjIefn1Gpfz2YmFvuG+10zH0BbG2P KjAm3Yg63Sb8x35XVaf2+uVqfHw2gjK0NnX8pWx+vSPE+jVMoPmYdR2rz8yNGibN Vb1RCzhdaOJQMEYA== Received: (qmail 3801335 invoked from network); 25 Apr 2025 13:14:25 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:25 +0200 X-UD-Smtp-Session: l3s3148p1@cdvib5gzOJgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson Subject: [PATCH 10/11] mmc: rename mmc_retune_recheck() to mmc_host_retune_recheck() Date: Fri, 25 Apr 2025 13:14:06 +0200 Message-ID: <20250425111414.2522-11-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 2 +- drivers/mmc/core/host.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index c553eecce1ab..960d7f4a3503 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -412,7 +412,7 @@ void mmc_wait_for_req_done(struct mmc_host *host, struct mmc_request *mrq) mmc_card_removed(host->card)) break; - mmc_retune_recheck(host); + mmc_host_retune_recheck(host); pr_debug("%s: req failed (CMD%u): %d, retrying...\n", mmc_hostname(host), cmd->opcode, cmd->error); diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h index fb1a9d7b5c91..b1bd4388e215 100644 --- a/drivers/mmc/core/host.h +++ b/drivers/mmc/core/host.h @@ -33,7 +33,7 @@ static inline void mmc_host_retune_hold_now(struct mmc_host *host) host->hold_retune += 1; } -static inline void mmc_retune_recheck(struct mmc_host *host) +static inline void mmc_host_retune_recheck(struct mmc_host *host) { if (host->hold_retune <= 1) host->retune_now = 1; From patchwork Fri Apr 25 11:14:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 884690 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 359F82459DD for ; Fri, 25 Apr 2025 11:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579672; cv=none; b=Z5Ph9LAzN8NqmnCtUX3/8K1Gs7rGvcGzkBU0fg5MOEOqXIRSmPmUC/jJZEVX+VXB+3DJau6Ix3RojHD3KFXwkwIYVTnHPEjwh9sHq2K9mePQZkAuZIRz8ASHcdGl+JUbeJn0ZF4E8wFIobFNGQq5wHXfvEzlWaPwZvnrbBLeA1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579672; c=relaxed/simple; bh=WDl768/k2XZPf3ix/tJOCX3vVhrNeIIJfYXHENX4OgA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sfLAu3yO8QU//YkpktDpPDQARXikB9IVdTRSDt1boOThvoLg6iywbmF7Y8aNJWY4oMQjBbsck1JY03Qd017reO4AbSU5fEgXGzaYcwps2rxGZ+bB8Ak5xCbk07aORg5woIGYg2slYziJI8NGV/kNmauXDZB4LbndFQ2Uo1cSAMI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=PrXfrRO2; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="PrXfrRO2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=o8dZSj6KyBq+sXWqiCuImDo8ebOFxoaJEIPvwb07TS0=; b=PrXfrR O2xtLZfyvIe6vPTcYRg5Dou5RftuFbip2Nc7PqEKqrTm4NJZZHhCP0MynbKELv5C 4h1478vP2vG7KrGHX5/p+awMxeTnd67yegwtGs0dOea5t68f1CddtjVvmFn56rUm JZIQJR8c+4ak4ntivMrtVLJG4m6x0UvQG4D8kPrEDBgR76/DwCqznW7W8JWq9TpS LrkO7alAa/EqccZtZMQFpsVDImunpGJCawhCGMY5FuOB82Z7qX+t7BvQsbsYFEra ol375b635Zz+B/3afx0U+EAayhOQ0zKWTQmt3ar7lwuWCGbrmvxM/7XmnuYyWOkE IzePCVpq7WDeeGDw== Received: (qmail 3801357 invoked from network); 25 Apr 2025 13:14:28 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Apr 2025 13:14:28 +0200 X-UD-Smtp-Session: l3s3148p1@NPMGcJgzOpgujnsE From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: Wolfram Sang , Ulf Hansson , Adrian Hunter , Haibo Chen , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Michal Simek , Aubin Constans , Eugen Hristev , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Vignesh Raghavendra , Ben Dooks , Jaehoon Chung , Viresh Kumar , Patrice Chotard , Hu Ziji , imx@lists.linux.dev, s32@nxp.com, linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH 11/11] mmc: rename mmc_retune_needed() to mmc_host_retune_needed() Date: Fri, 25 Apr 2025 13:14:07 +0200 Message-ID: <20250425111414.2522-12-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> References: <20250425111414.2522-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang --- drivers/mmc/core/core.c | 4 ++-- drivers/mmc/core/host.c | 2 +- drivers/mmc/core/mmc_test.c | 2 +- drivers/mmc/core/sdio.c | 2 +- drivers/mmc/host/sdhci-acpi.c | 4 ++-- drivers/mmc/host/sdhci-esdhc-imx.c | 6 +++--- drivers/mmc/host/sdhci-of-arasan.c | 2 +- drivers/mmc/host/sdhci-of-at91.c | 2 +- drivers/mmc/host/sdhci-of-esdhc.c | 2 +- drivers/mmc/host/sdhci-omap.c | 2 +- drivers/mmc/host/sdhci-pci-core.c | 6 +++--- drivers/mmc/host/sdhci-pltfm.c | 2 +- drivers/mmc/host/sdhci-pxav3.c | 4 ++-- drivers/mmc/host/sdhci-s3c.c | 4 ++-- drivers/mmc/host/sdhci-spear.c | 2 +- drivers/mmc/host/sdhci-st.c | 2 +- drivers/mmc/host/sdhci-xenon.c | 2 +- drivers/mmc/host/sdhci.c | 2 +- drivers/mmc/host/sdhci_am654.c | 2 +- drivers/mmc/host/tmio_mmc_core.c | 4 ++-- include/linux/mmc/host.h | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 960d7f4a3503..c770a2835f23 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -146,7 +146,7 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) (err == -EILSEQ || (mrq->sbc && mrq->sbc->error == -EILSEQ) || (mrq->data && mrq->data->error == -EILSEQ) || (mrq->stop && mrq->stop->error == -EILSEQ))) - mmc_retune_needed(host); + mmc_host_retune_needed(host); if (err && cmd->retries && mmc_host_is_spi(host)) { if (cmd->resp[0] & R1_SPI_ILLEGAL_COMMAND) @@ -493,7 +493,7 @@ void mmc_cqe_request_done(struct mmc_host *host, struct mmc_request *mrq) /* Flag re-tuning needed on CRC errors */ if ((mrq->cmd && mrq->cmd->error == -EILSEQ) || (mrq->data && mrq->data->error == -EILSEQ)) - mmc_retune_needed(host); + mmc_host_retune_needed(host); trace_mmc_request_done(host, mrq); diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 651c62ea0848..c9c67716d665 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -214,7 +214,7 @@ static void mmc_retune_timer(struct timer_list *t) { struct mmc_host *host = from_timer(host, t, retune_timer); - mmc_retune_needed(host); + mmc_host_retune_needed(host); } static void mmc_of_parse_timing_phase(struct device *dev, const char *prop, diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index 503e4b2a7424..0293f2b7a9c8 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c @@ -1930,7 +1930,7 @@ static int mmc_test_rnd_perf(struct mmc_test_card *test, int write, int print, dev_addr = rnd_addr + test->card->pref_erase * ea + ssz * mmc_test_rnd_num(range2); if (force_retuning) - mmc_retune_needed(test->card->host); + mmc_host_retune_needed(test->card->host); ret = mmc_test_area_io(test, sz, dev_addr, write, 0, 0); if (ret) return ret; diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 3fa1bae6845c..bd2104e0f13c 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1056,7 +1056,7 @@ static int mmc_sdio_suspend(struct mmc_host *host) mmc_power_off(host); } else if (host->retune_period) { mmc_retune_timer_stop(host); - mmc_retune_needed(host); + mmc_host_retune_needed(host); } mmc_release_host(host); diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index e6c5c82f64fa..630868203f9e 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -1001,7 +1001,7 @@ static int sdhci_acpi_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_suspend_host(host); if (ret) @@ -1031,7 +1031,7 @@ static int sdhci_acpi_runtime_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_runtime_suspend_host(host); if (ret) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index b977d37e2684..2d78d7676967 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -2016,11 +2016,11 @@ static int sdhci_esdhc_suspend(struct device *dev) if ((imx_data->socdata->flags & ESDHC_FLAG_STATE_LOST_IN_LPMODE) && (host->tuning_mode != SDHCI_TUNING_MODE_1)) { mmc_retune_timer_stop(host->mmc); - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); } if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); /* * For the device need to keep power during system PM, need @@ -2099,7 +2099,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) return ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); imx_data->actual_clock = host->mmc->actual_clock; esdhc_pltfm_set_clock(host, 0); diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index 8c29676ab662..979f19fd95f4 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -598,7 +598,7 @@ static int sdhci_arasan_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); if (sdhci_arasan->has_cqe) { ret = cqhci_suspend(host->mmc); diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c index 97988ed37467..8b36cdc6cf81 100644 --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c @@ -256,7 +256,7 @@ static int sdhci_at91_runtime_suspend(struct device *dev) ret = sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); clk_disable_unprepare(priv->gck); clk_disable_unprepare(priv->hclock); diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 002d0d59b992..829491c59d09 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -1243,7 +1243,7 @@ static int esdhc_of_suspend(struct device *dev) esdhc_proctl = sdhci_readl(host, SDHCI_HOST_CONTROL); if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); return sdhci_suspend_host(host); } diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c index 8897839ab2aa..98111e4253ec 100644 --- a/drivers/mmc/host/sdhci-omap.c +++ b/drivers/mmc/host/sdhci-omap.c @@ -1440,7 +1440,7 @@ static int __maybe_unused sdhci_omap_runtime_suspend(struct device *dev) struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); if (omap_host->con != -EINVAL) sdhci_runtime_suspend_host(host); diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 13a84b9309e0..b4b355f41bfa 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -86,7 +86,7 @@ static int sdhci_pci_suspend_host(struct sdhci_pci_chip *chip) host = slot->host; if (chip->pm_retune && host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_suspend_host(host); if (ret) @@ -167,7 +167,7 @@ static int sdhci_pci_runtime_suspend_host(struct sdhci_pci_chip *chip) if (chip->rpm_retune && host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); } return 0; @@ -1035,7 +1035,7 @@ static void glk_rpm_retune_wa(struct sdhci_pci_chip *chip, bool susp) intel_host->rpm_retune_ok = true; chip->rpm_retune = true; - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); pr_info("%s: Requiring re-tune after rpm resume", mmc_hostname(host->mmc)); } diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 62753d72198a..845f700dd454 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -193,7 +193,7 @@ int sdhci_pltfm_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_suspend_host(host); if (ret) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 3fb56face3d8..ab83a39feed0 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -497,7 +497,7 @@ static int sdhci_pxav3_suspend(struct device *dev) pm_runtime_get_sync(dev); if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_suspend_host(host); pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); @@ -532,7 +532,7 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev) return ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); clk_disable_unprepare(pxa->clk_io); if (!IS_ERR(pxa->clk_core)) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index bdf4dc0d6b77..a9524a0d7adc 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -695,7 +695,7 @@ static int sdhci_s3c_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); return sdhci_suspend_host(host); } @@ -719,7 +719,7 @@ static int sdhci_s3c_runtime_suspend(struct device *dev) ret = sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); if (ourhost->cur_clk >= 0) clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]); diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index 770dc12b9ae9..c192c7d284b8 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c @@ -141,7 +141,7 @@ static int sdhci_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_suspend_host(host); if (!ret) diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c index 4973e08a98f8..bfeb680d4be9 100644 --- a/drivers/mmc/host/sdhci-st.c +++ b/drivers/mmc/host/sdhci-st.c @@ -456,7 +456,7 @@ static int sdhci_st_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = sdhci_suspend_host(host); if (ret) diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c index 098f0ea45cbe..48b00b82d361 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -655,7 +655,7 @@ static int xenon_runtime_suspend(struct device *dev) return ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); clk_disable_unprepare(pltfm_host->clk); /* diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index fd5681d1e31f..fa1924657ed6 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3635,7 +3635,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) mmc_hostname(host->mmc)); if (intmask & SDHCI_INT_RETUNE) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); if ((intmask & SDHCI_INT_CARD_INT) && (host->ier & SDHCI_INT_CARD_INT)) { diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c index f75c31815ab0..ffd40733d71c 100644 --- a/drivers/mmc/host/sdhci_am654.c +++ b/drivers/mmc/host/sdhci_am654.c @@ -1043,7 +1043,7 @@ static int sdhci_am654_runtime_suspend(struct device *dev) int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); ret = cqhci_suspend(host->mmc); if (ret) diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index b71241f55df5..a2b35c1c8b62 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -224,7 +224,7 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host, bool preserve) } if (host->mmc->card) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); } static void tmio_mmc_reset_work(struct work_struct *work) @@ -852,7 +852,7 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) /* Error means retune, but executed command was still successful */ if (host->check_retune && host->check_retune(host, mrq)) - mmc_retune_needed(host->mmc); + mmc_host_retune_needed(host->mmc); /* If SET_BLOCK_COUNT, continue with main command */ if (host->mrq && !mrq->cmd->error) { diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 68f09a955a90..e49a3f502ecf 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -699,7 +699,7 @@ static inline bool mmc_card_uhs2(struct mmc_host *host) void mmc_retune_timer_stop(struct mmc_host *host); -static inline void mmc_retune_needed(struct mmc_host *host) +static inline void mmc_host_retune_needed(struct mmc_host *host) { if (host->can_retune) host->need_retune = 1;