evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ice: Sent proper storage type for ICE configuration during reset"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-15 06:11:01 -08:00 • committed by Gerrit - the friendly Code Review server
commit d9717f8c9a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/crypto/msm/ice.c
View file

@ -53,6 +53,8 @@
#define QCOM_SDCC_ICE_DEV "icesdcc" #define QCOM_SDCC_ICE_DEV "icesdcc"
#define QCOM_ICE_TYPE_NAME_LEN 8 #define QCOM_ICE_TYPE_NAME_LEN 8
#define QCOM_ICE_MAX_BIST_CHECK_COUNT 100 #define QCOM_ICE_MAX_BIST_CHECK_COUNT 100
#define QCOM_ICE_UFS 10
#define QCOM_ICE_SDCC 20
struct ice_clk_info { struct ice_clk_info {
struct list_head list; struct list_head list;
@ -838,7 +840,7 @@ static int qcom_ice_restore_config(void)
return ret; return ret;
} }
static int qcom_ice_restore_key_config(void) static int qcom_ice_restore_key_config(struct ice_device *ice_dev)
{ {
struct scm_desc desc = {0}; struct scm_desc desc = {0};
int ret = -1; int ret = -1;
@ -846,7 +848,12 @@ static int qcom_ice_restore_key_config(void)
/* For ice 3, key configuration needs to be restored in case of reset */ /* For ice 3, key configuration needs to be restored in case of reset */
desc.arginfo = TZ_OS_KS_RESTORE_KEY_CONFIG_ID_PARAM_ID; desc.arginfo = TZ_OS_KS_RESTORE_KEY_CONFIG_ID_PARAM_ID;
desc.args[0] = 10; /* UFS_ICE */
if (!strcmp(ice_dev->ice_instance_type, "sdcc"))
desc.args[0] = QCOM_ICE_SDCC;
if (!strcmp(ice_dev->ice_instance_type, "ufs"))
desc.args[0] = QCOM_ICE_UFS;
ret = scm_call2(TZ_OS_KS_RESTORE_KEY_CONFIG_ID, &desc); ret = scm_call2(TZ_OS_KS_RESTORE_KEY_CONFIG_ID, &desc);
@ -1135,7 +1142,7 @@ static int qcom_ice_finish_power_collapse(struct ice_device *ice_dev)
* restore it * restore it
*/ */
} else if (ICE_REV(ice_dev->ice_hw_version, MAJOR) > 2) { } else if (ICE_REV(ice_dev->ice_hw_version, MAJOR) > 2) {
err = qcom_ice_restore_key_config(); err = qcom_ice_restore_key_config(ice_dev);
if (err) if (err)
goto out; goto out;