From mboxrd@z Thu Jan 1 00:00:00 1970 From: Seungwon Jeon Subject: RE: [PATCH] mmc: dw_mmc: fix dw_mci_get_cd Date: Wed, 15 Jan 2014 20:58:47 +0900 Message-ID: <001701cf11e9$25b5fe50$7121faf0$%jun@samsung.com> References: <1389770159-21125-1-git-send-email-zhangfei.gao@linaro.org> <1389780469-32633-1-git-send-email-zhangfei.gao@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ks_c_5601-1987 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout2.samsung.com ([203.254.224.25]:45948 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751047AbaAOL6t (ORCPT ); Wed, 15 Jan 2014 06:58:49 -0500 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MZF009HSYLZ9W10@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Wed, 15 Jan 2014 20:58:47 +0900 (KST) In-reply-to: <1389780469-32633-1-git-send-email-zhangfei.gao@linaro.org> Content-language: ko Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: 'Zhangfei Gao' , 'Kevin Hilman' , 'Sachin Kamat' , 'Chris Ball' , 'Arnd Bergmann' , 'Mike Turquette' , 'Jaehoon Chung' Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org On Wed, January 15, 2014, Zhangfei Gao wrote: > 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; !!gpio_cd or gpio_cd is correct, isn't it? Thanks, Seungwon Jeon > 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) > { > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html