[linux-yocto] [PATCH 1/4] mmc: block: Always switch back to main area after RPMB access

[Sullivan, California L]

Sorry for the spam, but ignore these. I reset them on accident.

---
Cal Sullivan
________________________________________
From: linux-yocto-bounces at yoctoproject.org [linux-yocto-bounces at yoctoproject.org] on behalf of California Sullivan [california.l.sullivan at intel.com]
Sent: Friday, June 03, 2016 1:24 PM
To: linux-yocto at yoctoproject.org
Cc: Wold, Saul
Subject: [linux-yocto] [PATCH 1/4] mmc: block: Always switch back to main       area after RPMB access

From: Adrian Hunter <adrian.hunter at intel.com>

commit 3c866568aff7dcfc0bbd5ffc7fcc34fa8f100f67 upstream.

In preparation to support the use of the RPMB partition with transfer
modes that might require re-tuning, always switch back to the main
area after RPMB access.

RPMB is accessible only via IOCTL so only those paths are affected.

Signed-off-by: Adrian Hunter <adrian.hunter at intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 drivers/mmc/card/block.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 553113e..cbc4211 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -624,6 +624,10 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,

        ioc_err = __mmc_blk_ioctl_cmd(card, md, idata);

+       /* Always switch back to main area after RPMB access */
+       if (md->area_type & MMC_BLK_DATA_AREA_RPMB)
+               mmc_blk_part_switch(card, dev_get_drvdata(&card->dev));
+
        mmc_put_card(card);

        err = mmc_blk_ioctl_copy_to_user(ic_ptr, idata);
@@ -689,6 +693,10 @@ static int mmc_blk_ioctl_multi_cmd(struct block_device *bdev,
        for (i = 0; i < num_of_cmds && !ioc_err; i++)
                ioc_err = __mmc_blk_ioctl_cmd(card, md, idata[i]);

+       /* Always switch back to main area after RPMB access */
+       if (md->area_type & MMC_BLK_DATA_AREA_RPMB)
+               mmc_blk_part_switch(card, dev_get_drvdata(&card->dev));
+
        mmc_put_card(card);

        /* copy to user if data and response */
--
2.5.5

--
_______________________________________________
linux-yocto mailing list
linux-yocto at yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto