Merge "mmc: sdhci-msm: Provide module/cmdline parameter for disabling cmdq" (d8a46194) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/host/sdhci-msm.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* drivers/mmc/host/sdhci-msm.c - Qualcomm MSM SDHCI Platform
		* driver source file
		*
		* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -224,6 +224,9 @@ static int disable_slots;
		/* root can write, others read */
		module_param(disable_slots, int, S_IRUGO\|S_IWUSR);

		static bool nocmdq;
		module_param(nocmdq, bool, S_IRUGO\|S_IWUSR);

		enum vdd_io_level {
		/* set vdd_io_data->low_vol_level */
		VDD_IO_LOW,
		@@ -3881,6 +3884,11 @@ static void sdhci_msm_cmdq_init(struct sdhci_host *host,
		struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
		struct sdhci_msm_host *msm_host = pltfm_host->priv;

		if (nocmdq) {
		dev_dbg(&pdev->dev, "CMDQ disabled via cmdline\n");
		return;
		}

		host->cq_host = cmdq_pltfm_init(pdev);
		if (IS_ERR(host->cq_host)) {
		dev_dbg(&pdev->dev, "cmdq-pltfm init: failed: %ld\n",