On Wed, Mar 25, 2020 at 08:06:57PM -0700, Satya Tangirala wrote: > Introduce functions to manipulate UFS inline encryption hardware > in line with the JEDEC UFSHCI v2.1 specification and to work with the > block keyslot manager. > > The UFS crypto API will assume by default that a vendor driver doesn't > support UFS crypto, even if the hardware advertises the capability, because > a lot of hardware requires some special handling that's not specified in > the aforementioned JEDEC spec. Each vendor driver must explicity set > hba->caps |= UFSHCD_CAP_CRYPTO before ufshcd_hba_init_crypto is called to > opt-in to UFS crypto support. > Thanks, this looks much better now! A couple minor nits I noticed while reading this latest version: > +void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba, > + struct request_queue *q) > +{ > + if ((hba->caps & UFSHCD_CAP_CRYPTO)) > + blk_ksm_register(&hba->ksm, q); > +} There's an extra pair of parentheses in the 'if'. > diff --git a/drivers/scsi/ufs/ufshcd-crypto.h b/drivers/scsi/ufs/ufshcd-crypto.h > new file mode 100644 > index 0000000000000..1e98f1fc99965 > --- /dev/null > +++ b/drivers/scsi/ufs/ufshcd-crypto.h > @@ -0,0 +1,44 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright 2019 Google LLC > + */ > + > +#ifndef _UFSHCD_CRYPTO_H > +#define _UFSHCD_CRYPTO_H > + > +#ifdef CONFIG_SCSI_UFS_CRYPTO > +#include "ufshcd.h" > +#include "ufshci.h" > + > +bool ufshcd_crypto_enable(struct ufs_hba *hba); > + > +void ufshcd_crypto_disable(struct ufs_hba *hba); ufshcd_crypto_disable() has been removed, so its declaration should be removed too. - Eric