mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 12:58:12 -04:00
Merge "scsi: ufshcd-qti: Port the new crypto framework to QTI ufs"
This commit is contained in:
qctecmdr
Gerrit - the friendly Code Review server
commit
7da699bec8
1 changed files with 56 additions and 4 deletions
|
|
@ -17,6 +17,7 @@
|
|||
#include "ufs-sysfs.h"
|
||||
#include "ufs-qcom.h"
|
||||
#include "ufs_bsg.h"
|
||||
#include "ufshcd-crypto.h"
|
||||
|
||||
#define ufshcd_hex_dump(prefix_str, buf, len) do { \
|
||||
size_t __len = (len); \
|
||||
|
|
@ -1296,6 +1297,11 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
|
|||
{
|
||||
u32 val = CONTROLLER_ENABLE;
|
||||
|
||||
if (ufshcd_hba_is_crypto_supported(hba)) {
|
||||
ufshcd_crypto_enable(hba);
|
||||
val |= CRYPTO_GENERAL_ENABLE;
|
||||
}
|
||||
|
||||
ufshcd_writel(hba, val, REG_CONTROLLER_ENABLE);
|
||||
}
|
||||
|
||||
|
|
@ -2883,9 +2889,21 @@ static int ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,
|
|||
dword_0 |= UTP_REQ_DESC_INT_CMD;
|
||||
|
||||
/* Transfer request descriptor header fields */
|
||||
if (lrbp->crypto_enable) {
|
||||
dword_0 |= UTP_REQ_DESC_CRYPTO_ENABLE_CMD;
|
||||
dword_0 |= lrbp->crypto_key_slot;
|
||||
req_desc->header.dword_1 =
|
||||
cpu_to_le32((u32)lrbp->data_unit_num);
|
||||
req_desc->header.dword_3 =
|
||||
cpu_to_le32((u32)(lrbp->data_unit_num >> 32));
|
||||
} else {
|
||||
/* dword_1 and dword_3 are reserved, hence they are set to 0 */
|
||||
req_desc->header.dword_1 = 0;
|
||||
req_desc->header.dword_3 = 0;
|
||||
}
|
||||
|
||||
req_desc->header.dword_0 = cpu_to_le32(dword_0);
|
||||
/* dword_1 is reserved, hence it is set to 0 */
|
||||
req_desc->header.dword_1 = 0;
|
||||
|
||||
/*
|
||||
* assigning invalid value for command status. Controller
|
||||
* updates OCS on command completion, with the command
|
||||
|
|
@ -2893,8 +2911,6 @@ static int ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,
|
|||
*/
|
||||
req_desc->header.dword_2 =
|
||||
cpu_to_le32(OCS_INVALID_COMMAND_STATUS);
|
||||
/* dword_3 is reserved, hence it is set to 0 */
|
||||
req_desc->header.dword_3 = 0;
|
||||
|
||||
req_desc->prd_table_length = 0;
|
||||
|
||||
|
|
@ -3226,6 +3242,13 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
|
|||
lrbp->task_tag = tag;
|
||||
lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
|
||||
lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba) ? true : false;
|
||||
|
||||
err = ufshcd_prepare_lrbp_crypto(hba, cmd, lrbp);
|
||||
if (err) {
|
||||
lrbp->cmd = NULL;
|
||||
clear_bit_unlock(tag, &hba->lrb_in_use);
|
||||
goto out;
|
||||
}
|
||||
lrbp->req_abort_skip = false;
|
||||
|
||||
err = ufshcd_comp_scsi_upiu(hba, lrbp);
|
||||
|
|
@ -3286,6 +3309,7 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba,
|
|||
lrbp->task_tag = tag;
|
||||
lrbp->lun = 0; /* device management cmd is not specific to any LUN */
|
||||
lrbp->intr_cmd = true; /* No interrupt aggregation */
|
||||
lrbp->crypto_enable = false; /* No crypto operations */
|
||||
hba->dev_cmd.type = cmd_type;
|
||||
|
||||
return ufshcd_comp_devman_upiu(hba, lrbp);
|
||||
|
|
@ -5214,6 +5238,7 @@ static inline void ufshcd_hba_stop(struct ufs_hba *hba, bool can_sleep)
|
|||
{
|
||||
int err;
|
||||
|
||||
ufshcd_crypto_disable(hba);
|
||||
ufshcd_writel(hba, CONTROLLER_DISABLE, REG_CONTROLLER_ENABLE);
|
||||
err = ufshcd_wait_for_register(hba, REG_CONTROLLER_ENABLE,
|
||||
CONTROLLER_ENABLE, CONTROLLER_DISABLE,
|
||||
|
|
@ -5613,6 +5638,7 @@ static int ufshcd_slave_configure(struct scsi_device *sdev)
|
|||
if (hba->scsi_cmd_timeout)
|
||||
blk_queue_rq_timeout(q, hba->scsi_cmd_timeout * HZ);
|
||||
|
||||
ufshcd_crypto_setup_rq_keyslot_manager(hba, q);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -5623,6 +5649,7 @@ static int ufshcd_slave_configure(struct scsi_device *sdev)
|
|||
static void ufshcd_slave_destroy(struct scsi_device *sdev)
|
||||
{
|
||||
struct ufs_hba *hba;
|
||||
struct request_queue *q = sdev->request_queue;
|
||||
|
||||
hba = shost_priv(sdev->host);
|
||||
/* Drop the reference as it won't be needed anymore */
|
||||
|
|
@ -5633,6 +5660,8 @@ static void ufshcd_slave_destroy(struct scsi_device *sdev)
|
|||
hba->sdev_ufs_device = NULL;
|
||||
spin_unlock_irqrestore(hba->host->host_lock, flags);
|
||||
}
|
||||
|
||||
ufshcd_crypto_destroy_rq_keyslot_manager(hba, q);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -5756,6 +5785,8 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
|
|||
case OCS_PEER_COMM_FAILURE:
|
||||
case OCS_FATAL_ERROR:
|
||||
case OCS_DEVICE_FATAL_ERROR:
|
||||
case OCS_INVALID_CRYPTO_CONFIG:
|
||||
case OCS_GENERAL_CRYPTO_ERROR:
|
||||
default:
|
||||
result |= DID_ERROR << 16;
|
||||
dev_err(hba->dev,
|
||||
|
|
@ -5857,6 +5888,7 @@ static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,
|
|||
result = ufshcd_transfer_rsp_status(hba, lrbp);
|
||||
scsi_dma_unmap(cmd);
|
||||
cmd->result = result;
|
||||
ufshcd_complete_lrbp_crypto(hba, cmd, lrbp);
|
||||
clear_bit_unlock(index, &hba->lrb_in_use);
|
||||
lrbp->compl_time_stamp = ktime_get();
|
||||
update_req_stats(hba, lrbp);
|
||||
|
|
@ -9284,6 +9316,9 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
|
|||
req_link_state = UIC_LINK_OFF_STATE;
|
||||
}
|
||||
|
||||
ret = ufshcd_crypto_suspend(hba, pm_op);
|
||||
if (ret)
|
||||
goto out;
|
||||
/*
|
||||
* If we can't transition into any of the low power modes
|
||||
* just gate the clocks.
|
||||
|
|
@ -9399,6 +9434,7 @@ enable_gating:
|
|||
ufshcd_resume_clkscaling(hba);
|
||||
hba->clk_gating.is_suspended = false;
|
||||
ufshcd_release_all(hba);
|
||||
ufshcd_crypto_resume(hba, pm_op);
|
||||
out:
|
||||
hba->pm_op_in_progress = 0;
|
||||
|
||||
|
|
@ -9422,10 +9458,12 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
|
|||
{
|
||||
int ret;
|
||||
enum uic_link_state old_link_state;
|
||||
enum ufs_dev_pwr_mode old_pwr_mode;
|
||||
|
||||
hba->pm_op_in_progress = 1;
|
||||
old_link_state = hba->uic_link_state;
|
||||
|
||||
old_pwr_mode = hba->curr_dev_pwr_mode;
|
||||
ufshcd_hba_vreg_set_hpm(hba);
|
||||
/* Make sure clocks are enabled before accessing controller */
|
||||
ret = ufshcd_enable_clocks(hba);
|
||||
|
|
@ -9477,6 +9515,10 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
|
|||
goto set_old_link_state;
|
||||
}
|
||||
|
||||
ret = ufshcd_crypto_resume(hba, pm_op);
|
||||
if (ret)
|
||||
goto set_old_dev_pwr_mode;
|
||||
|
||||
if (ufshcd_keep_autobkops_enabled_except_suspend(hba))
|
||||
ufshcd_enable_auto_bkops(hba);
|
||||
else
|
||||
|
|
@ -9499,6 +9541,9 @@ skip_dev_ops:
|
|||
ufshcd_release_all(hba);
|
||||
goto out;
|
||||
|
||||
set_old_dev_pwr_mode:
|
||||
if (old_pwr_mode != hba->curr_dev_pwr_mode)
|
||||
ufshcd_set_dev_pwr_mode(hba, old_pwr_mode);
|
||||
set_old_link_state:
|
||||
ufshcd_link_state_transition(hba, old_link_state, 0);
|
||||
vendor_suspend:
|
||||
|
|
@ -9986,6 +10031,13 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
|
|||
if (hba->force_g4)
|
||||
hba->phy_init_g4 = true;
|
||||
|
||||
/* Init crypto */
|
||||
err = ufshcd_hba_init_crypto(hba);
|
||||
if (err) {
|
||||
dev_err(hba->dev, "crypto setup failed\n");
|
||||
goto out_remove_scsi_host;
|
||||
}
|
||||
|
||||
/* Host controller enable */
|
||||
err = ufshcd_hba_enable(hba);
|
||||
if (err) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue