From patchwork Mon Aug 13 15:53:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 144026 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3246957ljj; Mon, 13 Aug 2018 08:54:08 -0700 (PDT) X-Received: by 2002:a2e:2c09:: with SMTP id s9-v6mr12038231ljs.88.1534175648932; Mon, 13 Aug 2018 08:54:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534175648; cv=none; d=google.com; s=arc-20160816; b=N9evLpsfW0gCYW3t4+MHJKDewpeTpngqvlmT6Y1Ixq9y8QX4NQqE7AwzMjIUUwSm3k Zsu5DBlvXEPj5yvUA+ZcH2oZ2UQEfusdxNA/MoUl01k2QQxJP/5JlZ0giF4oXw0c7R6Z 7Ye2OcSnB3bQbUqldsu3Cka0v8DKYAR7/QpV3pK9VkUF4xg6ystQ2aYW8HGSlagHhEI3 WNe0584W0WRZjvl3iUa1BqBLOJog+QP72GNOySphPsJjFkjXgkt+uJnjF5y4iV30geYq K62O4JxcnrEsw02x8pqXSJCgELKOpWRLnKJV3ctCNqw607+bl+O0lnsY3zL/tcH4IO8+ MRtA== 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=PZ4TgdKBuMMW9tkgtoREcPPmzkp8cSe23QVRzqYKpXE=; b=SMDVR8HUUYp9DJ1ohDMrlB0qJuzP5geLLWNiwtwxCW5FY3wReJ8enZZoiYv/5l3Alg W+4rL1rcBlANLO4wXTMn2ebxbEXhM0laM+3sn8q/gcW0ytiszdFawszLhefms8Q5Znen BITqLUpGljcmb0iJeSwK1gc6HgkHg9m7xVO9klwU9zBnmLKDDyYQxzbiRuG+GsuPDc2L KvAVX454v1UPAwxQDleL3ilwrVoDq85FHV5PH6q8gm1kfsXIpuRsRgf/J+0YHaa7RcQy 2N3DoggXgy3h9QXPR082Y3Z1l93T13SLX0FyIqIwy7W34hx8qAAqtHD0xBU/IumarakV /jrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BjoL1ha+; 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 e83-v6sor2018473lfi.135.2018.08.13.08.54.08 for (Google Transport Security); Mon, 13 Aug 2018 08:54:08 -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=BjoL1ha+; 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=PZ4TgdKBuMMW9tkgtoREcPPmzkp8cSe23QVRzqYKpXE=; b=BjoL1ha+jcdkjyYaAbv0OfhGyOvSCEBpQsvlzKUjsTx8rPxk7uDqxZJVgWsaegijZh qLlG+cSQDvNX/gLlj6i7V2DfgPR+Zzqufp1WrnbnrYQPOOEqg+8ZYN48NaodXnYfp8an WhMS5FiFOo2Yd/UPaO3x2VRQm11akMMzT2udM= 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=PZ4TgdKBuMMW9tkgtoREcPPmzkp8cSe23QVRzqYKpXE=; b=UDut9p1+ZpfimS2SJJfAtUoPRoB7ymN1kzxHwHe+q58noyNnUkMkkGcW5OvZKJQ0nu KtOCtBwUz6BFkr3dRscsqjASth9KY5Gf5Kun0W+LAD7qmNOuItcfrNbYM6BVy0+IbyaM qmVUkiJ0J7YjWSH2w5MysYkSfu2PAmsyPZd2wkNIIoasr4LhdNcW7VUxRAn3ElbvIRUO r17VSsvzLdLoARpscV6N3MYd7hwt1HIWFm/BB/tBaWXpheCYt+kNptocPD1F6kf790r0 QaniqzWhjvdApkbJ4Q2UmqyyPXR61MSF7OfLLb/Jc0knfA9578yimZFoHUMeARdlfEJN nI7Q== X-Gm-Message-State: AOUpUlHHGW7bwmqtYz2DgsUAhZ5BkiX4QOYiOSErcJDJyJ12eq8ubOfD NHVYIHH1H4enxgDHAUUr2k5nmKqh X-Google-Smtp-Source: AA+uWPz1WJ56lMM6BuY35DRDkIVYBdSlhyByVLZ2t5d6eVONmGOsaNkkeTwJ1N9r+1V8GDAD2Z1Yrg== X-Received: by 2002:a19:4f58:: with SMTP id a24-v6mr11058004lfk.140.1534175648645; Mon, 13 Aug 2018 08:54:08 -0700 (PDT) Return-Path: Received: from jax.urgonet (h-84-105.A175.priv.bahnhof.se. [79.136.84.105]) by smtp.gmail.com with ESMTPSA id q12-v6sm2791624lfc.26.2018.08.13.08.54.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 08:54:07 -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 03/10] mmc: rpmb: add mmc_rpmb_route_frames() Date: Mon, 13 Aug 2018 17:53:40 +0200 Message-Id: <20180813155347.13844-4-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180813155347.13844-1-jens.wiklander@linaro.org> References: <20180813155347.13844-1-jens.wiklander@linaro.org> Adds mmc_rpmb_route_frames() to route RPMB data frames from/to an external entity. Signed-off-by: Jens Wiklander --- drivers/mmc/rpmb.c | 160 +++++++++++++++++++++++++++++++++++++++++++++ include/mmc.h | 2 + 2 files changed, 162 insertions(+) -- 2.17.1 Tested-by: Igor Opaniuk 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