From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 07 May 2025 11:27:28 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uCb3o-0035W7-1F for lore@lore.pengutronix.de; Wed, 07 May 2025 11:27:28 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uCb3m-0006KE-JU for lore@pengutronix.de; Wed, 07 May 2025 11:27:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jx03ZRcEA0YYhzK6sBpfmg/eLm8vvnhgmluNS+RU3jo=; b=l32n3jI+icbnXeh0cbjwJSLdN2 kvUqjZxe5i2m0ij9rPbtjps4z1PD/QErnAjMM7intD/6onW1gmY46Ul0XZ69DWJgS3oPp5oEBK8So l38yYwXQQxjVc1cUGkd05Kp2SGdbVJLZlxOHHQXH97uK0IN4KPs1a/NEeYa+1a2Z8+3b4b5U1M44M DPf7b2QX9pEeHo7OQJDcqCvEFf6JMe9xhcgFrB0DvJi9uwgsy9Vab5DSlVVJQ+T+lzukF+h3JZewJ +/d4NqRggbbXePu6WDLO1+UwRiFOasAIzooHNPcB5sc5w9o46Xzuh03bDb/VxEecl+9xXDYyo48iY CUbhQqtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uCb3D-0000000EwrF-2ovA; Wed, 07 May 2025 09:26:51 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uCaFB-0000000Elbn-0yXX for barebox@lists.infradead.org; Wed, 07 May 2025 08:35:16 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uCaFA-0003zb-04; Wed, 07 May 2025 10:35:08 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uCaF9-001Wus-2X; Wed, 07 May 2025 10:35:07 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1uCa2e-00AQeI-2S; Wed, 07 May 2025 10:22:12 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 7 May 2025 10:22:04 +0200 Message-Id: <20250507082209.3289972-26-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507082209.3289972-1-a.fatoum@pengutronix.de> References: <20250507082209.3289972-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250507_013509_324379_18CDEA40 X-CRM114-Status: GOOD ( 13.05 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-6.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 25/30] mci: sdhci: fix sdhci_transfer_data MMC_SEND_TUNING compatibility X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Depending on whether we are executing a tuning sequence or not, we need to poll for different status bits. Implement the logic in preparation for adding HS200 support to the i.MX eSDHC driver. Signed-off-by: Ahmad Fatoum --- drivers/mci/sdhci.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c index 3051354a3076..c8fd78a5e62d 100644 --- a/drivers/mci/sdhci.c +++ b/drivers/mci/sdhci.c @@ -291,8 +291,10 @@ void sdhci_set_cmd_xfer_mode(struct sdhci *host, struct mci_cmd *cmd, if (data->flags & MMC_DATA_READ) *xfer |= SDHCI_DATA_TO_HOST; - if (dma) + if (dma && !mmc_op_tuning(cmd->cmdidx)) *xfer |= SDHCI_DMA_EN; + } else if (mmc_op_tuning(cmd->cmdidx)) { + *command |= SDHCI_DATA_PRESENT; } } @@ -529,7 +531,7 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_cmd *cmd, struct device *dev = sdhci_dev(sdhci); u64 start; int nbytes; - u32 irqstat; + u32 irqcheck, irqstat; int ret; if (!data) @@ -539,6 +541,10 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_cmd *cmd, start = get_time_ns(); + irqcheck = SDHCI_INT_XFER_COMPLETE; + if (mmc_op_tuning(cmd->cmdidx)) + irqcheck = SDHCI_INT_DATA_AVAIL; + do { irqstat = sdhci_read32(sdhci, SDHCI_INT_STATUS); @@ -575,7 +581,7 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_cmd *cmd, sdhci_set_sdma_addr(sdhci, ALIGN(dma, SDHCI_DEFAULT_BOUNDARY_SIZE)); } - if (irqstat & SDHCI_INT_XFER_COMPLETE) + if (irqstat & irqcheck) break; if (is_timeout(start, 10 * SECOND)) { @@ -597,12 +603,16 @@ int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_cmd *cmd, struct mci_data *data) { unsigned int block = 0; - u32 stat, prs; + u32 stat, prs, irqcheck; uint64_t start = get_time_ns(); if (!data) return 0; + irqcheck = SDHCI_INT_XFER_COMPLETE; + if (mmc_op_tuning(cmd->cmdidx)) + irqcheck = SDHCI_INT_DATA_AVAIL; + do { stat = sdhci_read32(sdhci, SDHCI_INT_STATUS); if (stat & SDHCI_INT_ERROR) @@ -630,7 +640,7 @@ int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_cmd *cmd, if (is_timeout(start, 10 * SECOND)) return -ETIMEDOUT; - } while (!(stat & SDHCI_INT_XFER_COMPLETE)); + } while (!(stat & irqcheck)); return 0; } @@ -822,7 +832,8 @@ int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *da if (data || (cmd && (cmd->resp_type & MMC_RSP_BUSY))) mask |= SDHCI_CMD_INHIBIT_DATA; - if (cmd && cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) + if (cmd && (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION || + mmc_op_tuning(cmd->cmdidx))) mask &= ~SDHCI_CMD_INHIBIT_DATA; timeout_ns = sdhci_compute_timeout(cmd, data, SDHCI_CMD_DEFAULT_BUSY_TIMEOUT_NS); @@ -847,7 +858,8 @@ int sdhci_wait_idle_data(struct sdhci *host, struct mci_cmd *cmd) mask = SDHCI_CMD_INHIBIT_CMD | SDHCI_CMD_INHIBIT_DATA; timeout_ns = SDHCI_CMD_DEFAULT_BUSY_TIMEOUT_NS; - if (cmd && cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) + if (cmd && (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION || + mmc_op_tuning(cmd->cmdidx))) mask &= ~SDHCI_CMD_INHIBIT_DATA; if (cmd && cmd->busy_timeout != 0) -- 2.39.5