Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: 1sBQ4d3+A09npia2M/KSnsEz1tufTRsYU8pLMSzQFLh1Woi0M2glEPs70z8Bgr4s4+VoCdex21
 4683VuBTb96xq1zTABUfLM7SJ5RnT8TkdhhD1ulhyOYy1YIj49IC4KUXgV1QHZkZ5OEh2UjjgS
 ngvM3DeWdrT6INKZvsE3c+pvOYymLoOG9f7l5QGDDei/3XRagSF2ozW06C+TmUiFfZBUeuEjKK
 JsqiWHiTeXfr5b3B6R1XGDM2LPypr50tLP7Dc73EfhmchCXAX2zT9LeqJrL6e8qdhCkj4ZO0Ta
 Lj8=
From:   Avri Altman <Avri.Altman@wdc.com>
To:     Stanley Chu <stanley.chu@mediatek.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
        "alim.akhtar@samsung.com" <alim.akhtar@samsung.com>,
        "jejb@linux.ibm.com" <jejb@linux.ibm.com>,
        "ebiggers@kernel.org" <ebiggers@kernel.org>,
        "satyat@google.com" <satyat@google.com>
CC:     "matthias.bgg@gmail.com" <matthias.bgg@gmail.com>,
        "linux-mediatek@lists.infradead.org" 
        <linux-mediatek@lists.infradead.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "kuohong.wang@mediatek.com" <kuohong.wang@mediatek.com>,
        "peter.wang@mediatek.com" <peter.wang@mediatek.com>,
        "chun-hung.wu@mediatek.com" <chun-hung.wu@mediatek.com>,
        "andy.teng@mediatek.com" <andy.teng@mediatek.com>,
        "chaotian.jing@mediatek.com" <chaotian.jing@mediatek.com>,
        "cc.chou@mediatek.com" <cc.chou@mediatek.com>
Subject: RE: [PATCH v3] scsi: ufs-mediatek: Add inline encryption support
Thread-Topic: [PATCH v3] scsi: ufs-mediatek: Add inline encryption support
Thread-Index: AQHWV+P/GyVh+1wGz06EBRk2amZ8p6kFLF0Q
Date:   Mon, 13 Jul 2020 08:18:29 +0000
Message-ID: <SN6PR04MB4640380F541EBDD2F5BC434EFC600@SN6PR04MB4640.namprd04.prod.outlook.com>
References: <20200712003226.7593-1-stanley.chu@mediatek.com>
In-Reply-To: <20200712003226.7593-1-stanley.chu@mediatek.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d81fbc99-5c8d-44b6-a604-08d827055352
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jul 2020 08:18:29.8310
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: AlM5b0ao84+NEuAgUIeKdQxx3NzbDY9iCzlRUf0UM4SWmlpZ9sj+jt7Z5A5KlhnRzA07Edhymvm28Q5m3OsiXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR04MB5359
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

=20
>=20
> Add inline encryption support to ufs-mediatek.
>=20
> 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.
>=20
> 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.
>=20
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>

> ---
>  drivers/scsi/ufs/ufs-mediatek.c | 22 ++++++++++++++++++++++
>  drivers/scsi/ufs/ufs-mediatek.h |  1 +
>  2 files changed, 23 insertions(+)
>=20
> diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-media=
tek.c
> index ad929235c193..31af8b3d2b53 100644
> --- 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>
>=20
>  #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))
>=20
> +#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)
>=20
> @@ -73,6 +77,18 @@ static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba,
> bool enable)
>         }
>  }
>=20
> +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 &=3D ~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 =3D 0;
>                 else
>                         hba->vps->hba_enable_delay_us =3D 600;
> +
> +               if (hba->caps & UFSHCD_CAP_CRYPTO)
> +                       ufs_mtk_crypto_enable(hba);
>         }
>=20
>         return 0;
> @@ -317,6 +336,9 @@ static int ufs_mtk_init(struct ufs_hba *hba)
>         /* Enable clock-gating */
>         hba->caps |=3D UFSHCD_CAP_CLK_GATING;
>=20
> +       /* Enable inline encryption */
> +       hba->caps |=3D UFSHCD_CAP_CRYPTO;
> +
>         /* Enable WriteBooster */
>         hba->caps |=3D UFSHCD_CAP_WB_EN;
>         hba->vps->wb_flush_threshold =3D UFS_WB_BUF_REMAIN_PERCENT(80);
> diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-media=
tek.h
> index 6052ec105aba..8ed24d5fcff9 100644
> --- 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)
>=20
>  /*
> --
> 2.18.0