From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,FSL_HELO_FAKE,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04600C3F2D7 for ; Mon, 2 Mar 2020 18:02:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C798E22B48 for ; Mon, 2 Mar 2020 18:02:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XFawah19"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="aFeNoIFD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C798E22B48 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yY8tcsC+iL9si4vK3nVabukIn+RHTBlOijXpbig/KH0=; b=XFawah19jrVOy2 QawRdcFzcCwYVpGILXA+ve3UzWtG6bOw4+hKUjGugCIQlqWym+MOghYoD/ysjnKsOXODE8QhjbBYd fi0FQ2X30Hw5ecYh0dxTPne1Rb4g00ExNme4iGX7aXfwGmYcQaOGO2q2SFxpqmmKLqq6TTPm3k+8e CaVPje92jh4Q++NCxEsXp0QoGq5dyg0Cw55D2wCFaDQviHm6j5ZHcyPvaSUfI4kDGY60pJLq/qriP URKy4E2LiKKS2Pf4tpE7QzwIguGQK5XTS+Z3kDsrK10HjnuZu+T6AjeZQUEnGjowJKAm3nM+djR8K o02srhHFHwP2NODWNaCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8pOn-0008Vz-GI; Mon, 02 Mar 2020 18:02:37 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8pOk-0008V7-Bt; Mon, 02 Mar 2020 18:02:36 +0000 Received: from gmail.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E05EF21D56; Mon, 2 Mar 2020 18:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583172153; bh=FtRqmbetKtzAhjYcG5f4Oa0sNs/qid5+5M0b5btzGXw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aFeNoIFDszMPgvo966bttNOOPowGZjl/VVfDXEcrJi0so2an1200uOYyaWsv48ldC dzPZ0wic/6rn1UtkodXalYFqQcXtOx/eM//smEXWhvfrZCvfBZqmJf7T17G3ncpaFi 2KQ09Y5RU+F9ezU8baBANM6Rgk203ig1r50yyNkc= Date: Mon, 2 Mar 2020 10:02:31 -0800 From: Eric Biggers To: Stanley Chu Subject: Re: [RFC PATCH v1] scsi: ufs-mediatek: add inline encryption support Message-ID: <20200302180231.GB98133@gmail.com> References: <20200302091138.10341-1-stanley.chu@mediatek.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200302091138.10341-1-stanley.chu@mediatek.com> User-Agent: Mutt/1.12.2 (2019-09-21) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200302_100234_450432_6AEC9D82 X-CRM114-Status: GOOD ( 17.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-scsi@vger.kernel.org, martin.petersen@oracle.com, andy.teng@mediatek.com, jejb@linux.ibm.com, chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com, linux-kernel@vger.kernel.org, light.hsieh@mediatek.com, satyat@google.com, avri.altman@wdc.com, linux-fscrypt@vger.kernel.org, cang@codeaurora.org, linux-mediatek@lists.infradead.org, peter.wang@mediatek.com, alim.akhtar@samsung.com, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org, beanhuo@micron.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 02, 2020 at 05:11:38PM +0800, Stanley Chu wrote: > 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. > > This patch is rebased to the latest wip-inline-encryption branch in > Eric Biggers's git: > https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git/ Please don't use a random work-in-progress branch from my git repository (which hasn't been updated to the v7 patchset yet and will be rebased); use instead: Repo: https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git Tag: inline-encryption-v7 Also, this patch doesn't apply to either branch anyway: Applying: scsi: ufs-mediatek: add inline encryption support Using index info to reconstruct a base tree... error: patch failed: drivers/scsi/ufs/ufs-mediatek.c:15 error: drivers/scsi/ufs/ufs-mediatek.c: patch does not apply error: patch failed: drivers/scsi/ufs/ufs-mediatek.h:58 error: drivers/scsi/ufs/ufs-mediatek.h: patch does not apply error: Did you hand edit your patch? > diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c > index 53eae5fe2ade..12d01fd3d5e1 100644 > --- a/drivers/scsi/ufs/ufs-mediatek.c > +++ b/drivers/scsi/ufs/ufs-mediatek.c > @@ -15,6 +15,7 @@ > #include > > #include "ufshcd.h" > +#include "ufshcd-crypto.h" > #include "ufshcd-pltfrm.h" > #include "ufs_quirks.h" > #include "unipro.h" > @@ -24,6 +25,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) > > @@ -66,7 +70,27 @@ static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable) > } > } > > -static int ufs_mtk_bind_mphy(struct ufs_hba *hba) > +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); > + } > +} > + > +static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba, > + enum ufs_notify_change_status status) > +{ > + if (status == PRE_CHANGE && ufshcd_hba_is_crypto_supported(hba)) > + ufs_mtk_crypto_enable(hba); > + > + return 0; > +} > + > +int ufs_mtk_bind_mphy(struct ufs_hba *hba) > { > struct ufs_mtk_host *host = ufshcd_get_variant(hba); > struct device *dev = hba->dev; > @@ -494,6 +518,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = { > .name = "mediatek.ufshci", > .init = ufs_mtk_init, > .setup_clocks = ufs_mtk_setup_clocks, > + .hce_enable_notify = ufs_mtk_hce_enable_notify, > .link_startup_notify = ufs_mtk_link_startup_notify, > .pwr_change_notify = ufs_mtk_pwr_change_notify, > .apply_dev_quirks = ufs_mtk_apply_dev_quirks, > diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-mediatek.h > index fccdd979d6fb..5ebaa59898bf 100644 > --- a/drivers/scsi/ufs/ufs-mediatek.h > +++ b/drivers/scsi/ufs/ufs-mediatek.h > @@ -58,6 +58,7 @@ > */ > #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) But if this is all that's needed to get inline crypto working with Mediatek UFS, that's great news. Thanks! - Eric _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel