From patchwork Thu Aug 23 10:43:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 144910 Delivered-To: patches@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30557ljw; Thu, 23 Aug 2018 03:43:45 -0700 (PDT) X-Received: by 2002:a19:d98f:: with SMTP id s15-v6mr39624449lfi.103.1535021025945; Thu, 23 Aug 2018 03:43:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535021025; cv=none; d=google.com; s=arc-20160816; b=T4UnFzPZHR6vBU0/Lhpe1iqfAHUtyu+J8cxql2qU3Kkqevo8cPlCrGWC6S3Kh2EWIa P3Cx3AjHvVGA8vY+uGOZY3rXwlPv63LQkk7lDAznp/zVm8K3Dp4b5FZNLD1M4VF7eNen Bm7hbr2G9FaXR86D0uCmBT9oe7zvGQ/shx/Y+JGZbCPxKgWCc5gfVTgXCgmpprhaR3Cj x63kviPOGI3QzeGAYtdTsm2l5HoTyt9fTYbmwh0NSDvn2JwXN7UeNX+qxdCluPzjS0nC Why4XyjqPNg6z9DX9m5zlpuaX3ApW/4E4z+Azcf3JQoFyBfgeZfushan5n+eArVE+XGf p2YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=u/0UF/7NtCAZYvPhEOE+mzk3+7xY9MuJlAagyF0alyw=; b=aJUDqJ2tu+5oy3Mzkvuw7gHKpWp6j10GrAUIU/tBHws1aUDVc2wn7JYIN8TZlT7fvz SkJsJRpOpy/J2OHn/JzTA6a6W6JtbLw5A6ijT9XJhg+69JUT3YKFYPuhkHvvKi6iO5bH jTAlc2a+lOyVDwa16ggqhsj87vanhPsRQJ2R/hAV3oBqaIpjgRgS0C92R53ezwd2MOrI hftJd+j9Zi59xwlb1eUheUlJ8gNd7WXqNd3k49AV9aZfYuF9km6/ffQOEkK/PDPu5nMR qpzhlaDTHTlE32NwN15MD1pr+yTn2UnB98rgISc5ZZqy9Dw62Mvtbvp+r75CLsppNXSA gcDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BwhKy0tM; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id x1-v6sor903905ljx.68.2018.08.23.03.43.45 for (Google Transport Security); Thu, 23 Aug 2018 03:43:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BwhKy0tM; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u/0UF/7NtCAZYvPhEOE+mzk3+7xY9MuJlAagyF0alyw=; b=BwhKy0tMrM5Qh3X4opq6oKN95AG9G+E7n8eqQwsYK0oMnmeQitTKams1uv2PV/jdCK 14ELJIxfUh60vS0fHDL4B8saBqGOBMisqS9taHq1Npe3tB3VIkmLgr+lL/5xpzZ238WC 9v6EJR3mQaX04qMKw/ngUzgDIAHAh+wgwzFJo= 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:in-reply-to :references; bh=u/0UF/7NtCAZYvPhEOE+mzk3+7xY9MuJlAagyF0alyw=; b=TgxegEkJZg92Ju0seEEdDHN9nzttcGT1M9uTnSCqLLFa3zgNqd76WXtek+TDDr0McV D8WFD2HXipqbiUlRvUPV3trjglHJ4UMjJ0GP8gvqGzTP72hJX8Ox21+FkL/aLa6G7cv3 09Ldf3cuQryQpGM3B2U9guOvjiNrZ/238XOxCGyC52G0YftpK9VfjH+Uc7mYPIVDWQ6H riq6M7HjJ1PU5l5BnrnTvrrI2RhUa5hWITTjQd7hf/eLbNPOkb5DxmA/1axdo7R+bHW4 xKgaksnxe5wLAMobcr0v0LDAWQYdKvmIc0UYF4JPq3trnMy99TYl1NeIM5x/adPtLRlZ jGQA== X-Gm-Message-State: AOUpUlHp5UKo3oLxijQzzeaGaLhnM62ZrCUH7eI7QN4tyYXZx+qSUKLa EmMwUmfYl3uM2X+nlBJXZe/5s5/j X-Google-Smtp-Source: AA+uWPz8kQYQGrOjHv7PRDxZmghr1V1Yl2iBT8Fm3IStd6Ej9aHrgHxOD0QoNDGyOqIkDYSLsOzoFg== X-Received: by 2002:a2e:9e55:: with SMTP id g21-v6mr24629197ljk.116.1535021025719; Thu, 23 Aug 2018 03:43:45 -0700 (PDT) Return-Path: Received: from jax.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id y5-v6sm679771ljj.75.2018.08.23.03.43.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Aug 2018 03:43:45 -0700 (PDT) From: Jens Wiklander To: u-boot@lists.denx.de Cc: Simon Glass , Igor Opaniuk , Tom Rini , Jaehoon Chung , Pierre Aubert , Albert Aribaud , Peter Griffin , Michal Simek , Jens Wiklander Subject: [PATCH v2 04/15] mmc: rpmb: add mmc_rpmb_route_frames() Date: Thu, 23 Aug 2018 12:43:23 +0200 Message-Id: <20180823104334.16083-5-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180823104334.16083-1-jens.wiklander@linaro.org> References: <20180823104334.16083-1-jens.wiklander@linaro.org> Adds mmc_rpmb_route_frames() to route RPMB data frames from/to an external entity. Tested-by: Igor Opaniuk Signed-off-by: Jens Wiklander --- drivers/mmc/rpmb.c | 160 +++++++++++++++++++++++++++++++++++++++++++++ include/mmc.h | 2 + 2 files changed, 162 insertions(+) -- 2.17.1 diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c index dfbdb0deb107..908f19208955 100644 --- a/drivers/mmc/rpmb.c +++ b/drivers/mmc/rpmb.c @@ -321,3 +321,163 @@ int mmc_rpmb_write(struct mmc *mmc, void *addr, unsigned short blk, } return i; } + +static int send_write_mult_block(struct mmc *mmc, const struct s_rpmb *frm, + unsigned short cnt) +{ + struct mmc_cmd cmd = { + .cmdidx = MMC_CMD_WRITE_MULTIPLE_BLOCK, + .resp_type = MMC_RSP_R1b, + }; + struct mmc_data data = { + .src = (const void *)frm, + .blocks = cnt, + .blocksize = sizeof(*frm), + .flags = MMC_DATA_WRITE, + }; + + return mmc_send_cmd(mmc, &cmd, &data); +} + +static int send_read_mult_block(struct mmc *mmc, struct s_rpmb *frm, + unsigned short cnt) +{ + struct mmc_cmd cmd = { + .cmdidx = MMC_CMD_READ_MULTIPLE_BLOCK, + .resp_type = MMC_RSP_R1, + }; + struct mmc_data data = { + .dest = (void *)frm, + .blocks = cnt, + .blocksize = sizeof(*frm), + .flags = MMC_DATA_READ, + }; + + return mmc_send_cmd(mmc, &cmd, &data); +} + +static int rpmb_route_write_req(struct mmc *mmc, struct s_rpmb *req, + unsigned short req_cnt, struct s_rpmb *rsp, + unsigned short rsp_cnt) +{ + int ret; + + /* + * Send the write request. + */ + ret = mmc_set_blockcount(mmc, req_cnt, true); + if (ret) + return ret; + + ret = send_write_mult_block(mmc, req, req_cnt); + if (ret) + return ret; + + /* + * Read the result of the request. + */ + ret = mmc_set_blockcount(mmc, 1, false); + if (ret) + return ret; + + memset(rsp, 0, sizeof(*rsp)); + rsp->request = cpu_to_be16(RPMB_REQ_STATUS); + ret = send_write_mult_block(mmc, rsp, 1); + if (ret) + return ret; + + ret = mmc_set_blockcount(mmc, 1, false); + if (ret) + return ret; + + return send_read_mult_block(mmc, rsp, 1); +} + +static int rpmb_route_read_req(struct mmc *mmc, struct s_rpmb *req, + unsigned short req_cnt, struct s_rpmb *rsp, + unsigned short rsp_cnt) +{ + int ret; + + /* + * Send the read request. + */ + ret = mmc_set_blockcount(mmc, 1, false); + if (ret) + return ret; + + ret = send_write_mult_block(mmc, req, 1); + if (ret) + return ret; + + /* + * Read the result of the request. + */ + + ret = mmc_set_blockcount(mmc, rsp_cnt, false); + if (ret) + return ret; + + return send_read_mult_block(mmc, rsp, rsp_cnt); +} + +static int rpmb_route_frames(struct mmc *mmc, struct s_rpmb *req, + unsigned short req_cnt, struct s_rpmb *rsp, + unsigned short rsp_cnt) +{ + unsigned short n; + + /* + * If multiple request frames are provided, make sure that all are + * of the same type. + */ + for (n = 1; n < req_cnt; n++) + if (req[n].request != req->request) + return -EINVAL; + + switch (be16_to_cpu(req->request)) { + case RPMB_REQ_KEY: + if (req_cnt != 1 || rsp_cnt != 1) + return -EINVAL; + return rpmb_route_write_req(mmc, req, req_cnt, rsp, rsp_cnt); + + case RPMB_REQ_WRITE_DATA: + if (!req_cnt || rsp_cnt != 1) + return -EINVAL; + return rpmb_route_write_req(mmc, req, req_cnt, rsp, rsp_cnt); + + case RPMB_REQ_WCOUNTER: + if (req_cnt != 1 || rsp_cnt != 1) + return -EINVAL; + return rpmb_route_read_req(mmc, req, req_cnt, rsp, rsp_cnt); + + case RPMB_REQ_READ_DATA: + if (req_cnt != 1 || !req_cnt) + return -EINVAL; + return rpmb_route_read_req(mmc, req, req_cnt, rsp, rsp_cnt); + + default: + debug("Unsupported message type: %d\n", + be16_to_cpu(req->request)); + return -EINVAL; + } +} + +int mmc_rpmb_route_frames(struct mmc *mmc, void *req, unsigned long reqlen, + void *rsp, unsigned long rsplen) +{ + /* + * Whoever crafted the data supplied to this function knows how to + * format the PRMB frames and which response is expected. If + * there's some unexpected mismatch it's more helpful to report an + * error immediately than trying to guess what was the intention + * and possibly just delay an eventual error which will be harder + * to track down. + */ + + if (reqlen % sizeof(struct s_rpmb) || rsplen % sizeof(struct s_rpmb)) + return -EINVAL; + + return rpmb_route_frames(mmc, req, reqlen / sizeof(struct s_rpmb), + rsp, rsplen / sizeof(struct s_rpmb)); +} diff --git a/include/mmc.h b/include/mmc.h index df4255b828a7..d6e02af4edea 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -748,6 +748,8 @@ int mmc_rpmb_read(struct mmc *mmc, void *addr, unsigned short blk, unsigned short cnt, unsigned char *key); int mmc_rpmb_write(struct mmc *mmc, void *addr, unsigned short blk, unsigned short cnt, unsigned char *key); +int mmc_rpmb_route_frames(struct mmc *mmc, void *req, unsigned long reqlen, + void *rsp, unsigned long rsplen); #ifdef CONFIG_CMD_BKOPS_ENABLE int mmc_set_bkops_enable(struct mmc *mmc); #endif