A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "Fix GKI compilation for inline encryption modules"

Browse source
This commit is contained in:
qctecmdr 2020-04-07 18:49:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit 740a0a482d
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/scsi/ufs/Makefile
View file

@ -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

3
drivers/scsi/ufs/ufshcd-crypto-qti.c
View file

@ -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)

2
drivers/scsi/ufs/ufshcd-crypto-qti.h
View file

@ -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)

4
drivers/soc/qcom/Makefile
View file

@ -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

2
drivers/soc/qcom/crypto-qti-platform.h
View file

@ -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,