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

Commit f1c5ffb1 authored by Gaurav Kashyap's avatar Gaurav Kashyap
Browse files

Fix GKI compilation for inline encryption modules 



Changes to fix compilation for inline encryption
when compiled as modules for GKI.

Change-Id: If091f807fdfb42ceb846334458c48d1687231f6e
Signed-off-by: default avatarGaurav Kashyap <gaurkash@codeaurora.org>
parent 17c22334

drivers/scsi/ufs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -16,5 +16,4 @@ ufshcd-qti-core-y += ufshcd-qti.o ufs-sysfs.o 
ufshcd-qti-core-$(CONFIG_SCSI_UFS_BSG)	+= ufs_bsg.o

ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o

ufshcd-qti-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o

ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO_QTI) += ufshcd-crypto-qti.o

ufshcd-qti-core-$(CONFIG_SCSI_UFS_CRYPTO_QTI) += ufshcd-crypto-qti.o
 
obj-$(CONFIG_SCSI_UFS_CRYPTO_QTI) += ufshcd-crypto-qti.o

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

+2 −1
Original line number Diff line number Diff line
@@ -284,8 +284,9 @@ int ufshcd_crypto_qti_debug(struct ufs_hba *hba) 


void ufshcd_crypto_qti_set_vops(struct ufs_hba *hba)

{

	return ufshcd_crypto_set_vops(hba, &ufshcd_crypto_qti_variant_ops);

	hba->crypto_vops = &ufshcd_crypto_qti_variant_ops;

}

EXPORT_SYMBOL(ufshcd_crypto_qti_set_vops);



int ufshcd_crypto_qti_resume(struct ufs_hba *hba,

			     enum ufs_pm_op pm_op)

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int ufshcd_crypto_qti_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op); 


int ufshcd_crypto_qti_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op);



#ifdef CONFIG_SCSI_UFS_CRYPTO_QTI

#if IS_ENABLED(CONFIG_SCSI_UFS_CRYPTO_QTI)

void ufshcd_crypto_qti_set_vops(struct ufs_hba *hba);

#else

static inline void ufshcd_crypto_qti_set_vops(struct ufs_hba *hba)

drivers/soc/qcom/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -76,6 +76,4 @@ obj-$(CONFIG_QCOM_HYP_CORE_CTL) += hyp_core_ctl.o 
obj-$(CONFIG_MSM_QBT_HANDLER) += qbt_handler.o

obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti-common.o

obj-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o

obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm_qti.o

hwkm_qti-y += hwkm.o

hwkm_qti-y += crypto-qti-hwkm.o
 
obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o crypto-qti-hwkm.o

drivers/soc/qcom/crypto-qti-platform.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/types.h>

#include <linux/device.h>



#if IS_ENABLED(CONFIG_QTI_CRYPTO_TZ) || IS_ENABLED(CONFIG_QTI_HW_KEY_MANAGER)

#if IS_ENABLED(CONFIG_QTI_CRYPTO_COMMON)

int crypto_qti_program_key(struct crypto_vops_qti_entry *ice_entry,

			   const struct blk_crypto_key *key,

			   unsigned int slot,