scsi: ufs-mediatek: Add inline encryption support

Add inline encryption support to ufs-mediatek.

The standards-compliant parts, such as querying the crypto capabilities and
enabling crypto for individual UFS requests, are already handled by
ufshcd-crypto.c, which itself is wired into the blk-crypto framework.

However MediaTek UFS host requires a vendor-specific hce_enable operation
to allow crypto-related registers being accessed normally in kernel.  After
this step, MediaTek UFS host can work as standard-compliant host for
inline-encryption related functions.

Link: https://lore.kernel.org/r/20200712003226.7593-1-stanley.chu@mediatek.com
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index ad929235c19375185f64f013c64d15d896a5fe49..31af8b3d2b5388435cd7fce82c612ea81617c541 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -16,6 +16,7 @@
 #include <linux/soc/mediatek/mtk_sip_svc.h>
 
 #include "ufshcd.h"
+#include "ufshcd-crypto.h"
 #include "ufshcd-pltfrm.h"
 #include "ufs_quirks.h"
 #include "unipro.h"
@@ -25,6 +26,9 @@
        arm_smccc_smc(MTK_SIP_UFS_CONTROL, \
                      cmd, val, 0, 0, 0, 0, 0, &(res))
 
+#define ufs_mtk_crypto_ctrl(res, enable) \
+       ufs_mtk_smc(UFS_MTK_SIP_CRYPTO_CTRL, enable, res)
+
 #define ufs_mtk_ref_clk_notify(on, res) \
        ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, on, res)
 
@@ -73,6 +77,18 @@ static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable)
        }
 }
 
+static void ufs_mtk_crypto_enable(struct ufs_hba *hba)
+{
+       struct arm_smccc_res res;
+
+       ufs_mtk_crypto_ctrl(res, 1);
+       if (res.a0) {
+               dev_info(hba->dev, "%s: crypto enable failed, err: %lu\n",
+                        __func__, res.a0);
+               hba->caps &= ~UFSHCD_CAP_CRYPTO;
+       }
+}
+
 static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba,
                                     enum ufs_notify_change_status status)
 {
@@ -83,6 +99,9 @@ static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba,
                        hba->vps->hba_enable_delay_us = 0;
                else
                        hba->vps->hba_enable_delay_us = 600;
+
+               if (hba->caps & UFSHCD_CAP_CRYPTO)
+                       ufs_mtk_crypto_enable(hba);
        }
 
        return 0;
@@ -317,6 +336,9 @@ static int ufs_mtk_init(struct ufs_hba *hba)
        /* Enable clock-gating */
        hba->caps |= UFSHCD_CAP_CLK_GATING;
 
+       /* Enable inline encryption */
+       hba->caps |= UFSHCD_CAP_CRYPTO;
+
        /* Enable WriteBooster */
        hba->caps |= UFSHCD_CAP_WB_EN;
        hba->vps->wb_flush_threshold = UFS_WB_BUF_REMAIN_PERCENT(80);

diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-mediatek.h
index 6052ec105ababf8c6f6fe4cfd0094a78be0337f7..8ed24d5fcff93c66adc2e68fe9ecc19464784e9e 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.h
+++ b/drivers/scsi/ufs/ufs-mediatek.h
@@ -70,6 +70,7 @@ enum {
  */
 #define MTK_SIP_UFS_CONTROL               MTK_SIP_SMC_CMD(0x276)
 #define UFS_MTK_SIP_DEVICE_RESET          BIT(1)
+#define UFS_MTK_SIP_CRYPTO_CTRL           BIT(2)
 #define UFS_MTK_SIP_REF_CLK_NOTIFICATION  BIT(3)
 
 /*