From patchwork Wed Jan 15 10:07:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 23232 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ECC39202FA for ; Wed, 15 Jan 2014 10:10:13 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id tp5sf5409238ieb.1 for ; Wed, 15 Jan 2014 02:10:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=1S4PNcbihPCUE4hHYqYy0CydYRiOXgNbFXE9hHkpIb4=; b=KdjMvU+IvTQm+Xp+RQyQuPsPSlRHBmJsnHPD3BGGOXHkjGjXu6DrOYeh9d/K9Wv6qL GG1kveNz+QNME/aMi6oZUQzFI3CO0bvqNART2Sq6ucK0u+Pw1dLNk17SXD9QVUfwnSfK Ej3fToOGK1W/7qThKJYjR7Nl5a+TWUsOd/8lAlUhoFreRaev1Xk7nZcVFmvohKD3n7qH vl/z5NBgbEe5QGS67Ir7XsVd8IgYtvwBZiiMPxPxn/ebVAeS0XS/pktG5wduzA9wALA9 Ex/j5SSxpf1v7Y4Mi+FhLNS19qeyqBjIHyWRvs3dGJB9bRSTR0ZQgc1CMuVMql4+RmrQ CGpQ== X-Gm-Message-State: ALoCoQmAFh4UntvT5hA6lYQhR85j0HfgG4b5qSEQFKL1ebEAEJqgX9RPC7bKmNhd6QjX8AToxVXV X-Received: by 10.42.196.71 with SMTP id ef7mr460102icb.24.1389780613242; Wed, 15 Jan 2014 02:10:13 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.11.173 with SMTP id r13ls536724qeb.12.gmail; Wed, 15 Jan 2014 02:10:13 -0800 (PST) X-Received: by 10.52.31.227 with SMTP id d3mr814146vdi.38.1389780613158; Wed, 15 Jan 2014 02:10:13 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id ug9si1453607vcb.32.2014.01.15.02.10.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 02:10:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id le5so320827vcb.30 for ; Wed, 15 Jan 2014 02:10:13 -0800 (PST) X-Received: by 10.52.171.227 with SMTP id ax3mr808599vdc.34.1389780613089; Wed, 15 Jan 2014 02:10:13 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp262235ved; Wed, 15 Jan 2014 02:10:12 -0800 (PST) X-Received: by 10.68.254.230 with SMTP id al6mr1633423pbd.3.1389780611991; Wed, 15 Jan 2014 02:10:11 -0800 (PST) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by mx.google.com with ESMTPS id y1si3232194pbm.214.2014.01.15.02.10.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 02:10:11 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.43 is neither permitted nor denied by best guess record for domain of zhangfei.gao@linaro.org) client-ip=209.85.220.43; Received: by mail-pa0-f43.google.com with SMTP id rd3so946003pab.30 for ; Wed, 15 Jan 2014 02:10:11 -0800 (PST) X-Received: by 10.68.191.130 with SMTP id gy2mr1527164pbc.129.1389780611502; Wed, 15 Jan 2014 02:10:11 -0800 (PST) Received: from localhost.localdomain ([124.73.90.72]) by mx.google.com with ESMTPSA id iq10sm7023059pbc.14.2014.01.15.02.10.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 02:10:10 -0800 (PST) From: Zhangfei Gao To: Kevin Hilman , Sachin Kamat , Chris Ball , Arnd Bergmann , Mike Turquette , Jaehoon Chung , Seungwon Jeon Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org, Zhangfei Gao Subject: [PATCH] mmc: dw_mmc: fix dw_mci_get_cd Date: Wed, 15 Jan 2014 18:07:49 +0800 Message-Id: <1389780469-32633-1-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389770159-21125-1-git-send-email-zhangfei.gao@linaro.org> References: <1389770159-21125-1-git-send-email-zhangfei.gao@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zhangfei.gao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Introduced from commit bf626e5550f24aec24975a0e85ad8e572ca76a6b CDETECT is ignored since negated return value of mmc_gpio_get_cd(mmc) can not be checked by IS_ERR_VALUE. Add spin_lock_bh(&host->lock) for atomic accessing DW_MMC_CARD_PRESENT, otherwise sd detect may occasionally fail. Signed-off-by: Zhangfei Gao Reported-by: Kevin Hilman Reviewed-by: Sachin Kamat Tested-by: Sachin Kamat --- drivers/mmc/host/dw_mmc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index a776f24f4311..9ded62c8225e 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1033,7 +1033,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc) int present; struct dw_mci_slot *slot = mmc_priv(mmc); struct dw_mci_board *brd = slot->host->pdata; - int gpio_cd = !mmc_gpio_get_cd(mmc); + struct dw_mci *host = slot->host; + int gpio_cd = mmc_gpio_get_cd(mmc); /* Use platform get_cd function, else try onboard card detect */ if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) @@ -1041,11 +1042,12 @@ static int dw_mci_get_cd(struct mmc_host *mmc) else if (brd->get_cd) present = !brd->get_cd(slot->id); else if (!IS_ERR_VALUE(gpio_cd)) - present = !!gpio_cd; + present = !gpio_cd; else present = (mci_readl(slot->host, CDETECT) & (1 << slot->id)) == 0 ? 1 : 0; + spin_lock_bh(&host->lock); if (present) { set_bit(DW_MMC_CARD_PRESENT, &slot->flags); dev_dbg(&mmc->class_dev, "card is present\n"); @@ -1053,6 +1055,7 @@ static int dw_mci_get_cd(struct mmc_host *mmc) clear_bit(DW_MMC_CARD_PRESENT, &slot->flags); dev_dbg(&mmc->class_dev, "card is not present\n"); } + spin_unlock_bh(&host->lock); return present; } @@ -2081,7 +2084,7 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot) return gpio; } -/* find the cd gpio for a given slot; or -1 if none specified */ +/* find the cd gpio for a given slot */ static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot, struct mmc_host *mmc) {