Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2827335yba; Mon, 15 Apr 2019 21:50:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgmCfCLOxjCLcUXOUGQ6Ip/NjCDMFh8RxgvH+TIqeh5l0itWqh9zFISErW/q8TX9L2aLk3 X-Received: by 2002:a62:1b8a:: with SMTP id b132mr80907187pfb.19.1555390206039; Mon, 15 Apr 2019 21:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555390206; cv=none; d=google.com; s=arc-20160816; b=W1BNA5X81q9IgE3ti2aiWHNVzkhtb0QMTNFRh5F5ElBKNZQqVKIzTKBxwXcsy2SJfX tLZBnveKnyJSKUojGV6qLsUr8/suMeOWtMYzGuXR0Uzp/4CTUm/aiDWzgh1WqqaDNMHZ 0C+wHtU8dUybpYAPfUYdwQ1I66kwfsEr54uD06qKRmpoQhUaTUcgwRUqsoIZrOEmaTkH L/PceIVpXa0G9/gRUF2cMJr5o0RNxzOuxYO0TKAvVShqaPjYwmpGF6Pz8YnWvqotMYcx KzOIVVrd6FbEXPkPiIpKaWE/rOxe9gNqQsLrnbT1Ar1pJapRQsvQSqRiu8l7LCZQYGcB Wwzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:cc:subject:date:to :from; bh=nJFZ2Mq5dlofHoV1zLWApvPPArTO8xXw2PzoFegCA+I=; b=TTt8qTr4bTt7o0+bcak3D4QqRqrqHk6Mxv0LUoSJ2mDTtFbhQPYzn8MfmlZoiNq0ZP VKNm8Q52r+eUTK4sp2AlNZGuZ7O2ntKbx560WV/ftRD62WnRd6BDVeAbmzvPuiNtkg5c wEN+JvDlkYyc6DWwrd0BDyDD2vuvvPsLsjI8HHE6UNY+T8bDWYasBE4pbvKrR3Agrya1 zBCGwJtFrNEDeB1972avYLcQ7EIDiWvhZT2ALq2ZCrat1FOeDXoko5IhHkFvtf3CnTsh sw3bcRnbsa6R/T0esJi7UQxA7DFxV9xF6xIo77TzJxSiaokSehHAS9N6IZKvgJVDpU7v UpmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si47375442plh.289.2019.04.15.21.49.50; Mon, 15 Apr 2019 21:50:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727009AbfDPEsc (ORCPT + 99 others); Tue, 16 Apr 2019 00:48:32 -0400 Received: from mx2.suse.de ([195.135.220.15]:59582 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726783AbfDPEsc (ORCPT ); Tue, 16 Apr 2019 00:48:32 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id F2401AF40; Tue, 16 Apr 2019 04:48:29 +0000 (UTC) From: NeilBrown To: Ulf Hansson , Chaotian Jing Date: Tue, 16 Apr 2019 14:47:29 +1000 Subject: [PATCH 4/5] mmc: mtk-sd: enable internal card-detect logic. Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, thirtythreeforty@gmail.com Message-ID: <155539004931.25108.17076624786044710325.stgit@noble.brown> In-Reply-To: <155538933003.25108.3338569916935462285.stgit@noble.brown> References: <155538933003.25108.3338569916935462285.stgit@noble.brown> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mtk-sd silicon has integrated card-detect logic that is enabled, at least, on the MT7621 as used in the GNUBEE NAS. If the sdhci isn't marked non-removable and doesn't have a cd-gpio configured, assume the internal cd logic should be used. Signed-off-by: NeilBrown --- drivers/mmc/host/mtk-sd.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index d379f2ece305..341cf5f03429 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -300,6 +300,8 @@ #define CMD_TIMEOUT (HZ/10 * 5) /* 100ms x5 */ #define DAT_TIMEOUT (HZ * 5) /* 1000ms x5 */ +#define DEFAULT_DEBOUNCE (8) /* 8 cycles CD debounce */ + #define PAD_DELAY_MAX 32 /* PAD delay cells */ /*--------------------------------------------------------------------------*/ /* Descriptor Structure */ @@ -430,6 +432,7 @@ struct msdc_host { bool hs400_cmd_resp_sel_rising; /* cmd response sample selection for HS400 */ bool hs400_mode; /* current eMMC will run at hs400 mode */ + bool internal_cd; /* Use internal card-detect logic */ struct msdc_save_para save_para; /* used when gate HCLK */ struct msdc_tune_para def_tune_para; /* default tune setting */ struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */ @@ -1430,6 +1433,11 @@ static irqreturn_t msdc_irq(int irq, void *dev_id) sdio_signal_irq(host->mmc); } + if ((events & event_mask) & MSDC_INT_CDSC) { + mmc_detect_change(host->mmc, msecs_to_jiffies(20)); + events &= ~MSDC_INT_CDSC; + } + if (!(events & (event_mask & ~MSDC_INT_SDIOIRQ))) break; @@ -1463,14 +1471,24 @@ static void msdc_init_hw(struct msdc_host *host) /* Reset */ msdc_reset_hw(host); - /* Disable card detection */ - sdr_clr_bits(host->base + MSDC_PS, MSDC_PS_CDEN); - /* Disable and clear all interrupts */ writel(0, host->base + MSDC_INTEN); val = readl(host->base + MSDC_INT); writel(val, host->base + MSDC_INT); + /* Configure card detection */ + if (host->internal_cd) { + sdr_set_field(host->base + MSDC_PS, MSDC_PS_CDDEBOUNCE, + DEFAULT_DEBOUNCE); + sdr_set_bits(host->base + MSDC_PS, MSDC_PS_CDEN); + sdr_set_bits(host->base + MSDC_INTEN, MSDC_INTEN_CDSC); + sdr_set_bits(host->base + SDC_CFG, SDC_CFG_INSWKUP); + } else { + sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_INSWKUP); + sdr_clr_bits(host->base + MSDC_PS, MSDC_PS_CDEN); + sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INTEN_CDSC); + } + if (host->top_base) { writel(0, host->top_base + EMMC_TOP_CONTROL); writel(0, host->top_base + EMMC_TOP_CMD); @@ -1580,6 +1598,11 @@ static void msdc_init_hw(struct msdc_host *host) static void msdc_deinit_hw(struct msdc_host *host) { u32 val; + + /* Disabled card-detect */ + sdr_clr_bits(host->base + MSDC_PS, MSDC_PS_CDEN); + sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_INSWKUP); + /* Disable and clear all interrupts */ writel(0, host->base + MSDC_INTEN); @@ -2078,13 +2101,31 @@ static void msdc_ack_sdio_irq(struct mmc_host *mmc) __msdc_enable_sdio_irq(mmc, 1); } +static int msdc_get_cd(struct mmc_host *mmc) +{ + struct msdc_host *host = mmc_priv(mmc); + int val; + + if (mmc->caps & MMC_CAP_NONREMOVABLE) + return 1; + + if (!host->internal_cd) + return mmc_gpio_get_cd(mmc); + + val = readl(host->base + MSDC_PS) & MSDC_PS_CDSTS; + if (mmc->caps2 & MMC_CAP2_CD_ACTIVE_HIGH) + return !!val; + else + return !val; +} + static const struct mmc_host_ops mt_msdc_ops = { .post_req = msdc_post_req, .pre_req = msdc_pre_req, .request = msdc_ops_request, .set_ios = msdc_ops_set_ios, .get_ro = mmc_gpio_get_ro, - .get_cd = mmc_gpio_get_cd, + .get_cd = msdc_get_cd, .enable_sdio_irq = msdc_enable_sdio_irq, .ack_sdio_irq = msdc_ack_sdio_irq, .start_signal_voltage_switch = msdc_ops_switch_volt, @@ -2206,6 +2247,15 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; } + if (!(mmc->caps & MMC_CAP_NONREMOVABLE) && + !mmc_can_gpio_cd(mmc)) { + /* + * Is removable but no GPIO declared, so + * use internal functionality. + */ + host->internal_cd = true; + } + msdc_of_property_parse(pdev, host); host->dev = &pdev->dev;