From patchwork Fri Jul 21 10:13:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Shih X-Patchwork-Id: 123751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp103293vqg; Fri, 21 Jul 2023 03:20:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlHohRycQoTiU3MERb9uEL7PkU6uJD1IEcFM8hDeF6NW8Vsx3WI4RkXpj2yZG9TRxRX9ftEC X-Received: by 2002:a05:6a00:cc2:b0:678:11d6:2ad6 with SMTP id b2-20020a056a000cc200b0067811d62ad6mr13336054pfv.9.1689934849462; Fri, 21 Jul 2023 03:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689934849; cv=none; d=google.com; s=arc-20160816; b=plbvJjSnjLzWzYvQsjgg54WvYNh7rmSkKb75NTRgrGUTECkBp+IFVxMwQ1r7y9d+s3 ShUD5nfUMhvQBdIBq97sf9M5AuF9EySudqdMYLK/KQRUApGN4pKMr9WEfKwVBSUmLwnw SxX8f5sR+8UXjKjr3D59Cv0px90OColUFC3sK1yhnYqk6WCGvriEBlXqQWQ93Yy/+TIi b079kKRYdjHsiFYPESFSZPlEU8QIqlVqqbJIyAdDCWHNvalNKgmEyVyM6DAfU+8oL/Gl wWkvPsfpRAX2JgkpmbJk588QKjIIpBoICDF1ds/KLYzX1izwI/w1W0CAfuo/0wEizg6p HxtQ== 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=pBh/DzN1BWxGmBMA1WYlCHzJx5leJR/8ByNsL/d9R0o=; fh=fI4q009785iZEQbMo9mPiCtk2O+O6Kfjq5womanK3eI=; b=WNWfL3ccOcIBUJEKsgx4U22vB/Bqpw+qEJvNNdFJt1YFXPZqUUYUxmoVE+2kwgcAmS HuDaV9zURazbHwPj2iTm3ZyQGDNi8YH/t0BZwibCswvHDu2ybViMi5CqLzntW3/6meN8 MWLhJ10KwB88CdaUCqMPOSgQGvse3FsjKRqrUytM6mGCSvbZ1g91HK1qbRiWXxymBdH7 bgAOUrHPZWndc+7tS6jPf6N/UPu+6xzhaLAxY68AF67heT0TB5JOqT9KkYQ+C9IBxTc6 Ms6Qfm/0Wu8YIXFR92FMrknA/XxzfMXvYKOF/W2tsWTRzMYT7wGDtaDxReAUc3N9bgXh Jx1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=HaDXSyGT; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s2-20020a63e802000000b005348b4f79f1si2639787pgh.345.2023.07.21.03.20.36; Fri, 21 Jul 2023 03:20:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=HaDXSyGT; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231698AbjGUKPe (ORCPT + 99 others); Fri, 21 Jul 2023 06:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbjGUKOv (ORCPT ); Fri, 21 Jul 2023 06:14:51 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 351E830C7; Fri, 21 Jul 2023 03:14:48 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1b852785a65so12740445ad.0; Fri, 21 Jul 2023 03:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689934487; x=1690539287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pBh/DzN1BWxGmBMA1WYlCHzJx5leJR/8ByNsL/d9R0o=; b=HaDXSyGT8v0gxYYiGjEn5/PofPJ+lK4H14njSxZVuAE/MD79Vt/TdeZcCEwctiO9CB BrjDavWJUoV0NMipdfRJBxnA6ul2iAtmbl4v4Sn2VSb/k7TeU9J8Lg60nv+03vqtA10N kbhXgzAQPp7xDDWDLY2BTDBAE4UdtLSBwd11hosJnprUIto/3vetubx63huy98Eedk7q XIoYzft9PNkquWI/qgnSj7Bhd+jmkwjd6BgUSN19/SO+U6lFLjZTcweHKWBruSIKgb2e WcfW1/g9lT+y/f7T7gIlJcMDyPCaZl9FcG5yV2nHK+l0gPp8diC7jXWXCMHhSeVQh8rm utSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689934487; x=1690539287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pBh/DzN1BWxGmBMA1WYlCHzJx5leJR/8ByNsL/d9R0o=; b=cY0TRB0HTjRITnZgSsLE1Q46x1MVNbkJjAWbvoMsWYzyM5VV9D75HEb+ov9y7awxqg ICD2GeK/98yNHdzpw8eYjWlJpVAJhgfAQ3D/fNOt1gPX+iNVEq1550y2lqvrtmPNkJrQ 0D+sT8SnanaFwiVdQ11aUTNsx0mnr8QkEqSTGyouZZ+HlHEAjcFLVs5My4A3vpGO4kr1 ZujR42Swrl61RQ+yzZTHUN0rNq5EeuTX47cwwyfHQ4F0F0fAQ2RnLsdAnIq9nRn+2lHo TVhyT7lbnT2uyG5dVd1v4J1qqBmYyzzxpdiqjmnhnMVze1/LAQT7w4LZveIciUhwh8Gr JsBg== X-Gm-Message-State: ABy/qLY+gNMFdACGDAtvEvCtvU+fdZmfsW2LvoeQugtX457324Jh1x7z /KoohwBgCmZEr6RnK0KaWkpTbomKZ+k= X-Received: by 2002:a17:902:c941:b0:1b2:676d:1143 with SMTP id i1-20020a170902c94100b001b2676d1143mr2378713pla.15.1689934487369; Fri, 21 Jul 2023 03:14:47 -0700 (PDT) Received: from localhost.localdomain (2001-b400-e23e-6b0d-6c46-3684-497a-06ee.emome-ip6.hinet.net. [2001:b400:e23e:6b0d:6c46:3684:497a:6ee]) by smtp.gmail.com with ESMTPSA id y1-20020a170902b48100b001b86492d724sm3050719plr.223.2023.07.21.03.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 03:14:47 -0700 (PDT) From: Victor Shih To: ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, benchuanggli@gmail.com, HL.Liu@genesyslogic.com.tw, Greg.tu@genesyslogic.com.tw, takahiro.akashi@linaro.org, dlunev@chromium.org, Victor Shih , Ben Chuang , Victor Shih Subject: [PATCH V9 11/23] mmc: sdhci-uhs2: add set_power() to support vdd2 Date: Fri, 21 Jul 2023 18:13:37 +0800 Message-Id: <20230721101349.12387-12-victorshihgli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230721101349.12387-1-victorshihgli@gmail.com> References: <20230721101349.12387-1-victorshihgli@gmail.com> 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,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772025124622309526 X-GMAIL-MSGID: 1772025124622309526 From: Victor Shih This is a UHS-II version of sdhci's set_power operation. VDD2, as well as VDD, is handled here. Signed-off-by: Ben Chuang Signed-off-by: AKASHI Takahiro Signed-off-by: Victor Shih --- Updates in V9: - Modify annotations in sdhci_get_vdd_value(). Updates in V8: - Adjust the position of matching brackets. - Add the initial value of the pwr in sdhci_uhs2_set_power(). Updates in V7: - Add clear the power reg before setting a new value in sdhci_uhs2_set_power(). - Add MMC_VDD_34_35 case and MMC_VDD_35_36 case in sdhci_get_vdd_value(). - Drop pwr variable in sdhci_get_vdd_value(). Updates in V6: - Add mmc_opt_regulator_set_ocr(). - Remove unnecessary functions. --- drivers/mmc/host/sdhci-uhs2.c | 48 +++++++++++++++++++++++++++ drivers/mmc/host/sdhci.c | 61 +++++++++++++++++++---------------- drivers/mmc/host/sdhci.h | 1 + 3 files changed, 82 insertions(+), 28 deletions(-) diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c index dfc80a7f1bad..fc37a34629c2 100644 --- a/drivers/mmc/host/sdhci-uhs2.c +++ b/drivers/mmc/host/sdhci-uhs2.c @@ -57,6 +57,13 @@ EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs); * * \*****************************************************************************/ +static inline int mmc_opt_regulator_set_ocr(struct mmc_host *mmc, + struct regulator *supply, + unsigned short vdd_bit) +{ + return IS_ERR_OR_NULL(supply) ? 0 : mmc_regulator_set_ocr(mmc, supply, vdd_bit); +} + bool sdhci_uhs2_mode(struct sdhci_host *host) { return host->mmc->flags & MMC_UHS2_SUPPORT; @@ -94,6 +101,47 @@ void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask) } EXPORT_SYMBOL_GPL(sdhci_uhs2_reset); +static void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode, unsigned short vdd) +{ + struct mmc_host *mmc = host->mmc; + u8 pwr = 0; + + if (mode != MMC_POWER_OFF) { + pwr = sdhci_get_vdd_value(vdd); + if (!pwr) + WARN(1, "%s: Invalid vdd %#x\n", + mmc_hostname(host->mmc), vdd); + pwr |= SDHCI_VDD2_POWER_180; + } + + if (host->pwr == pwr) + return; + host->pwr = pwr; + + if (pwr == 0) { + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); + + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc2, 0); + } else { + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); + /* support 1.8v only for now */ + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc2, fls(MMC_VDD_165_195) - 1); + + /* Clear the power reg before setting a new value */ + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); + + /* vdd first */ + pwr |= SDHCI_POWER_ON; + sdhci_writeb(host, pwr & 0xf, SDHCI_POWER_CONTROL); + mdelay(5); + + pwr |= SDHCI_VDD2_POWER_ON; + sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); + mdelay(5); + } +} + /*****************************************************************************\ * * * Driver init/exit * diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 753b251179f2..eca54a16e7fc 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include @@ -2061,41 +2061,46 @@ static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode, sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); } +unsigned short sdhci_get_vdd_value(unsigned short vdd) +{ + switch (1 << vdd) { + case MMC_VDD_165_195: + /* + * Without a regulator, SDHCI does not support 2.0v + * so we only get here if the driver deliberately + * added the 2.0v range to ocr_avail. Map it to 1.8v + * for the purpose of turning on the power. + */ + case MMC_VDD_20_21: + return SDHCI_POWER_180; + case MMC_VDD_29_30: + case MMC_VDD_30_31: + return SDHCI_POWER_300; + case MMC_VDD_32_33: + case MMC_VDD_33_34: + /* + * 3.4V ~ 3.6V are valid only for those platforms where it's + * known that the voltage range is supported by hardware. + */ + case MMC_VDD_34_35: + case MMC_VDD_35_36: + return SDHCI_POWER_330; + default: + return 0; + } +} +EXPORT_SYMBOL_GPL(sdhci_get_vdd_value); + void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode, unsigned short vdd) { u8 pwr = 0; if (mode != MMC_POWER_OFF) { - switch (1 << vdd) { - case MMC_VDD_165_195: - /* - * Without a regulator, SDHCI does not support 2.0v - * so we only get here if the driver deliberately - * added the 2.0v range to ocr_avail. Map it to 1.8v - * for the purpose of turning on the power. - */ - case MMC_VDD_20_21: - pwr = SDHCI_POWER_180; - break; - case MMC_VDD_29_30: - case MMC_VDD_30_31: - pwr = SDHCI_POWER_300; - break; - case MMC_VDD_32_33: - case MMC_VDD_33_34: - /* - * 3.4 ~ 3.6V are valid only for those platforms where it's - * known that the voltage range is supported by hardware. - */ - case MMC_VDD_34_35: - case MMC_VDD_35_36: - pwr = SDHCI_POWER_330; - break; - default: + pwr = sdhci_get_vdd_value(vdd); + if (!pwr) { WARN(1, "%s: Invalid vdd %#x\n", mmc_hostname(host->mmc), vdd); - break; } } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 43ad3f4b7672..f3bd558b337f 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -837,6 +837,7 @@ void sdhci_set_power(struct sdhci_host *host, unsigned char mode, void sdhci_set_power_and_bus_voltage(struct sdhci_host *host, unsigned char mode, unsigned short vdd); +unsigned short sdhci_get_vdd_value(unsigned short vdd); void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode, unsigned short vdd); int sdhci_get_cd_nogpio(struct mmc_host *mmc);