From patchwork Thu Oct 18 18:05:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 10647733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08C8415E2 for ; Thu, 18 Oct 2018 18:06:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC9D228D66 for ; Thu, 18 Oct 2018 18:06:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0E4928F03; Thu, 18 Oct 2018 18:06:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6776928D66 for ; Thu, 18 Oct 2018 18:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730001AbeJSCIK (ORCPT ); Thu, 18 Oct 2018 22:08:10 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43989 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730384AbeJSCIK (ORCPT ); Thu, 18 Oct 2018 22:08:10 -0400 Received: by mail-wr1-f66.google.com with SMTP id n1-v6so34690495wrt.10 for ; Thu, 18 Oct 2018 11:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t4d1XESLrXeXnSYz9ky6f78RupBYH3UH8yOYZCVCqaU=; b=H9WHlPZA7yKN5Y9aXWnb9pZ4MPxtHCV9ZXUWmuRvFE8/hixMRdA9bho4d2Tlt2KdGu 1vxH6tmEfc52bmj/0hns4e6AyrusSfvqcLHpbVn6pao3g81s1TuPIzo962Z+MUrHNSTp Iw6eod7Aq9wgqaEPTY+5HZ830WlYPghZ3dnOD2I6tgZJY7TkRI4sb/rhmyqRKoviN7S+ SwCjTxY+2PyQajn+0uq/mmPNt38CYI+EClHNJQL0jqT92xqswrjcv0bff5FeXnEPgZOM gksnA9NqDJcyqYKAYjx9yFe0/2gXFKQBprXO8Kqknt2CjmAfMG5l+M18E51bJ2DK9qvM UGBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t4d1XESLrXeXnSYz9ky6f78RupBYH3UH8yOYZCVCqaU=; b=jO80umgofyX5rEMSqDM+HzCr+3MUl+2l0QKPt2SXijAepJGgfYO75jifNU83f0t1MT 6Vs1vwZXGYEHiIJDpHCP7GiSu6oxeIglnSG3HoNvqnPC1LxZGbSjFJ1nRcUxO6nVbxXk tWqazbzu9kgf47+d6HuPk7YXI/iEPz2nY5HKNWIcC+zOO13SsBVVVtPWyUTuWmEYElFG 49hV/y5ihYrDHWyeOYsusCan7on8TYo0htZqBLFROYuikgJ1DKzIlNqmeFUv6cWRSyxx DmQXD6FK+BvLTuUIwEEH8jVlN58lCPJpKzdGMeqq21tZuFo3kyUr0684Vfi7CbW4B02J vChg== X-Gm-Message-State: ABuFfoir1LzTlzmkHbXiumDS5sJt9Sr0GajrT2aQSCxZ/g1MjY6WYmbx 98WpsQEc0omsclm36gNda5w= X-Google-Smtp-Source: ACcGV62NDBdO0YYe+lOPFOrTSH3jdfuAUCekuNwn5r5HTPmmLm5WfrOezDAU8G0d+sJ3zRVyEciCKw== X-Received: by 2002:adf:f1ce:: with SMTP id z14-v6mr29524385wro.214.1539885961715; Thu, 18 Oct 2018 11:06:01 -0700 (PDT) Received: from cperon-Latitude-7490.home (2a01cb00048dc90084623f85e0cc039e.ipv6.abo.wanadoo.fr. [2a01:cb00:48d:c900:8462:3f85:e0cc:39e]) by smtp.gmail.com with ESMTPSA id m136-v6sm1246650wmb.4.2018.10.18.11.06.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 11:06:00 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Ulf Hansson , Avri Altman , linux-mmc@vger.kernel.org Cc: Nikita Maslov , =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3] mmc-utils: RPMB fails with status 0x0001 on system eMMC chips Date: Thu, 18 Oct 2018 20:05:49 +0200 Message-Id: <20181018180549.20868-1-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nikita Maslov Use MMC_IOC_MULTI_CMD for RPMB access On some systems which use MMC as a main storage device it is possible that RPMB commands are mixed with generic MMC access commands which invalidates RPMB. This patch uses MMC_IOC_MULTI_CMD. Signed-off-by: Clément Péron --- v3: move set_single_cmd in mmc_cmds.c add MMC_IOC_MULTI_CMD check set blocks in set_single_cmd fix frame_ptr used mmc_cmds.c | 98 +++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/mmc_cmds.c b/mmc_cmds.c index 44623fe..c8bfc09 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -1825,6 +1825,8 @@ int do_sanitize(int nargs, char **argv) ret; \ }) +#define RMPB_MULTI_CMD_MAX_CMDS 3 + enum rpmb_op_type { MMC_RPMB_WRITE_KEY = 0x01, MMC_RPMB_READ_CNT = 0x02, @@ -1847,6 +1849,17 @@ struct rpmb_frame { u_int16_t req_resp; }; +static inline void set_single_cmd(struct mmc_ioc_cmd *ioc, __u32 opcode, + int write_flag) +{ + ioc->opcode = opcode; + ioc->write_flag = write_flag; + ioc->arg = 0x0; + ioc->blksz = 512; + ioc->blocks = 1; + ioc->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC; +} + /* Performs RPMB operation. * * @fd: RPMB device on which we should perform ioctl command @@ -1861,22 +1874,27 @@ static int do_rpmb_op(int fd, struct rpmb_frame *frame_out, unsigned int out_cnt) { +#ifndef MMC_IOC_MULTI_CMD + fprintf(stderr, "mmc-utils has been compiled without MMC_IOC_MULTI_CMD" + " support, needed by RPMB operation.\n"); + exit(1); +#else int err; u_int16_t rpmb_type; - - struct mmc_ioc_cmd ioc = { - .arg = 0x0, - .blksz = 512, - .blocks = 1, - .write_flag = 1, - .opcode = MMC_WRITE_MULTIPLE_BLOCK, - .flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC, - .data_ptr = (uintptr_t)frame_in - }; + struct mmc_ioc_multi_cmd *mioc; + struct mmc_ioc_cmd *ioc; if (!frame_in || !frame_out || !out_cnt) return -EINVAL; + /* prepare arguments for MMC_IOC_MUTLI_CMD ioctl */ + mioc = (struct mmc_ioc_multi_cmd *) + malloc(sizeof (struct mmc_ioc_multi_cmd) + + RMPB_MULTI_CMD_MAX_CMDS * sizeof (struct mmc_ioc_cmd)); + if (!mioc) { + return -ENOMEM; + } + rpmb_type = be16toh(frame_in->req_resp); switch(rpmb_type) { @@ -1887,33 +1905,24 @@ static int do_rpmb_op(int fd, goto out; } + mioc->num_of_cmds = 3; + /* Write request */ - ioc.write_flag |= (1<<31); - err = ioctl(fd, MMC_IOC_CMD, &ioc); - if (err < 0) { - err = -errno; - goto out; - } + ioc = &mioc->cmds[0]; + set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, (1 << 31) | 1); + mmc_ioc_cmd_set_data((*ioc), frame_in); /* Result request */ + ioc = &mioc->cmds[1]; memset(frame_out, 0, sizeof(*frame_out)); frame_out->req_resp = htobe16(MMC_RPMB_READ_RESP); - ioc.write_flag = 1; - ioc.data_ptr = (uintptr_t)frame_out; - err = ioctl(fd, MMC_IOC_CMD, &ioc); - if (err < 0) { - err = -errno; - goto out; - } + set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, 1); + mmc_ioc_cmd_set_data((*ioc), frame_out); /* Get response */ - ioc.write_flag = 0; - ioc.opcode = MMC_READ_MULTIPLE_BLOCK; - err = ioctl(fd, MMC_IOC_CMD, &ioc); - if (err < 0) { - err = -errno; - goto out; - } + ioc = &mioc->cmds[2]; + set_single_cmd(ioc, MMC_READ_MULTIPLE_BLOCK, 0); + mmc_ioc_cmd_set_data((*ioc), frame_in); break; case MMC_RPMB_READ_CNT: @@ -1924,23 +1933,18 @@ static int do_rpmb_op(int fd, /* fall through */ case MMC_RPMB_READ: - /* Request */ - err = ioctl(fd, MMC_IOC_CMD, &ioc); - if (err < 0) { - err = -errno; - goto out; - } + mioc->num_of_cmds = 2; + + /* Read request */ + ioc = &mioc->cmds[0]; + set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, 1); + mmc_ioc_cmd_set_data((*ioc), frame_in); /* Get response */ - ioc.write_flag = 0; - ioc.opcode = MMC_READ_MULTIPLE_BLOCK; - ioc.blocks = out_cnt; - ioc.data_ptr = (uintptr_t)frame_out; - err = ioctl(fd, MMC_IOC_CMD, &ioc); - if (err < 0) { - err = -errno; - goto out; - } + ioc = &mioc->cmds[1]; + set_single_cmd(ioc, MMC_READ_MULTIPLE_BLOCK, 0); + ioc->blocks = out_cnt; + mmc_ioc_cmd_set_data((*ioc), frame_out); break; default: @@ -1948,8 +1952,12 @@ static int do_rpmb_op(int fd, goto out; } + err = ioctl(fd, MMC_IOC_MULTI_CMD, mioc); + out: + free(mioc); return err; +#endif /* !MMC_IOC_MULTI_CMD */ } int do_rpmb_write_key(int nargs, char **argv)