mmc: core: Add parameter use_blk_mq
Until mmc has blk-mq support fully implemented and tested, add a parameter
use_blk_mq, set to true if config option MMC_MQ_DEFAULT is selected, which
it is by default.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit c3d53d0da6
)
pull/10/head
parent
2dd8c48ca1
commit
5608e31e6e
|
@ -12,6 +12,16 @@ menuconfig MMC
|
||||||
If you want MMC/SD/SDIO support, you should say Y here and
|
If you want MMC/SD/SDIO support, you should say Y here and
|
||||||
also to your specific host controller driver.
|
also to your specific host controller driver.
|
||||||
|
|
||||||
|
config MMC_MQ_DEFAULT
|
||||||
|
bool "MMC: use blk-mq I/O path by default"
|
||||||
|
depends on MMC && BLOCK
|
||||||
|
default y
|
||||||
|
---help---
|
||||||
|
This option enables the new blk-mq based I/O path for MMC block
|
||||||
|
devices by default. With the option the mmc_core.use_blk_mq
|
||||||
|
module/boot option defaults to Y, without it to N, but it can
|
||||||
|
still be overridden either way.
|
||||||
|
|
||||||
if MMC
|
if MMC
|
||||||
|
|
||||||
source "drivers/mmc/core/Kconfig"
|
source "drivers/mmc/core/Kconfig"
|
||||||
|
|
|
@ -66,6 +66,13 @@ static const unsigned freqs[] = { 400000, 300000, 200000, 100000 };
|
||||||
bool use_spi_crc = 1;
|
bool use_spi_crc = 1;
|
||||||
module_param(use_spi_crc, bool, 0);
|
module_param(use_spi_crc, bool, 0);
|
||||||
|
|
||||||
|
#ifdef CONFIG_MMC_MQ_DEFAULT
|
||||||
|
bool mmc_use_blk_mq = true;
|
||||||
|
#else
|
||||||
|
bool mmc_use_blk_mq = false;
|
||||||
|
#endif
|
||||||
|
module_param_named(use_blk_mq, mmc_use_blk_mq, bool, S_IWUSR | S_IRUGO);
|
||||||
|
|
||||||
static int mmc_schedule_delayed_work(struct delayed_work *work,
|
static int mmc_schedule_delayed_work(struct delayed_work *work,
|
||||||
unsigned long delay)
|
unsigned long delay)
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,6 +35,8 @@ struct mmc_bus_ops {
|
||||||
int (*reset)(struct mmc_host *);
|
int (*reset)(struct mmc_host *);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern bool mmc_use_blk_mq;
|
||||||
|
|
||||||
void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
|
void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
|
||||||
void mmc_detach_bus(struct mmc_host *host);
|
void mmc_detach_bus(struct mmc_host *host);
|
||||||
|
|
||||||
|
|
|
@ -397,6 +397,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
|
||||||
host->max_blk_size = 512;
|
host->max_blk_size = 512;
|
||||||
host->max_blk_count = PAGE_SIZE / 512;
|
host->max_blk_count = PAGE_SIZE / 512;
|
||||||
|
|
||||||
|
host->use_blk_mq = mmc_use_blk_mq;
|
||||||
|
|
||||||
return host;
|
return host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,10 @@ static inline bool mmc_card_hs400es(struct mmc_card *card)
|
||||||
return card->host->ios.enhanced_strobe;
|
return card->host->ios.enhanced_strobe;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool mmc_host_use_blk_mq(struct mmc_host *host)
|
||||||
|
{
|
||||||
|
return host->use_blk_mq;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -380,6 +380,7 @@ struct mmc_host {
|
||||||
unsigned int doing_retune:1; /* re-tuning in progress */
|
unsigned int doing_retune:1; /* re-tuning in progress */
|
||||||
unsigned int retune_now:1; /* do re-tuning at next req */
|
unsigned int retune_now:1; /* do re-tuning at next req */
|
||||||
unsigned int retune_paused:1; /* re-tuning is temporarily disabled */
|
unsigned int retune_paused:1; /* re-tuning is temporarily disabled */
|
||||||
|
unsigned int use_blk_mq:1; /* use blk-mq */
|
||||||
|
|
||||||
int rescan_disable; /* disable card detection */
|
int rescan_disable; /* disable card detection */
|
||||||
int rescan_entered; /* used with nonremovable devices */
|
int rescan_entered; /* used with nonremovable devices */
|
||||||
|
|
Loading…
Reference in New Issue