From: Nava kishore Manne <nava.manne@xilinx.com>
To: <mdf@kernel.org>, <trix@redhat.com>, <robh+dt@kernel.org>,
<michal.simek@xilinx.com>, <arnd@arndb.de>,
<rajan.vaja@xilinx.com>, <gregkh@linuxfoundation.org>,
<linus.walleij@linaro.org>, <amit.sunil.dhamne@xilinx.com>,
<tejas.patel@xilinx.com>, <zou_wei@huawei.com>,
<manish.narani@xilinx.com>,
<lakshmi.sai.krishna.potthuri@xilinx.com>,
<nava.manne@xilinx.com>, <wendy.liang@xilinx.com>,
<linux-fpga@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <git@xilinx.com>,
<chinnikishore369@gmail.com>
Subject: [RFC PATCH 4/4] fpga: zynqmp: Add user-key encrypted FPGA Image loading support
Date: Tue, 4 May 2021 15:52:27 +0530 [thread overview]
Message-ID: <20210504102227.15475-5-nava.manne@xilinx.com> (raw)
In-Reply-To: <20210504102227.15475-1-nava.manne@xilinx.com>
This patch adds support to load the user-key encrypted FPGA
Image loading to the Xilinx ZynqMP Soc.
Signed-off-by: Nava kishore Manne <nava.manne@xilinx.com>
---
drivers/fpga/zynqmp-fpga.c | 24 ++++++++++++++++++++++--
include/linux/firmware/xlnx-zynqmp.h | 2 ++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c
index 125743c9797f..565ebe9e1610 100644
--- a/drivers/fpga/zynqmp-fpga.c
+++ b/drivers/fpga/zynqmp-fpga.c
@@ -22,6 +22,8 @@
*/
struct zynqmp_fpga_priv {
struct device *dev;
+ const char *key_buf;
+ size_t key_size;
u32 flags;
};
@@ -33,6 +35,8 @@ static int zynqmp_fpga_ops_write_init(struct fpga_manager *mgr,
priv = mgr->priv;
priv->flags = info->flags;
+ priv->key_buf = info->enc_key_buf;
+ priv->key_size = info->enc_key_buf_size;
return 0;
}
@@ -41,9 +45,9 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
const char *buf, size_t size)
{
struct zynqmp_fpga_priv *priv;
- dma_addr_t dma_addr;
+ dma_addr_t dma_addr, key_addr;
u32 eemi_flags = 0;
- char *kbuf;
+ char *kbuf, *key_kbuf;
int ret;
priv = mgr->priv;
@@ -54,13 +58,29 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
memcpy(kbuf, buf, size);
+ if (priv->flags & FPGA_MGR_ENCRYPTED_USER_KEY_BITSTREAM) {
+ eemi_flags |= XILINX_ZYNQMP_PM_FPGA_ENC_USER_KEY;
+ key_kbuf = dma_alloc_coherent(priv->dev, size, &key_addr,
+ GFP_KERNEL);
+ if (!key_kbuf)
+ return -ENOMEM;
+ memcpy(key_kbuf, priv->key_buf, priv->key_size);
+ }
+
wmb(); /* ensure all writes are done before initiate FW call */
if (priv->flags & FPGA_MGR_PARTIAL_RECONFIG)
eemi_flags |= XILINX_ZYNQMP_PM_FPGA_PARTIAL;
+ if (priv->flags & FPGA_MGR_ENCRYPTED_USER_KEY_BITSTREAM)
+ ret = zynqmp_pm_fpga_enc_key_load(key_addr, priv->key_size);
+
ret = zynqmp_pm_fpga_load(dma_addr, size, eemi_flags);
+ if (priv->flags & FPGA_MGR_ENCRYPTED_USER_KEY_BITSTREAM)
+ dma_free_coherent(priv->dev, priv->key_size,
+ key_kbuf, key_addr);
+
dma_free_coherent(priv->dev, size, kbuf, dma_addr);
return ret;
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 7aa9ad40ff53..a767386d930a 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -56,9 +56,11 @@
* Firmware FPGA Manager flags
* XILINX_ZYNQMP_PM_FPGA_FULL: FPGA full reconfiguration
* XILINX_ZYNQMP_PM_FPGA_PARTIAL: FPGA partial reconfiguration
+ * XILINX_ZYNQMP_PM_FPGA_ENC_USER_KEY: User-key Encrypted FPGA reconfiguration
*/
#define XILINX_ZYNQMP_PM_FPGA_FULL 0x0U
#define XILINX_ZYNQMP_PM_FPGA_PARTIAL BIT(0)
+#define XILINX_ZYNQMP_PM_FPGA_ENC_USER_KEY BIT(3)
enum pm_api_id {
PM_GET_API_VERSION = 1,
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2021-05-04 10:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 10:22 [RFC PATCH 0/4]Fpga: adds support to load the user-key encrypted FPGA Image loading Nava kishore Manne
2021-05-04 10:22 ` [RFC PATCH 1/4] drivers: firmware: Add user encrypted key load API support Nava kishore Manne
2021-05-04 10:22 ` [RFC PATCH 2/4] fpga: Add new properties to support user-key encrypted bitstream loading Nava kishore Manne
2021-05-13 2:31 ` Rob Herring
2021-05-13 10:54 ` Nava kishore Manne
2021-05-13 14:34 ` Rob Herring
2021-05-27 10:50 ` Nava kishore Manne
2021-05-04 10:22 ` [RFC PATCH 3/4] drivers: fpga: Add user-key encrypted FPGA Image loading support Nava kishore Manne
2021-05-04 10:22 ` Nava kishore Manne [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210504102227.15475-5-nava.manne@xilinx.com \
--to=nava.manne@xilinx.com \
--cc=amit.sunil.dhamne@xilinx.com \
--cc=arnd@arndb.de \
--cc=chinnikishore369@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=git@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=lakshmi.sai.krishna.potthuri@xilinx.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manish.narani@xilinx.com \
--cc=mdf@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=rajan.vaja@xilinx.com \
--cc=robh+dt@kernel.org \
--cc=tejas.patel@xilinx.com \
--cc=trix@redhat.com \
--cc=wendy.liang@xilinx.com \
--cc=zou_wei@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).