From patchwork Sat Jun 19 22:51:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12333207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B2AAC49361 for ; Sat, 19 Jun 2021 22:53:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72E82611C1 for ; Sat, 19 Jun 2021 22:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229584AbhFSWzn (ORCPT ); Sat, 19 Jun 2021 18:55:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbhFSWzn (ORCPT ); Sat, 19 Jun 2021 18:55:43 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DAA0C061574 for ; Sat, 19 Jun 2021 15:53:30 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id m21so23205040lfg.13 for ; Sat, 19 Jun 2021 15:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cKOYKZbl9cSfYG/W7JR30gdvjqHpzjJI/OIK0TN7/5M=; b=zoAFGIicsSAcKPNNfvXcauX0oqNhZ/C/3tTNjm+3eRsIiFCF7GHkSXMuXXxfL3Ej3Y yOSesUJ3BaczlR3ULawUw7QSlJ5/YyqUqQyj5zjCqAdGdDwnFA0i1d6KEem6HlZWy8YS Aukg7ND3ddzqF5+YD+WfHWOn5X4aFX/YMlZ11oVSSbA7B1kvkkjrsB6m8KYWFEMGoJsZ dV12yprixZLUqPe1ZpkhB/qLEBbf90y0d7aSdvEIPGp7d6MvqmK943DbDdqo6Tmw8rIF kdZ4B2WdIeXaO6mZ8BFJ/Fl60Uh7HYN0VG5o8rx7J7DgtT+QAyoHwTuFQKZ8THX8DUo3 VkFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cKOYKZbl9cSfYG/W7JR30gdvjqHpzjJI/OIK0TN7/5M=; b=Jt6VHXgcl7V1lRMsprjIldjMZ3Ib2GyrOjKfCzc7yLOkfCrcPHWtdCHJrhL2tdVkit d/GcJUzKZ8SfI0xKmM60HH2QNAmDu191GJa9FO6+qgg14ct8fZc/RffiyFPPFipfxcyA Ab0IF2Q1KKO8ue5v44Qsux//aDQTJOceR+pi2O/4zKm4wWGO/MOISrZnwleO68LinUBy ZHwrPeAh2ehNDcEUzoThkIrrLIRmcG3FbO4PIcnk4rvRu03jtDCVrRKBYn2MNaV8nPMW Ru8Ap+hh+G/tZ5J59WtFDQs20HbdlhI0+0jYpezvePtvahg2C9UnAs2lDRIdp1hPwkxD g0DQ== X-Gm-Message-State: AOAM533jJ+ZcepbUw6Ipxu/C1pMnYWytFfR+qxZ+E2Z1bib0fFvYvyZ1 LsaRd1y1U0+yrjVYZ1IJLFLllchnB54nnw== X-Google-Smtp-Source: ABdhPJwNxGPEe4xpDUwpej/Zqv52q9X6U3bMjdxaF54TVaONFcyK0mbJoF4i5hlXGQDDRjEBvkdbxg== X-Received: by 2002:a19:7003:: with SMTP id h3mr8738694lfc.537.1624143206730; Sat, 19 Jun 2021 15:53:26 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id y5sm1345349lfa.148.2021.06.19.15.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jun 2021 15:53:25 -0700 (PDT) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij , Russell King , Yann Gautier , Ludovic Barre Subject: [PATCH 1/3] mmc: mmci: De-assert reset on probe Date: Sun, 20 Jun 2021 00:51:16 +0200 Message-Id: <20210619225118.1862634-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org If we find a reset handle when probing the MMCI block, make sure the reset is de-asserted. It could happen that a hardware has reset asserted at boot. Cc: Russell King Cc: Yann Gautier Cc: Ludovic Barre Signed-off-by: Linus Walleij --- drivers/mmc/host/mmci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 984d35055156..af2ed6013ef9 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -2125,6 +2125,10 @@ static int mmci_probe(struct amba_device *dev, if (IS_ERR(host->rst)) { ret = PTR_ERR(host->rst); goto clk_disable; + } else { + ret = reset_control_deassert(host->rst); + if (ret) + dev_err(mmc_dev(mmc), "failed to de-assert reset\n"); } /* Get regulators and the supported OCR mask */ From patchwork Sat Jun 19 22:51:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12333209 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9813C2B9F4 for ; Sat, 19 Jun 2021 22:54:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C65161183 for ; Sat, 19 Jun 2021 22:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229897AbhFSW4X (ORCPT ); Sat, 19 Jun 2021 18:56:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbhFSW4U (ORCPT ); Sat, 19 Jun 2021 18:56:20 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 925FBC061574 for ; Sat, 19 Jun 2021 15:54:07 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id u13so3921620lfk.2 for ; Sat, 19 Jun 2021 15:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BSV/mBbqmIvRpaPtX9Y4vVykJHKsnTG2qhsD896N4Qc=; b=j881TjQ1hJ1/WDFdJDzEykNhyEERfWapEGoMbqBnaGFjSypPB3XEZK+CSOdTG8kPRj ApmA3BlujhkYrhBOPOOC7luaBqVf3a1JQ3/FwaIBdzyXP1gj1tWbPw+4FSh7p8QzeQeF 60CkM5y4ov/nNuq5if43cAlK1oWotF7iTyNG7aPp6JGj7Nj0KjpDDjzAeemiofQQDxUj uKxxVzpR4jqadqU3hdRKYlzUXx/vDvG2Fdj5BwUpzUH9lFHrTKSUw3s3KII0+5W+5chF 9Vm28MV/rPlX4HtTajfpLfpXQsbRumdU47D3k82Cv8Ihnwmvbg+6PLEcjzVJZLV352+F SDVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BSV/mBbqmIvRpaPtX9Y4vVykJHKsnTG2qhsD896N4Qc=; b=hDw83t4jmmHVa4vpt687b5Ch1rGp2LG1sQBRo1LSxGwjsReQgiCtlvkMxfI5mK8l8S M/5/BE1fsOudWZ93acePqSL4GQn+E08XBs1D3ZE2agNIk9cMCCA0zTvZVX0nYwuCi4Ln 2TzDKPt9Ebgy6BW8t8qRK7e9L8jJknGbw7jJLcwFio5Xm2PlPboeHdk37AqKIlZD+2PN 6K440gMg9Ue5o341NyjEO3ptukIzDPpj9cUKCUSJZMniYQfaWN9C21/mZkeHm/woOOx5 pS3jgthSUrLELKOdrVT/1t+3JD1mpNUPWIXdT6ck2o63sKqxGOsnNXV+18gZqBUZrPbM Sldw== X-Gm-Message-State: AOAM530HhjaZOHtvIE68rotUvOzGHkdo8GXFjppyMoz9w/RoH0ZD45q1 TkqqLx92Cf8lQRETItxUtxjmzu/M4CeFkQ== X-Google-Smtp-Source: ABdhPJw/xa73/4a/nhGqj/1sku26qmY/Q2RSrfn0HKp2aDr/sZAZNV3vsR8theUgnQdJrida3oOjgg== X-Received: by 2002:ac2:54a9:: with SMTP id w9mr8476711lfk.11.1624143245831; Sat, 19 Jun 2021 15:54:05 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id y5sm1345349lfa.148.2021.06.19.15.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jun 2021 15:54:05 -0700 (PDT) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij , Russell King , Yann Gautier , Ludovic Barre Subject: [PATCH 2/3] mmc: mmci: Implement .hw_reset() callback Date: Sun, 20 Jun 2021 00:51:17 +0200 Message-Id: <20210619225118.1862634-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210619225118.1862634-1-linus.walleij@linaro.org> References: <20210619225118.1862634-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The .hw_reset() callback is optionally called when attaching a host if and only if MMC_CAP_HW_RESET is set on the host, which can be done from the device tree by putting the flag cap-mmc-hw-reset in the DT node. This is sometimes helpful for eMMC. Cc: Russell King Cc: Yann Gautier Cc: Ludovic Barre Signed-off-by: Linus Walleij --- drivers/mmc/host/mmci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index af2ed6013ef9..97fa5e67ca0c 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1883,6 +1883,15 @@ static int mmci_sig_volt_switch(struct mmc_host *mmc, struct mmc_ios *ios) return ret; } +static void mmci_hw_reset(struct mmc_host *mmc) +{ + struct mmci_host *host = mmc_priv(mmc); + + reset_control_assert(host->rst); + udelay(2); + reset_control_deassert(host->rst); +} + static struct mmc_host_ops mmci_ops = { .request = mmci_request, .pre_req = mmci_pre_request, @@ -1891,6 +1900,7 @@ static struct mmc_host_ops mmci_ops = { .get_ro = mmc_gpio_get_ro, .get_cd = mmci_get_cd, .start_signal_voltage_switch = mmci_sig_volt_switch, + .hw_reset = mmci_hw_reset, }; static void mmci_probe_level_translator(struct mmc_host *mmc) From patchwork Sat Jun 19 22:51:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12333211 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01378C48BE5 for ; Sat, 19 Jun 2021 22:54:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D65E7611CE for ; Sat, 19 Jun 2021 22:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229522AbhFSW4X (ORCPT ); Sat, 19 Jun 2021 18:56:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbhFSW4U (ORCPT ); Sat, 19 Jun 2021 18:56:20 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1A63C061756 for ; Sat, 19 Jun 2021 15:54:08 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id m21so23206445lfg.13 for ; Sat, 19 Jun 2021 15:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J4O/PSg42XQGCFuaHFKksTpyRyVdPtGQ1Rdj/uH+UqA=; b=nnYlDJV7lF+OmF4cNajdGrn/NgWZCzgPHuiMJ6lnF9trRrHXMMVKH3Oz5wxIAQ4wtL yWDMKhycSDwRyaXkkqMbWfBNO8gx2Xb10I3oJj2DXSEfc4Savwni3KUB7Canea7IIxyV GHzv/DnGmUTzfnEQQ+mktoaFSHMlikRuhnTYXhRAwFoQ+Fkjfuk/WIK6LQ263lLa9gB4 9IRJgsWJEh7YDr5C0W1QAXr9m/vcKluRI+zDHzXpo+lF+q+6abBuygU88yFGxUcbcmM+ qqxzA5BGaNVXOOhyVd+xQvd3JB6oIDmlxOcbtdJDczSa4Qhq9DKBGO2zYWBqTred8cdO wxmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J4O/PSg42XQGCFuaHFKksTpyRyVdPtGQ1Rdj/uH+UqA=; b=CD7dSJ7kkCpohzv0grRzbAbCqmPqDsknu2hkR3RnWfQG+XKU1AnmRatuLMKXEbNF23 Cwykw+s3xYv5QL1GWmE+Mwr+NnArZWwX9e/llHXNNrEh3CqKmxUWhPHMGJREE9Z4TtdY ZWJ1GYdIZiLlBvfDZ37hkHMFqnYGd8lQ8rpqOfqtls2l7Mzp05rOaUKsriksRMrn/RHq /jYDqS1hjaZmthe/4Egj/AvogmMdMKNWQ2bYHVO6Bir8lWJtT4AH4vTkSXOpiOn1XApE DiMFdWvYLztriZRDANlBdt6JEmV0PNuAoJ+Ilo+soX1R2vEQXVWUpDPRsrSuxB5mHbmw v/tg== X-Gm-Message-State: AOAM531aOKUhkKXZ+OHUaB3TR++25tVpfi442GN71jeJDhv6yqxQrPqE IGjTWk9yEy2Ue80kaDWeBIqDwhvzcNN2Ug== X-Google-Smtp-Source: ABdhPJx/8BYkA1itRd9EkHdffaoBBmdv1/7DP9nf3fN3rbiSuIN5DO6SRDSexBhDEhX5N68VZ7w6+g== X-Received: by 2002:a19:c753:: with SMTP id x80mr6935805lff.200.1624143247150; Sat, 19 Jun 2021 15:54:07 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id y5sm1345349lfa.148.2021.06.19.15.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jun 2021 15:54:06 -0700 (PDT) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij , Russell King , Yann Gautier , Ludovic Barre Subject: [PATCH 3/3] mmc: mmci: Add small comment about reset thread Date: Sun, 20 Jun 2021 00:51:18 +0200 Message-Id: <20210619225118.1862634-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210619225118.1862634-1-linus.walleij@linaro.org> References: <20210619225118.1862634-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Put a small comment before assigning IRQ_WAKE_THREAD telling us what is going on. Cc: Russell King Cc: Yann Gautier Cc: Ludovic Barre Signed-off-by: Linus Walleij --- drivers/mmc/host/mmci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 97fa5e67ca0c..b646ba7f4e10 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1394,6 +1394,10 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, } else if (host->variant->busy_timeout && busy_resp && status & MCI_DATATIMEOUT) { cmd->error = -ETIMEDOUT; + /* + * This will wake up mmci_irq_thread() which will issue + * a hardware reset of the MMCI block. + */ host->irq_action = IRQ_WAKE_THREAD; } else { cmd->resp[0] = readl(base + MMCIRESPONSE0);