On Mon, February 03, 2014, Jaehoon Chung wrote:
> Broken card detection is assumed "the card is present".
> Non-removable card didn't call get_cd().
> dw-mmc controller didn't check whether card is present or not.
> Because DW_MMC_CARD_PRESENT flag is set into dw_mci_get_cd().
> If cd-pin is used, then dw_mci_get_cd() is called.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx>
> ---
> drivers/mmc/host/dw_mmc.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index ac2907d..0d6ab8f 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -910,6 +910,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> {
> struct dw_mci_slot *slot = mmc_priv(mmc);
> struct dw_mci *host = slot->host;
> + struct dw_mci_board *brd = host->pdata;
>
> WARN_ON(slot->mrq);
>
> @@ -920,7 +921,8 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> */
> spin_lock_bh(&host->lock);
>
> - if (!test_bit(DW_MMC_CARD_PRESENT, &slot->flags)) {
> + if (!(brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) &&
> + !test_bit(DW_MMC_CARD_PRESENT, &slot->flags)) {
I think 'non-removable' property doesn't indicate DW_MCI_QUIRK_BROKEN_CARD_DETECTION.
Actually DW_MCI_QUIRK_BROKEN_CARD_DETECTION is set with 'broken-cd' property as quirk.
Still, DW_MMC_CARD_PRESENT flag won't be set with 'non-removable' property.
The following part was removed from commit bf626e5(mmc: dw_mmc: use slot-gpio to handle cd pin).
It would be better to restore that to resolved this problem.
<Quoted>
static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
@@ -2197,12 +2223,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
#endif /* CONFIG_MMC_DW_IDMAC */
}
- if (dw_mci_get_cd(mmc))
- set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
- else
- clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-
</Quoted>
Then, Needed to check 'non-removable' case in dw_mci_get_cd().
I think MMC_CAP_NONREMOVABLE is useful.
Thanks,
Seungwon Jeon
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
