Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81203506 authored by Veerabhadrarao Badiganti's avatar Veerabhadrarao Badiganti
Browse files

mmc: sdhci-msm-ice: Enable ICE HCI if supported 



Check if the SDHC has ICE HCI support. If support is present,
enable the cryptoghrapic support inside SDHC.

Also ensure that it is re-enabled after SDHC is reset.
By default ICE HCI is disabled.

Change-Id: I43a65279088d70b415c396bc3e51e0e510bb7f9c
Signed-off-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
parent e8d1e5da

drivers/mmc/host/sdhci-msm-ice.c

+13 −0
Original line number Diff line number Diff line
@@ -180,6 +180,13 @@ int sdhci_msm_ice_init(struct sdhci_host *host) 
	int err = 0;



	if (msm_host->ice.vops->init) {

		err = sdhci_msm_ice_pltfm_init(msm_host);

		if (err)

			goto out;



		if (msm_host->ice_hci_support)

			sdhci_msm_enable_ice_hci(host, true);



		err = msm_host->ice.vops->init(msm_host->ice.pdev,

					msm_host,

					sdhci_msm_ice_error_cb);
@@ -187,6 +194,8 @@ int sdhci_msm_ice_init(struct sdhci_host *host) 
			pr_err("%s: ice init err %d\n",

				mmc_hostname(host->mmc), err);

			sdhci_msm_ice_print_regs(host);

			if (msm_host->ice_hci_support)

				sdhci_msm_enable_ice_hci(host, false);

			goto out;

		}

		msm_host->ice.state = SDHCI_MSM_ICE_STATE_ACTIVE;
@@ -304,6 +313,10 @@ int sdhci_msm_ice_reset(struct sdhci_host *host) 
		}

	}



	/* If ICE HCI support is present then re-enable it */

	if (msm_host->ice_hci_support)

		sdhci_msm_enable_ice_hci(host, true);



	if (msm_host->ice.state != SDHCI_MSM_ICE_STATE_ACTIVE) {

		pr_err("%s: ice is in invalid state after reset %d\n",

			mmc_hostname(host->mmc), msm_host->ice.state);