mmc: core: Decrease the card detect frequency in polling mode
PATCH 1/1 mmc: core: Decrease the card detect frequency in polling mode
From: Ulf Hansson <[email protected]>
Previously the MMC_CAP2_DETECT_ON_ERR was invented for detecting slow card removal. In was never a realy good solution and a proper fix shall use gpio debouncing instead. We remove this cap in this patch.
Although when running in polling card detect mode, the code can be re-used to detect card removals. Thus we are able to decrease the frequency of issued detect works from the mmc_rescan function.
When no card is inserted the polling timeout is 1 HZ. When card is inserted and detected the polling timeout is increased to 30 s.
Signed-off-by Ulf Hansson <[email protected]>
--- drivers/mmc/core/core.c | 10 ++++++---- include/linux/mmc/host.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/mmc/core/core.c +6 -4
@@ -2312,14 +2312,13 @@ int mmc_detect_card_removed(struct mmc_host *host)* The card will be considered unchanged unless we have been asked to * detect a change or host requires polling to provide card detection. */ -if (!host->detect_change && !(host->caps &MMC_CAP_NEEDS_POLL ) && - !(host->caps2 &MMC_CAP2_DETECT_ON_ERR )) +if (!host->detect_change && !(host->caps &MMC_CAP_NEEDS_POLL ))return ret; host->detect_change =0 ;if (!ret) { ret =_mmc_detect_card_removed (host); -if (ret && (host->caps2 &MMC_CAP2_DETECT_ON_ERR )) { +if (ret && (host->caps &MMC_CAP_NEEDS_POLL )) {/* * Schedule a detect work as soon as possible to let a * rescan handle the card removal.
@@ -2338,6 +2337,7 @@ void mmc_rescan(struct work_struct *work)struct mmc_host *host = container_of(work, struct mmc_host, detect.work);int i; +unsigned int polltimeout_s =1 ;if (host->rescan_disable)return ;
@@ -2368,6 +2368,8 @@ void mmc_rescan(struct work_struct *work)/* if there still is a card present, stop here */ if (host->bus_ops !=NULL ) { +/* set the poll timeout to 30 s when card is inserted */ + polltimeout_s =30 ;mmc_bus_put (host); goto out; }
@@ -2396,7 +2398,7 @@ void mmc_rescan(struct work_struct *work) out:if (host->caps &MMC_CAP_NEEDS_POLL ) -mmc_schedule_delayed_work (&host->detect,HZ ); +mmc_schedule_delayed_work (&host->detect, polltimeout_s *HZ ); }void mmc_start_host (struct mmc_host *host)
include/linux/mmc/host.h +0 -1
@@ -272,7 +272,6 @@ struct mmc_host {#define MMC_CAP2_HS200 (MMC_CAP2_HS200_1_8V_SDR | \ MMC_CAP2_HS200_1_2V_SDR)#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)/* Use the broken voltage */ -#define MMC_CAP2_DETECT_ON_ERR (1 << 8)/* On I/O err check card removal */ #define MMC_CAP2_HC_ERASE_SZ (1 << 9)/* High-capacity erase size */ #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10)/* Card-detect signal active high */ #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)/* Write-protect signal active high */
Signature · 1 line
1.7.10