From patchwork Tue Jan 31 21:02:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 51037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp33200wrn; Tue, 31 Jan 2023 13:06:43 -0800 (PST) X-Google-Smtp-Source: AK7set9kj9OA3jHorlxfGu7bQU86BJx3HO+KCHV2h5ZG87gpBDr1iqKtONkkh4JHFNpjQ5RqXjtp X-Received: by 2002:a17:907:9725:b0:879:aa55:a908 with SMTP id jg37-20020a170907972500b00879aa55a908mr24968935ejc.12.1675199202965; Tue, 31 Jan 2023 13:06:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675199202; cv=none; d=google.com; s=arc-20160816; b=xxGcBiCR6Hyyvwfi0FojrqCgCOU5l5wWdYOyn5JNjlQcDkOo48HSWB5xBOuQM3wpbc kOMj9r1ikVOMMzVcsEuohE5Zbfr6CShLpsq5K/8J95O8z5FpKWxmUqPnb5giuzCTiF7D zF30UQIusH79gvyJLMvXurhsT7XVGtemVDb93I0Xk6jo8k4FRZqacEcwbrxtZ2/bwPDI fmglRDGV7xtfAkBqKGzMofUiMW0w1RyugOruLr8g7i3QIk7ESWiq7dGY83zpx9WL769W hAwiUIbQYb4g2te3lkYL4uJxNL0CX7LPHscS4xeaB5NDlEw5ObXU9GOvCmEYxHx3HBOB WCXw== 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=4cfcgyV3aGGoH7bkT08YeGcbkBQEHVw7y75FoDFtFug=; b=LPehh2iCbW9Kh7BH27OaGfsf0+v3nFqIK4EXkPoF42XRP5Pu//7Xcy9fppy861NjlI LV/44BRa73urxFe4tFXJrGjaaFIwYLQtSwcmF4NwLV0SVOKvHK5mR+I7gLnjo5P/lYE5 p0IwTKJS4AVEht3bWOh8bJn8iId/kux2pKHAm6X94L/Jz9D+ELk7tVB540pzkIlRIhxT pFZnr+gA6YnDyqAmhsmrFv5pMXPpaeZiHuKZniNodnnIMSpQYiA8iRISSgEp6Nz0pjh4 3nqbboz6lVl1eqqFZf2hueRyHQcPN9TkTdtI+0Q6RtJB3Ad1VL4KV4G0WXhxakwv3YGJ OzkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=gmkm7HQa; 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=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n4-20020a17090673c400b0086e54bcc9b5si21116002ejl.499.2023.01.31.13.05.21; Tue, 31 Jan 2023 13:06:42 -0800 (PST) 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=@crapouillou.net header.s=mail header.b=gmkm7HQa; 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=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231905AbjAaVCn (ORCPT + 99 others); Tue, 31 Jan 2023 16:02:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231527AbjAaVCl (ORCPT ); Tue, 31 Jan 2023 16:02:41 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32F6010CA; Tue, 31 Jan 2023 13:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1675198956; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=4cfcgyV3aGGoH7bkT08YeGcbkBQEHVw7y75FoDFtFug=; b=gmkm7HQaVu5zsURDq0L1yTEtMxxqPBeTqvJRLNLATyCSpS4AsarbmrsmaV3P0993HqzKQP yIB5M2CtpQ3aI+ksGKlfrJAt8yC1p/lA/UH19E95vVLi20MhYyXrJ+HeusdqlO0Xvacv3e pPDjCQbQbLE0yQeGpUGmFykPL2SH1fo= From: Paul Cercueil To: Ulf Hansson Cc: linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 1/2] mmc: jz4740: Work around bug on JZ4760(B) Date: Tue, 31 Jan 2023 21:02:28 +0000 Message-Id: <20230131210229.68129-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham 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?1756573679319133535?= X-GMAIL-MSGID: =?utf-8?q?1756573679319133535?= On JZ4760 and JZ4760B, SD cards fail to run if the maximum clock rate is set to 50 MHz, even though the controller officially does support it. Until the actual bug is found and fixed, limit the maximum clock rate to 24 MHz. Signed-off-by: Paul Cercueil --- drivers/mmc/host/jz4740_mmc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 319a2a79c9a0..eb8e9607b086 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -1104,6 +1104,16 @@ static int jz4740_mmc_probe(struct platform_device* pdev) mmc->ops = &jz4740_mmc_ops; if (!mmc->f_max) mmc->f_max = JZ_MMC_CLK_RATE; + + /* + * There seems to be a problem with this driver on the JZ4760 and + * JZ4760B SoCs. There, when using the maximum rate supported (50 MHz), + * the communication fails with many SD cards. + * Until this bug is sorted out, limit the maximum rate to 24 MHz. + */ + if (host->version == JZ_MMC_JZ4760 && mmc->f_max > JZ_MMC_CLK_RATE) + mmc->f_max = JZ_MMC_CLK_RATE; + mmc->f_min = mmc->f_max / 128; mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; From patchwork Tue Jan 31 21:02:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 51036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp33163wrn; Tue, 31 Jan 2023 13:06:39 -0800 (PST) X-Google-Smtp-Source: AK7set+UMjJKKtXzjHv4u+kiBfIGjg1Xa3L9MeVYOnIjMxNtj0JLVK9qByXd4PB5+4rZyZxtM7Q5 X-Received: by 2002:a05:6402:28b8:b0:4a2:5ddd:db88 with SMTP id eg56-20020a05640228b800b004a25ddddb88mr5158953edb.0.1675199199008; Tue, 31 Jan 2023 13:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675199198; cv=none; d=google.com; s=arc-20160816; b=qXwgW0dX1U2c2GaHfQ2u5ha+Cm6+nkc41G6OPZp0gZ1b9VKMFIWQrI3wEGjiwO4Nwu GxPb/jniDmk5UG/FmH42sGrK64ROdddDbNvlh3PjzX4PofiM6iLQlpyg6DPu8/6hq7xq 6sUEVwa7prPJjZTPuyMxqdxpgRnO3Don/ggNYlD85de7Ahv3YzDs6ywNVs/F1tKwn89g SI+NXSolqFqJQ3dFF7Sw+DCq+7shH0+Qe0t702WEKlTmznTWbQobQVNhs2y5RfatveXL DuI7gSLKW8ufdrE0IkpXpa9snMwKVjy8IeHAfK5sw23TsewPP7PsJcgpg6VsxsUAxc5a 7XLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pTB/5ibjHKW2X7UZeS7Tcf9Oq/nbjX1Dx/72F1/KHz4=; b=g+MOLSFintyATuY4kz1E9pbu2IWU7JyzMtLSyFPMPcixa4b8vOwxVJBM/Pe9L+QAfK 0ow5krTVlQOdcdXEtBrbTNOlap2cjrwAb/pX515pxhHeYuxNEE3op7E66+m1COoMiRa7 MYiGy+ML9dBdWj/03y9vQvDnlKcU5zZMdfEUmD2rmgvn4ywEwygGYO2teiz0YzqFBUjH qU4/kb6+p1idja3rXmlulYvts5aArgcJI8kAv2zxs+ewgESyDfES5WRidm42eP3sKmF6 SVmyjtcGxcBddSL9oIIaJaHdyEcSvHgi4GFdXVf4cImWb9MgiWWymITrW1egWGS97wbO zafA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=2PhimR52; 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=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v5-20020a056402348500b004a255806c37si8496369edc.326.2023.01.31.13.05.29; Tue, 31 Jan 2023 13:06:38 -0800 (PST) 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=@crapouillou.net header.s=mail header.b=2PhimR52; 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=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231923AbjAaVCx (ORCPT + 99 others); Tue, 31 Jan 2023 16:02:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231932AbjAaVCt (ORCPT ); Tue, 31 Jan 2023 16:02:49 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E91717EE7; Tue, 31 Jan 2023 13:02:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1675198956; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pTB/5ibjHKW2X7UZeS7Tcf9Oq/nbjX1Dx/72F1/KHz4=; b=2PhimR52P1QRmXzxXOkrgO2hnI+46M09JfZ//TwpNtjgjJgGEmQuQb/JyCokV6UzchP1C7 7GEGJ2DEaUCSrji9K1qK3egUnUKUZWew3h0Styiw0zkAwPhgyHtqlmbQo8g/bMUIzqm6Em JMU1rXaoXPul/jOGjZ0oGodHOH2wdkY= From: Paul Cercueil To: Ulf Hansson Cc: linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 2/2] mmc: jz4740: Add support for vqmmc power supply Date: Tue, 31 Jan 2023 21:02:29 +0000 Message-Id: <20230131210229.68129-2-paul@crapouillou.net> In-Reply-To: <20230131210229.68129-1-paul@crapouillou.net> References: <20230131210229.68129-1-paul@crapouillou.net> 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,SPF_HELO_PASS,SPF_PASS autolearn=ham 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?1756573675260214238?= X-GMAIL-MSGID: =?utf-8?q?1756573675260214238?= Support enabling / disabling the vqmmc power supply if it was provided by the firmware. Provide the .start_signal_voltage_switch callback to change the voltage of the external vqmmc power supply. Signed-off-by: Paul Cercueil --- drivers/mmc/host/jz4740_mmc.c | 38 ++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index eb8e9607b086..ccd2c3aed0f0 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -162,6 +163,8 @@ struct jz4740_mmc_host { struct mmc_request *req; struct mmc_command *cmd; + bool vqmmc_enabled; + unsigned long waiting; uint32_t cmdat; @@ -943,6 +946,8 @@ static void jz4740_mmc_request(struct mmc_host *mmc, struct mmc_request *req) static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { struct jz4740_mmc_host *host = mmc_priv(mmc); + int ret; + if (ios->clock) jz4740_mmc_set_clock_rate(host, ios->clock); @@ -955,12 +960,25 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) clk_prepare_enable(host->clk); break; case MMC_POWER_ON: + if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { + ret = regulator_enable(mmc->supply.vqmmc); + if (ret) + dev_err(&host->pdev->dev, "Failed to set vqmmc power!\n"); + else + host->vqmmc_enabled = true; + } break; - default: + case MMC_POWER_OFF: if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); + if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { + regulator_disable(mmc->supply.vqmmc); + host->vqmmc_enabled = false; + } clk_disable_unprepare(host->clk); break; + default: + break; } switch (ios->bus_width) { @@ -986,6 +1004,23 @@ static void jz4740_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) jz4740_mmc_set_irq_enabled(host, JZ_MMC_IRQ_SDIO, enable); } +static int jz4740_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) +{ + int ret; + + /* vqmmc regulator is available */ + if (!IS_ERR(mmc->supply.vqmmc)) { + ret = mmc_regulator_set_vqmmc(mmc, ios); + return ret < 0 ? ret : 0; + } + + /* no vqmmc regulator, assume fixed regulator at 3/3.3V */ + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) + return 0; + + return -EINVAL; +} + static const struct mmc_host_ops jz4740_mmc_ops = { .request = jz4740_mmc_request, .pre_req = jz4740_mmc_pre_request, @@ -994,6 +1029,7 @@ static const struct mmc_host_ops jz4740_mmc_ops = { .get_ro = mmc_gpio_get_ro, .get_cd = mmc_gpio_get_cd, .enable_sdio_irq = jz4740_mmc_enable_sdio_irq, + .start_signal_voltage_switch = jz4740_voltage_switch, }; static inline struct jz4740_mmc_host *