Skip to contentSkip to conversation

mmc: dw_mmc: fix dw_mci_get_cd

PATCH Superseded Zhangfei Gao 5 participants 7 messages Jan 16, 2014 – Jan 17, 2014

Subsystems (3)
Device tree bindings MMC, SD and SDIO Synopsys DesignWare MMC/SD/SDIO driver
lore
Share & tools
lore

Zhangfei Gao

author
#0 lore raw

PATCH v2 1/1 mmc: dw_mmc: fix dw_mci_get_cd

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 <[email protected]>
Reported-by Kevin Hilman <[email protected]>
Reviewed-by Sachin Kamat <[email protected]>
Tested-by Sachin Kamat <[email protected]>
---
 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |    2 ++
 drivers/mmc/host/dw_mmc.c                          |   12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +2 -0
index 8f3f13315358..18b0819bafe0 100644
@@ -73,6 +73,8 @@ Optional properties:
 
 * caps2-mmc-hs200-1_2v: Supports mmc HS200 SDR 1.2V mode
 
+* caps2-mmc-cd-active-high: cd pin is high when card present
+
 * broken-cd: as documented in mmc core bindings.
 
 * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is
drivers/mmc/host/dw_mmc.c +9 -3
index a776f24f4311..ad65b895d34c 100644
@@ -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)
 {

@@ -2411,6 +2414,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 	if (of_find_property(np, "caps2-mmc-hs200-1_2v", NULL))
 		pdata->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
 
+	if (of_find_property(np, "caps2-mmc-cd-active-high", NULL))
+		pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
+
 	return pdata;
 }
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 mmc: dw_mmc: fix dw_mci_get_cd

Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt Optional properties: · line 80

Quoted 11 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +2 -0
@@ -73,6 +73,8 @@ Optional properties:
 
 * caps2-mmc-hs200-1_2v: Supports mmc HS200 SDR 1.2V mode
 
+* caps2-mmc-cd-active-high: cd pin is high when card present
+
 * broken-cd: as documented in mmc core bindings.
 
 * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is

No, don't introduce a new flag when there is already one defined in the generic mmc binding.

Arnd

author
#2 lore raw

PATCH v2 1/1 mmc: dw_mmc: fix dw_mci_get_cd

Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +0 -0
@@ -73,6 +73,8 @@ Optional properties:
 
  * caps2-mmc-hs200-1_2v: Supports mmc HS200 SDR 1.2V mode
Quoted 8 lines

Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt Optional properties: · line 80

Quoted 5 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +2 -0
+* caps2-mmc-cd-active-high: cd pin is high when card present
+
  * broken-cd: as documented in mmc core bindings.
 
  * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is

No, don't introduce a new flag when there is already one defined in the generic mmc binding.

Got it.

Update with "cd-inverted".

if (of_get_property(np, "cd-inverted", NULL))
pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;

Thanks

author
#3 lore raw

PATCH 1/1 mmc: dw_mmc: fix dw_mci_get_cd

In reply to Zhangfei Gao

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 <[email protected]>
Reported-by Kevin Hilman <[email protected]>
Reviewed-by Sachin Kamat <[email protected]>
Tested-by Sachin Kamat <[email protected]>
---
 drivers/mmc/host/dw_mmc.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/mmc/host/dw_mmc.c +9 -3
index a776f24f4311..55cd110a49c4 100644
@@ -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)
 {

@@ -2411,6 +2414,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 	if (of_find_property(np, "caps2-mmc-hs200-1_2v", NULL))
 		pdata->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
 
+	if (of_get_property(np, "cd-inverted", NULL))
+		pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
+
 	return pdata;
 }
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 1/1 mmc: dw_mmc: fix dw_mci_get_cd

Quoted 10 lines · Zhangfei Gao

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 <[email protected]>
Reported-by Kevin Hilman <[email protected]>
Reviewed-by Sachin Kamat <[email protected]>
Tested-by Sachin Kamat <[email protected]>

I didn't look at the patch in detail, but can at least confirm that Arndale boots again in -next with this patch applied.

Tested-by Kevin Hilman <[email protected]>

Kevin

#5 lore raw

PATCH 1/1 mmc: dw_mmc: fix dw_mci_get_cd

Quoted 13 lines · Kevin Hilman
Quoted 10 lines · Zhangfei Gao

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 <[email protected]>
Reported-by Kevin Hilman <[email protected]>
Reviewed-by Sachin Kamat <[email protected]>
Tested-by Sachin Kamat <[email protected]>
Quoted 4 lines

I didn't look at the patch in detail, but can at least confirm that Arndale boots again in -next with this patch applied.

Tested-by Kevin Hilman <[email protected]>
Acked-by Seungwon Jeon <[email protected]>

Thanks,
Seungwon Jeon

#6 lore raw

PATCH 1/1 mmc: dw_mmc: fix dw_mci_get_cd

Hi,

Quoted 14 lines · Seungwon Jeon
Quoted 13 lines · Kevin Hilman
Quoted 10 lines · Zhangfei Gao

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 <[email protected]>
Reported-by Kevin Hilman <[email protected]>
Reviewed-by Sachin Kamat <[email protected]>
Tested-by Sachin Kamat <[email protected]>
Quoted 6 lines
Quoted 4 lines

I didn't look at the patch in detail, but can at least confirm that Arndale boots again in -next with this patch applied.

Tested-by Kevin Hilman <[email protected]>
Acked-by Seungwon Jeon <[email protected]>

Thanks, pushed to mmc-next for 3.14.

- Chris.

Signature · 1 line
Chris Ball   <[email protected]>   <http://printf.net/>