mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
mmc: core: Use mrq.sbc in close-ended ffu
commit 4d0c8d0aef
upstream.
Field Firmware Update (ffu) may use close-ended or open ended sequence.
Each such sequence is comprised of a write commands enclosed between 2
switch commands - to and from ffu mode. So for the close-ended case, it
will be: cmd6->cmd23-cmd25-cmd6.
Some host controllers however, get confused when multi-block rw is sent
without sbc, and may generate auto-cmd12 which breaks the ffu sequence.
I encountered this issue while testing fwupd (github.com/fwupd/fwupd)
on HP Chromebook x2, a qualcomm based QC-7c, code name - strongbad.
Instead of a quirk, or hooking the request function of the msm ops,
it would be better to fix the ioctl handling and make it use mrq.sbc
instead of issuing SET_BLOCK_COUNT separately.
Signed-off-by: Avri Altman <avri.altman@wdc.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20231129092535.3278-1-avri.altman@wdc.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d78fac87c6
commit
c4edcd134b
1 changed files with 43 additions and 3 deletions
|
@ -402,6 +402,10 @@ struct mmc_blk_ioc_data {
|
||||||
struct mmc_ioc_cmd ic;
|
struct mmc_ioc_cmd ic;
|
||||||
unsigned char *buf;
|
unsigned char *buf;
|
||||||
u64 buf_bytes;
|
u64 buf_bytes;
|
||||||
|
unsigned int flags;
|
||||||
|
#define MMC_BLK_IOC_DROP BIT(0) /* drop this mrq */
|
||||||
|
#define MMC_BLK_IOC_SBC BIT(1) /* use mrq.sbc */
|
||||||
|
|
||||||
struct mmc_rpmb_data *rpmb;
|
struct mmc_rpmb_data *rpmb;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -467,7 +471,7 @@ static int mmc_blk_ioctl_copy_to_user(struct mmc_ioc_cmd __user *ic_ptr,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
|
static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
|
||||||
struct mmc_blk_ioc_data *idata)
|
struct mmc_blk_ioc_data **idatas, int i)
|
||||||
{
|
{
|
||||||
struct mmc_command cmd = {}, sbc = {};
|
struct mmc_command cmd = {}, sbc = {};
|
||||||
struct mmc_data data = {};
|
struct mmc_data data = {};
|
||||||
|
@ -477,10 +481,18 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
|
||||||
unsigned int busy_timeout_ms;
|
unsigned int busy_timeout_ms;
|
||||||
int err;
|
int err;
|
||||||
unsigned int target_part;
|
unsigned int target_part;
|
||||||
|
struct mmc_blk_ioc_data *idata = idatas[i];
|
||||||
|
struct mmc_blk_ioc_data *prev_idata = NULL;
|
||||||
|
|
||||||
if (!card || !md || !idata)
|
if (!card || !md || !idata)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (idata->flags & MMC_BLK_IOC_DROP)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (idata->flags & MMC_BLK_IOC_SBC)
|
||||||
|
prev_idata = idatas[i - 1];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The RPMB accesses comes in from the character device, so we
|
* The RPMB accesses comes in from the character device, so we
|
||||||
* need to target these explicitly. Else we just target the
|
* need to target these explicitly. Else we just target the
|
||||||
|
@ -547,7 +559,7 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (idata->rpmb) {
|
if (idata->rpmb || prev_idata) {
|
||||||
sbc.opcode = MMC_SET_BLOCK_COUNT;
|
sbc.opcode = MMC_SET_BLOCK_COUNT;
|
||||||
/*
|
/*
|
||||||
* We don't do any blockcount validation because the max size
|
* We don't do any blockcount validation because the max size
|
||||||
|
@ -555,6 +567,8 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
|
||||||
* 'Reliable Write' bit here.
|
* 'Reliable Write' bit here.
|
||||||
*/
|
*/
|
||||||
sbc.arg = data.blocks | (idata->ic.write_flag & BIT(31));
|
sbc.arg = data.blocks | (idata->ic.write_flag & BIT(31));
|
||||||
|
if (prev_idata)
|
||||||
|
sbc.arg = prev_idata->ic.arg;
|
||||||
sbc.flags = MMC_RSP_R1 | MMC_CMD_AC;
|
sbc.flags = MMC_RSP_R1 | MMC_CMD_AC;
|
||||||
mrq.sbc = &sbc;
|
mrq.sbc = &sbc;
|
||||||
}
|
}
|
||||||
|
@ -572,6 +586,15 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
|
||||||
mmc_wait_for_req(card->host, &mrq);
|
mmc_wait_for_req(card->host, &mrq);
|
||||||
memcpy(&idata->ic.response, cmd.resp, sizeof(cmd.resp));
|
memcpy(&idata->ic.response, cmd.resp, sizeof(cmd.resp));
|
||||||
|
|
||||||
|
if (prev_idata) {
|
||||||
|
memcpy(&prev_idata->ic.response, sbc.resp, sizeof(sbc.resp));
|
||||||
|
if (sbc.error) {
|
||||||
|
dev_err(mmc_dev(card->host), "%s: sbc error %d\n",
|
||||||
|
__func__, sbc.error);
|
||||||
|
return sbc.error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (cmd.error) {
|
if (cmd.error) {
|
||||||
dev_err(mmc_dev(card->host), "%s: cmd error %d\n",
|
dev_err(mmc_dev(card->host), "%s: cmd error %d\n",
|
||||||
__func__, cmd.error);
|
__func__, cmd.error);
|
||||||
|
@ -1057,6 +1080,20 @@ static inline void mmc_blk_reset_success(struct mmc_blk_data *md, int type)
|
||||||
md->reset_done &= ~type;
|
md->reset_done &= ~type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void mmc_blk_check_sbc(struct mmc_queue_req *mq_rq)
|
||||||
|
{
|
||||||
|
struct mmc_blk_ioc_data **idata = mq_rq->drv_op_data;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 1; i < mq_rq->ioc_count; i++) {
|
||||||
|
if (idata[i - 1]->ic.opcode == MMC_SET_BLOCK_COUNT &&
|
||||||
|
mmc_op_multi(idata[i]->ic.opcode)) {
|
||||||
|
idata[i - 1]->flags |= MMC_BLK_IOC_DROP;
|
||||||
|
idata[i]->flags |= MMC_BLK_IOC_SBC;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The non-block commands come back from the block layer after it queued it and
|
* The non-block commands come back from the block layer after it queued it and
|
||||||
* processed it with all other requests and then they get issued in this
|
* processed it with all other requests and then they get issued in this
|
||||||
|
@ -1084,11 +1121,14 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
|
||||||
if (ret)
|
if (ret)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mmc_blk_check_sbc(mq_rq);
|
||||||
|
|
||||||
fallthrough;
|
fallthrough;
|
||||||
case MMC_DRV_OP_IOCTL_RPMB:
|
case MMC_DRV_OP_IOCTL_RPMB:
|
||||||
idata = mq_rq->drv_op_data;
|
idata = mq_rq->drv_op_data;
|
||||||
for (i = 0, ret = 0; i < mq_rq->ioc_count; i++) {
|
for (i = 0, ret = 0; i < mq_rq->ioc_count; i++) {
|
||||||
ret = __mmc_blk_ioctl_cmd(card, md, idata[i]);
|
ret = __mmc_blk_ioctl_cmd(card, md, idata, i);
|
||||||
if (ret)
|
if (ret)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue