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

Unverified Commit adb168de authored Apr 05, 2021 by Phanindra Babu Pabba

Avoid fatal error if ICE registers are not defined



Disabling crypto configurations if ufs_ice/ cqhci_ice
registers not defined for the given storage controller
and avoid to consider it as fatal error.

Change-Id: I2eefe69a5021ba3dcd0ce90bb4382228e60e6f6d
Signed-off-by: Phanindra Babu Pabba <pabba@codeaurora.org>

parent c30dc7b7

drivers/mmc/host/cqhci-crypto-qti.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,8 @@ int cqhci_crypto_qti_init_crypto(struct cqhci_host *host,
		if (!cqhci_ice_memres) {
		pr_debug("%s ICE not supported\n", __func__);
		host->icemmio = NULL;
		return PTR_ERR(cqhci_ice_memres);
		host->caps &= ~CQHCI_CAP_CRYPTO_SUPPORT;
		return err;
		}

		host->icemmio = devm_ioremap(&host->pdev->dev,

drivers/scsi/ufs/ufshcd-crypto-qti.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -337,7 +337,9 @@ int ufshcd_crypto_qti_init_crypto(struct ufs_hba *hba,
		mmio_base = devm_ioremap_resource(hba->dev, mem_res);
		if (IS_ERR(mmio_base)) {
		pr_err("%s: Unable to get ufs_crypto mmio base\n", __func__);
		return PTR_ERR(mmio_base);
		hba->caps &= ~UFSHCD_CAP_CRYPTO;
		hba->quirks \|= UFSHCD_QUIRK_BROKEN_CRYPTO;
		return err;
		}

		hwkm_ice_memres = platform_get_resource_byname(pdev, IORESOURCE_MEM,