drivers:optee:rpmb: initialize drivers of mmc devices in UCLASS_BLK for rpmb access

CONFIG_MMC only initializes drivers for devices in UCLASS_MMC, we need
to initialize drivers for devices of type IF_TYPE_MMC in UCLASS_BLK as
well because they are the child devices of devices in UCLASS_MMC.  This
is required for feature RPMB since it will access eMMC in optee-os.

Signed-off-by: Judy Wang <wangjudy@microsoft.com>
[trini: Add my SoB line and adjust Judy's name in git, having emailed
off-list]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index 0804fc963cf53059de42fd243153dff8e6a79f6b..cf5e0a08e619b295aa8b4ac70766da3cdbadd23f 100644 (file)
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -72,6 +72,10 @@ static struct mmc *get_mmc(struct optee_private *priv, int dev_id)
                debug("Cannot find RPMB device\n");
                return NULL;
        }
+       if (mmc_init(mmc)) {
+               log(LOGC_BOARD, LOGL_ERR, "%s:MMC device %d init failed\n", __func__, dev_id);
+               return NULL;
+       }
        if (!(mmc->version & MMC_VERSION_MMC)) {
                debug("Device id %d is not an eMMC device\n", dev_id);
                return NULL;
@@ -104,6 +108,11 @@ static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info)
        if (!mmc)
                return TEE_ERROR_ITEM_NOT_FOUND;
 
+       if (mmc_init(mmc)) {
+               log(LOGC_BOARD, LOGL_ERR, "%s:MMC device %d init failed\n", __func__, dev_id);
+               return TEE_ERROR_NOT_SUPPORTED;
+       }
+
        if (!mmc->ext_csd)
                return TEE_ERROR_GENERIC;