From patchwork Sat Oct 20 17:52:22 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: 10650575 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 504381508 for ; Sat, 20 Oct 2018 17:52:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E2EE28619 for ; Sat, 20 Oct 2018 17:52:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D79A28669; Sat, 20 Oct 2018 17:52:34 +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 9C99728619 for ; Sat, 20 Oct 2018 17:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727590AbeJUCDo (ORCPT ); Sat, 20 Oct 2018 22:03:44 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45033 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727447AbeJUCDo (ORCPT ); Sat, 20 Oct 2018 22:03:44 -0400 Received: by mail-wr1-f67.google.com with SMTP id q6-v6so4275385wrw.11 for ; Sat, 20 Oct 2018 10:52:30 -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=8+iag56SD9LVzp+DshTIKVx5m3RbUr6JDHvLOl4ziTc=; b=PRNnD3P6V1KUVmKB15XUfpBHPDOyLhix/vTs3QdYnCt4bnjRtlxCQmJ7vi/M5sW8Kd IfDWpLn0g/w+zkyc4qnHGMa1RjSGEEpLJUvb1RPNYIpCTAkRAAxFIqBuO4mBSF0QoVwv vXpp+h3aPwRdk9n3Er/anXvXr7mr1+4KCI51L+ontv2bsZL5Nndv6bDF5jnKN8/Rg4RU 2//B84KqXFskPT2uTNaWgsq3OtXPQNAeim814IXQ7vEe8uFlvo1TNOQf6Uvk3Bp3DWnN TkYwjLaPdBe0N7nENaaLI6sI05dNA3ajMv18SJN1gW64KITFrUtA8m7rxVZeEUXHyBr+ Y+YQ== 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=8+iag56SD9LVzp+DshTIKVx5m3RbUr6JDHvLOl4ziTc=; b=XnCoH8Pt7qIQsU5qC4gU9gGM0m3Im01qGZCZ57wSrXSf8WYc2fniPStcYJyyDHwx5O KW4FadiD0u7cgXeBQvZhHnHsfJIdI9zkuuTQPPvCpNigiHCY5KdOvYTvRoMjbQPME+sz FnajJi/OhlL1BmpsqJZ0LIx3yaW6rJKWKPwYC2Fq0FgehdRy+zJJn7W/MJNg+glwGs+Q sCFGLlDOdbvbax3Mpcy8i+nYDB3KBQs2u7v5hWPpcvSmoiGAgvIUcDApNfKLwl6CtNGe i33roDh6bM9V6qVBCdrnTuSiJxtGdVO3ByvXW3dRaE62L/UzsJFy2lQtpC/8YDZMBdkU uhWQ== X-Gm-Message-State: AGRZ1gKTG8gLud95NqjGpl7KxNqwxLqnEhALqiG9W7BBT3gVgoNdkXWn Rd/kZmOuG7qVdOaX/kw+UGXe5EwkDM8= X-Google-Smtp-Source: AJdET5eNHzmXLDSNZ+dlYUsKw2pFOfdorN+OqW7t1nVyZ5VETlGODc3wST3/5I9rKMkW1Z8rvkdmxg== X-Received: by 2002:adf:e98c:: with SMTP id h12-v6mr9697911wrm.170.1540057949766; Sat, 20 Oct 2018 10:52:29 -0700 (PDT) Received: from cperon-Latitude-7490.home (2a01cb00048dc9004c4357618d5f3e30.ipv6.abo.wanadoo.fr. [2a01:cb00:48d:c900:4c43:5761:8d5f:3e30]) by smtp.gmail.com with ESMTPSA id m16-v6sm8409986wmd.35.2018.10.20.10.52.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 10:52:28 -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 v4] mmc-utils: use MMC_IOC_MULTI_CMD for RPMB access Date: Sat, 20 Oct 2018 19:52:22 +0200 Message-Id: <20181020175222.9398-1-peron.clem@gmail.com> X-Mailer: git-send-email 2.19.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 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 Reviewed-by: Avri Altman --- v4: change title of the commit pass blocks as param of set_single_cmd use temp rpmb_frame to carry the response 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 | 101 ++++++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 47 deletions(-) diff --git a/mmc_cmds.c b/mmc_cmds.c index 44623fe..886eaf4 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, unsigned int blocks) +{ + ioc->opcode = opcode; + ioc->write_flag = write_flag; + ioc->arg = 0x0; + ioc->blksz = 512; + ioc->blocks = blocks; + 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,28 @@ 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; + struct rpmb_frame frame_status = {0}; 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 +1906,23 @@ 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, 1); + mmc_ioc_cmd_set_data((*ioc), frame_in); /* Result request */ - 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; - } + ioc = &mioc->cmds[1]; + frame_status.req_resp = htobe16(MMC_RPMB_READ_RESP); + set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, 1, 1); + mmc_ioc_cmd_set_data((*ioc), &frame_status); /* 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, 1); + mmc_ioc_cmd_set_data((*ioc), frame_out); break; case MMC_RPMB_READ_CNT: @@ -1924,23 +1933,17 @@ 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, 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, out_cnt); + mmc_ioc_cmd_set_data((*ioc), frame_out); break; default: @@ -1948,8 +1951,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)