Merge "mmc: host: Add recovery_finish crypto vops" (d2da670e) · Commits · e / devices / android_kernel_fairphone_FP5

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

+8 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2020, Linux Foundation. All rights reserved.
		* Copyright (c) 2020 - 2021, 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
		@@ -29,6 +29,7 @@ static struct cqhci_host_crypto_variant_ops __maybe_unused cqhci_crypto_qti_vari
		.disable = cqhci_crypto_qti_disable,
		.resume = cqhci_crypto_qti_resume,
		.debug = cqhci_crypto_qti_debug,
		.recovery_finish = cqhci_crypto_qti_recovery_finish,
		};

		static bool ice_cap_idx_valid(struct cqhci_host *host,
		@@ -317,5 +318,11 @@ int cqhci_crypto_qti_resume(struct cqhci_host *host)
		return crypto_qti_resume(host->crypto_vops->priv);
		}

		int cqhci_crypto_qti_recovery_finish(struct cqhci_host *host)
		{
		keyslot_manager_reprogram_all_keys(host->mmc->ksm);
		return 0;
		}

		MODULE_DESCRIPTION("Vendor specific CQHCI Crypto Engine Support");
		MODULE_LICENSE("GPL v2");

+3 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2020 - 2021, The Linux Foundation. All rights reserved.
		*/

		#ifndef _UFSHCD_CRYPTO_QTI_H
		@@ -28,4 +28,6 @@ void cqhci_crypto_qti_set_vops(struct cqhci_host *host)

		int cqhci_crypto_qti_resume(struct cqhci_host *host);

		int cqhci_crypto_qti_recovery_finish(struct cqhci_host *host);

		#endif /* _UFSHCD_ICE_QTI_H */