From patchwork Thu Oct 18 09:32:25 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: 10646909 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 D1736157A for ; Thu, 18 Oct 2018 09:32:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C84BE28791 for ; Thu, 18 Oct 2018 09:32:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA87A287AA; Thu, 18 Oct 2018 09:32:43 +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 3D6A928791 for ; Thu, 18 Oct 2018 09:32:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727427AbeJRRcu (ORCPT ); Thu, 18 Oct 2018 13:32:50 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45889 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727360AbeJRRcu (ORCPT ); Thu, 18 Oct 2018 13:32:50 -0400 Received: by mail-wr1-f65.google.com with SMTP id f17-v6so1102473wrs.12 for ; Thu, 18 Oct 2018 02:32:40 -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=8fIjBkahmWLVrU+QXR0YrLfrM0lFmkDI/Hl5c8jjZak=; b=tpbbYASr2+Mwo1JQz/GNLbQTrPh8oWpi/TYlGMtReJJLcmpmjLXwR7ZAVXYycSoCDg naXn68D0qtEEAo3YhA/kh2jZ9LAVYXAk7DycpZ0LxL3FvHN2pUzQ2t29qgqzq3Gxp6lp UE5OMSkogviJ7/HhC+Tg6HGbstYNzUKrUxF4yAs0lnZEVTVp80yDotqx5FcWvAPLylPM j+k9QHDYc2XOBC6Os2wizPmegfInMYvA2Eecf8IvADpS6uoQNZCFJMdFtJPqukcFlW7m XquFjVQ2GqyatNJRWusXAsAJLB6S0HMU3XF9AviTE8t6xgVT6zld8Rz6nm4NQric8+tU XwvA== 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=8fIjBkahmWLVrU+QXR0YrLfrM0lFmkDI/Hl5c8jjZak=; b=KPbxh5xm/gRlB0g/TXa7hgB8TR3oiWQDEF/0PzKDAY/Z53aW51ua+AolepoisX+jyt WtIGWIS5jZVuKSSogcGm1SXd/9h8+PBbjrRx0IXsquNWR+nEtXlT1lXqfw8qeKWd97N5 i5n8w9BbqtzgcyVc2249T/Lx4nKxn+WrwQyqUz6fjCoZ4fTp9UgsaonJVQ8Hgd/zwXce h2dlq9TxLyLa0Istjd4E0Ua67fVrL3T95Hf1DSCmVSpIs+4IZz6n/+XRPqjdPSKAN8SS rw9UA/OLFB0K9Bazku/DjiKhBoz9MS3WPUFseHaQ1yLprcB5WCn6OZaq+ekQVbtQjNMo MBSw== X-Gm-Message-State: AGRZ1gKJG+NZPsDXtd/gTwBuyZY8BDAVncy7PgsL4dB2YNq2tIqKOuWo Wh99HS4kBTuYxUFK3SSUyPCvENY8TrA= X-Google-Smtp-Source: AJdET5ceUy/9652/De4ZKZsp+gVuwVo+9HFrBEkWkSrzzhBEOVkuVUnXVRegi7dMt8GL0/A3t3uIIw== X-Received: by 2002:a5d:53ca:: with SMTP id a10-v6mr1488402wrw.191.1539855159697; Thu, 18 Oct 2018 02:32:39 -0700 (PDT) Received: from cperon-Latitude-7490.lan (static-css-csd-151233.business.bouyguestelecom.com. [176.162.151.233]) by smtp.gmail.com with ESMTPSA id 12-v6sm5102151wms.11.2018.10.18.02.32.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 02:32:38 -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 v2] mmc-utils: RPMB fails with status 0x0001 on system eMMC chips Date: Thu, 18 Oct 2018 11:32:25 +0200 Message-Id: <20181018093225.21477-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 --- Hi, this patch was firstly proposed by Nikita, as some modification was requested and Nikita didn't answer, I propose this new version. I didn't add the Nikita signature has it wasn't signed on the first patch and I don't think I'm allowed to do that. I still have some trouble to access the RPMB partition with controller that have the auto-cmd12 feature. So consider this patch as untested, I will be able to perform test on other controller by the end of the next week. Thanks, Clement mmc.h | 10 +++++++ mmc_cmds.c | 84 ++++++++++++++++++++++++++---------------------------- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/mmc.h b/mmc.h index 285c1f1..e5d92a0 100644 --- a/mmc.h +++ b/mmc.h @@ -194,3 +194,13 @@ #define MMC_RSP_R1 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) + +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->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC; +} diff --git a/mmc_cmds.c b/mmc_cmds.c index 44623fe..5544e4e 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, @@ -1864,19 +1866,20 @@ static int do_rpmb_op(int fd, 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 +1890,27 @@ 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); + ioc->blocks = 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); + ioc->blocks = 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); + ioc->blocks = 1; + mmc_ioc_cmd_set_data((*ioc), frame_out); break; case MMC_RPMB_READ_CNT: @@ -1924,23 +1921,19 @@ 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); + ioc->blocks = 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,7 +1941,10 @@ static int do_rpmb_op(int fd, goto out; } + err = ioctl(fd, MMC_IOC_MULTI_CMD, mioc); + out: + free(mioc); return err; }