From patchwork Fri Nov 17 11:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Shih X-Patchwork-Id: 166124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp460257vqn; Fri, 17 Nov 2023 03:33:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJShRU5cJ+4Y/F0miPjlZl+EEqqC+iAfRsHS1O3hPGlweDCALGehJmYoxTBDky8pHVGAxw X-Received: by 2002:a17:902:cec8:b0:1cc:5ac3:853f with SMTP id d8-20020a170902cec800b001cc5ac3853fmr14590296plg.23.1700220819308; Fri, 17 Nov 2023 03:33:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700220819; cv=none; d=google.com; s=arc-20160816; b=dWnJq4So1AQRoaCUJ14v+C2ri009Ek3qat40lu42h43vpy9g6jSutVekkLfjnC6lqp 5TCnDwwM6i/j51xKxO1EXpakXI2ai+QRhBdCUhetY1HCskizxFz6TC51A0obggzLcF6B WLlJt9WqCk3dLRR8s5WtsTYFumsJmA3j1ZjtxK0bDnXKScl69IXD92JZ2iOZ7SLYNR/Z 9tHNdd0o7xFtim/InAr33qeIRiPGrdQtsKtRFzSSbw+ZRpLSX2ysgqLwU6mNJhrzCA+d 7GxRPw1qWgleiZHZawSwRfmPWPHkmTDfizbJyoOKWM6HSOvUx+Y2q2hwayvJa3keBNW2 QusQ== 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=Hq/fIqgtM5S4z5GzMxxro+9qk/7Z5yfM1tB2gs/U60k=; fh=y5fk6vguAkbcel7KoRWpitGO8B8BpGYTQpzSdaI/dY4=; b=Ky7KCxIC5ovt23ub5DZhvi9CTIQfoEK3+pWw30rd+CjpfVMNakjv8uhw4YtnAP21W2 8sgU1xMyYLboNw+DOnnyeV+6W7X1SKfZU25u/rzi2kWiUWlQggEPX5aeKN/vJejNGCIH mPHeR4HuHbLXEXgR47hWTa1coil+kvshGPOh8wDiqbzLL4VCrOCYIlMBYf1fbbubAEyH /Ua/M9POfnBDrwhB0LmoGLERHN45WTKd4R6naELfkv9F5bWTAaA4Zth5/bZxnM/1f2BR WL77xv3jitDkFOYM1v8ATEX8XK50i4ecVqM3IPH6sPO3hJ+PNf0DtjClK68KN2U3dckP hMpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="h/41+CDI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id m11-20020a1709026bcb00b001cc51ee5fb1si1543692plt.585.2023.11.17.03.33.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 03:33:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="h/41+CDI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E76A08291595; Fri, 17 Nov 2023 03:33:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346045AbjKQLdX (ORCPT + 30 others); Fri, 17 Nov 2023 06:33:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346103AbjKQLdG (ORCPT ); Fri, 17 Nov 2023 06:33:06 -0500 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B58C199E; Fri, 17 Nov 2023 03:32:36 -0800 (PST) Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-7ad1236c419so63274139f.0; Fri, 17 Nov 2023 03:32:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700220755; x=1700825555; darn=vger.kernel.org; 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=Hq/fIqgtM5S4z5GzMxxro+9qk/7Z5yfM1tB2gs/U60k=; b=h/41+CDIDBq08CDz6yO1E2QqziGD3QGtcFY6vouhFszboRj4QKGUt+QJO6k4SjPoj+ AJQR0LH7MVj8F3BoV4JH+x2Oy5Bs9eW2RNwEs0O45yQY+wCBBInleZ5Wl6jSD1bkWuJg QJC9tXEDs5Eli+ByniJdyaiOmhaP9go0HcWluOpEybFe+oNrP1va7A9ywuj1FLD5d2HN g0zBcpIXq1xdioxfXmD5DbdEZ+TbUhz6mSsP8Lkec6BdJK3Q3Bg7o946RmInY7UJqtYt aTFtiUAuGSq4azpDHnUZdO4VCK4R4RxDAGt//ZQZH/dYsCaQueBCBHNz1lKQeEPKo0gl lchA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700220755; x=1700825555; 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=Hq/fIqgtM5S4z5GzMxxro+9qk/7Z5yfM1tB2gs/U60k=; b=J8As2CcQ3TUlZR8X1axC8POfFIRqhPJOmiB3wgAV6Zm+1MIc3IyBZzsqkbNOnkQvrq mtFqjRGvRZ32o/dsgqQRvauBVWNjKN5LARg5hzGzWjoDiYtjErj5ATzJbWL7Li9ZVH2M UuV2B+YxadhX7zOI0s5WcbeeBYuO4daJNRFPxp1srjdPyiB2YU4PIUbHcaASibkaz3w2 HNABKoQDtS43s3YxrC1ASNEXBKXOO0NpeJXHoz/YIbhc67Zbn1kRA/Pam2HrNZrZ5MlF vxpH2xVIGrAQy88rySK7FSjBNYeSQn1zQ9iKkUgoHoEFaDk79HZVp6esNJO49v5Z0k7L aP9Q== X-Gm-Message-State: AOJu0YwrjK1DeihjoNNAhx+/LPhoxApXQNobHloPZM4RT+slPkxVyRVv pgNdId8+Ayz9hOXyi8yvdtkoz9P7mZk= X-Received: by 2002:a05:6e02:190f:b0:359:4048:38d2 with SMTP id w15-20020a056e02190f00b00359404838d2mr26235076ilu.0.1700220755063; Fri, 17 Nov 2023 03:32:35 -0800 (PST) Received: from localhost.localdomain (2001-b400-e286-d458-bc89-d4cd-bd42-ffb5.emome-ip6.hinet.net. [2001:b400:e286:d458:bc89:d4cd:bd42:ffb5]) by smtp.gmail.com with ESMTPSA id u2-20020a631402000000b005b4b70738e5sm1229224pgl.8.2023.11.17.03.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 03:32:34 -0800 (PST) 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 V13 12/21] mmc: sdhci-uhs2: add set_power() to support vdd2 Date: Fri, 17 Nov 2023 19:31:40 +0800 Message-Id: <20231117113149.9069-13-victorshihgli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231117113149.9069-1-victorshihgli@gmail.com> References: <20231117113149.9069-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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 03:33:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782810745756593826 X-GMAIL-MSGID: 1782810745756593826 From: Victor Shih This is a UHS-II version of sdhci's set_power operation. Use sdhci_uhs2_set_power() to set VDD2 for support UHS2 interface. 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 V13: - Drop use vmmc2. - Modify comment message. Updates in V10: - Move some definitions of PatchV9[05/23] to PatchV10[11/23]. 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 066549526060..7d5070f58d00 100644 --- a/drivers/mmc/host/sdhci-uhs2.c +++ b/drivers/mmc/host/sdhci-uhs2.c @@ -59,6 +59,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->ios.timing == MMC_TIMING_UHS2_SPEED_A || @@ -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_regulator_set_vqmmc2(mmc, &mmc->ios); + } else { + mmc_opt_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); + /* support 1.8v only for now */ + mmc_regulator_set_vqmmc2(mmc, &mmc->ios); + + /* 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 27ea5b875c29..4d50cac7717d 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 782c399fae15..cdb418d97c4d 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);