From: Eric Biggers <ebiggers@kernel.org>
To: linux-block@vger.kernel.org, linux-fscrypt@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
Bartosz Golaszewski <brgl@bgdev.pl>,
Gaurav Kashyap <quic_gaurkash@quicinc.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>,
Alim Akhtar <alim.akhtar@samsung.com>,
Avri Altman <avri.altman@wdc.com>,
Bart Van Assche <bvanassche@acm.org>,
Bjorn Andersson <andersson@kernel.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
"James E . J . Bottomley" <James.Bottomley@HansenPartnership.com>,
Jens Axboe <axboe@kernel.dk>,
Konrad Dybcio <konradybcio@kernel.org>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH v10 06/15] mmc: crypto: add mmc_from_crypto_profile()
Date: Thu, 12 Dec 2024 20:19:49 -0800 [thread overview]
Message-ID: <20241213041958.202565-7-ebiggers@kernel.org> (raw)
In-Reply-To: <20241213041958.202565-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Add a helper function that encapsulates a container_of expression. For
now there is just one user but soon there will be more.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
drivers/mmc/host/cqhci-crypto.c | 5 +----
include/linux/mmc/host.h | 8 ++++++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/cqhci-crypto.c b/drivers/mmc/host/cqhci-crypto.c
index d5f4b6972f63..2951911d3f78 100644
--- a/drivers/mmc/host/cqhci-crypto.c
+++ b/drivers/mmc/host/cqhci-crypto.c
@@ -23,14 +23,11 @@ static const struct cqhci_crypto_alg_entry {
};
static inline struct cqhci_host *
cqhci_host_from_crypto_profile(struct blk_crypto_profile *profile)
{
- struct mmc_host *mmc =
- container_of(profile, struct mmc_host, crypto_profile);
-
- return mmc->cqe_private;
+ return mmc_from_crypto_profile(profile)->cqe_private;
}
static int cqhci_crypto_program_key(struct cqhci_host *cq_host,
const union cqhci_crypto_cfg_entry *cfg,
int slot)
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f166d6611ddb..68f09a955a90 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -588,10 +588,18 @@ static inline void *mmc_priv(struct mmc_host *host)
static inline struct mmc_host *mmc_from_priv(void *priv)
{
return container_of(priv, struct mmc_host, private);
}
+#ifdef CONFIG_MMC_CRYPTO
+static inline struct mmc_host *
+mmc_from_crypto_profile(struct blk_crypto_profile *profile)
+{
+ return container_of(profile, struct mmc_host, crypto_profile);
+}
+#endif
+
#define mmc_host_is_spi(host) ((host)->caps & MMC_CAP_SPI)
#define mmc_dev(x) ((x)->parent)
#define mmc_classdev(x) (&(x)->class_dev)
#define mmc_hostname(x) (dev_name(&(x)->class_dev))
--
2.47.1
next prev parent reply other threads:[~2024-12-13 4:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-13 4:19 [PATCH v10 00/15] Support for hardware-wrapped inline encryption keys Eric Biggers
2024-12-13 4:19 ` [PATCH v10 01/15] ufs: qcom: fix crypto key eviction Eric Biggers
2024-12-13 4:19 ` [PATCH v10 02/15] ufs: crypto: add ufs_hba_from_crypto_profile() Eric Biggers
2024-12-13 4:19 ` [PATCH v10 03/15] ufs: qcom: convert to use UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE Eric Biggers
2024-12-13 4:19 ` [PATCH v10 04/15] ufs: crypto: remove ufs_hba_variant_ops::program_key Eric Biggers
2024-12-13 4:19 ` [PATCH v10 05/15] mmc: sdhci-msm: fix crypto key eviction Eric Biggers
2024-12-19 13:48 ` Ulf Hansson
2024-12-13 4:19 ` Eric Biggers [this message]
2024-12-19 13:48 ` [PATCH v10 06/15] mmc: crypto: add mmc_from_crypto_profile() Ulf Hansson
2024-12-13 4:19 ` [PATCH v10 07/15] mmc: sdhci-msm: convert to use custom crypto profile Eric Biggers
2024-12-19 13:48 ` Ulf Hansson
2024-12-13 4:19 ` [PATCH v10 08/15] firmware: qcom: scm: add calls for wrapped key support Eric Biggers
2024-12-13 4:19 ` [PATCH v10 09/15] soc: qcom: ice: make qcom_ice_program_key() take struct blk_crypto_key Eric Biggers
2024-12-13 4:19 ` [PATCH v10 10/15] blk-crypto: add basic hardware-wrapped key support Eric Biggers
2024-12-13 4:19 ` [PATCH v10 11/15] blk-crypto: show supported key types in sysfs Eric Biggers
2024-12-13 4:19 ` [PATCH v10 12/15] blk-crypto: add ioctls to create and prepare hardware-wrapped keys Eric Biggers
2024-12-13 4:19 ` [PATCH v10 13/15] fscrypt: add support for " Eric Biggers
2024-12-13 4:19 ` [PATCH v10 14/15] soc: qcom: ice: add HWKM support to the ICE driver Eric Biggers
2024-12-13 4:19 ` [PATCH v10 15/15] ufs: qcom: add support for wrapped keys Eric Biggers
2025-01-02 18:38 ` [PATCH v10 00/15] Support for hardware-wrapped inline encryption keys Eric Biggers
2025-01-02 18:40 ` Martin K. Petersen
2025-01-02 18:44 ` Eric Biggers
2025-01-09 18:27 ` (subset) " Bjorn Andersson
2025-01-10 8:44 ` Bartosz Golaszewski
2025-01-10 19:10 ` Eric Biggers
2025-01-10 21:16 ` (subset) " Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241213041958.202565-7-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=adrian.hunter@intel.com \
--cc=alim.akhtar@samsung.com \
--cc=andersson@kernel.org \
--cc=avri.altman@wdc.com \
--cc=axboe@kernel.dk \
--cc=brgl@bgdev.pl \
--cc=bvanassche@acm.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=konradybcio@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=martin.petersen@oracle.com \
--cc=quic_gaurkash@quicinc.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).