Commit c2a90eee authored by Eric Biggers's avatar Eric Biggers Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Add UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE 



Add UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE which lets UFS host drivers
initialize the blk_crypto_profile themselves rather than have it be
initialized by ufshcd-core according to the UFSHCI standard.  This is
needed to support inline encryption on the "Exynos" UFS controller which
has a nonstandard interface.

Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20240708235330.103590-2-ebiggers@kernel.org


Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a420a8ed

drivers/ufs/core/ufshcd-crypto.c

+7 −3
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba) 
	int err = 0;

	enum blk_crypto_mode_num blk_mode_num;



	if (hba->quirks & UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE)

		return 0;



	/*

	 * Don't use crypto if either the hardware doesn't advertise the

	 * standard crypto capability bit *or* if the vendor specific driver
@@ -228,9 +231,10 @@ void ufshcd_init_crypto(struct ufs_hba *hba) 
	if (!(hba->caps & UFSHCD_CAP_CRYPTO))

		return;



	/* Clear all keyslots - the number of keyslots is (CFGC + 1) */

	for (slot = 0; slot < hba->crypto_capabilities.config_count + 1; slot++)

		ufshcd_clear_keyslot(hba, slot);

	/* Clear all keyslots. */

	for (slot = 0; slot < hba->crypto_profile.num_slots; slot++)

		hba->crypto_profile.ll_ops.keyslot_evict(&hba->crypto_profile,

							 NULL, slot);

}



void ufshcd_crypto_register(struct ufs_hba *hba, struct request_queue *q)

include/ufs/ufshcd.h

+9 −0
Original line number Diff line number Diff line
@@ -645,6 +645,15 @@ enum ufshcd_quirks { 
	 * thus need this quirk to skip related flow.

	 */

	UFSHCD_QUIRK_MCQ_BROKEN_RTC			= 1 << 21,



	/*

	 * This quirk needs to be enabled if the host controller supports inline

	 * encryption but it needs to initialize the crypto capabilities in a

	 * nonstandard way and/or needs to override blk_crypto_ll_ops.  If

	 * enabled, the standard code won't initialize the blk_crypto_profile;

	 * ufs_hba_variant_ops::init() must do it instead.

	 */

	UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE		= 1 << 22,

};



enum ufshcd_caps {