[PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[mdf]

From: Moritz Fischer <mdf@kernel.org>

Add a flag that is passed to the write_init() callback, indicating
that the bitstream is encrypted.

The low-level driver will deal with the flag, or return an error,
if encrypted bitstreams are not supported.

Signed-off-by: Moritz Fischer <mdf@kernel.org>
Cc: Alan Tull <atull@kernel.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-fpga@vger.kernel.org
---

Changes from v1:
- Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM

---
 include/linux/fpga/fpga-mgr.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
index 57beb5d..e2ef94f 100644
--- a/include/linux/fpga/fpga-mgr.h
+++ b/include/linux/fpga/fpga-mgr.h
@@ -70,6 +70,7 @@ enum fpga_mgr_states {
  */
 #define FPGA_MGR_PARTIAL_RECONFIG	BIT(0)
 #define FPGA_MGR_EXTERNAL_CONFIG	BIT(1)
+#define FPGA_MGR_ENCRYPTED_BITSTREAM	BIT(2)
 
 /**
  * struct fpga_image_info - information specific to a FPGA image
-- 
2.7.4

[PATCH v2 2/3] fpga: zynq: Add support for encrypted bitstreams

[mdf]

From: Moritz Fischer <mdf@kernel.org>

Add support for encrypted bitstreams. For this to work the system
must be booted in secure mode.

In order for on-the-fly decryption to work, the PCAP clock rate
needs to be lowered via the PCAP_RATE_EN bit.

Signed-off-by: Moritz Fischer <mdf@kernel.org>
Cc: Alan Tull <atull@kernel.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-fpga@vger.kernel.org
---

Changes from v1:
- Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM

---
 drivers/fpga/zynq-fpga.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 34cb981..70b15b3 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -72,6 +72,10 @@
 #define CTRL_PCAP_PR_MASK		BIT(27)
 /* Enable PCAP */
 #define CTRL_PCAP_MODE_MASK		BIT(26)
+/* Lower rate to allow decrypt on the fly */
+#define CTRL_PCAP_RATE_EN_MASK		BIT(25)
+/* System booted in secure mode */
+#define CTRL_SEC_EN_MASK		BIT(7)
 
 /* Miscellaneous Control Register bit definitions */
 /* Internal PCAP loopback */
@@ -266,6 +270,17 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
 	if (err)
 		return err;
 
+	/* check if bitstream is encrypted & and system's still secure */
+	if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM) {
+		ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
+		if (!(ctrl & CTRL_SEC_EN_MASK)) {
+			dev_err(&mgr->dev,
+				"System not secure, can't use crypted bitstreams\n");
+			err = -EINVAL;
+			goto out_err;
+		}
+	}
+
 	/* don't globally reset PL if we're doing partial reconfig */
 	if (!(info->flags & FPGA_MGR_PARTIAL_RECONFIG)) {
 		if (!zynq_fpga_has_sync(buf, count)) {
@@ -337,12 +352,19 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
 
 	/* set configuration register with following options:
 	 * - enable PCAP interface
-	 * - set throughput for maximum speed
+	 * - set throughput for maximum speed (if bistream not crypted)
 	 * - set CPU in user mode
 	 */
 	ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
-	zynq_fpga_write(priv, CTRL_OFFSET,
-			(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK | ctrl));
+	if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM)
+		zynq_fpga_write(priv, CTRL_OFFSET,
+				(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
+				 | CTRL_PCAP_RATE_EN_MASK | ctrl));
+	else
+		zynq_fpga_write(priv, CTRL_OFFSET,
+				(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
+				 | ctrl));
+
 
 	/* We expect that the command queue is empty right now. */
 	status = zynq_fpga_read(priv, STATUS_OFFSET);
-- 
2.7.4

Re: [PATCH v2 2/3] fpga: zynq: Add support for encrypted bitstreams

[Michal Simek]

On 20.2.2017 21:55, mdf@kernel.org wrote:
> From: Moritz Fischer <mdf@kernel.org>
> 
> Add support for encrypted bitstreams. For this to work the system
> must be booted in secure mode.
> 
> In order for on-the-fly decryption to work, the PCAP clock rate
> needs to be lowered via the PCAP_RATE_EN bit.
> 
> Signed-off-by: Moritz Fischer <mdf@kernel.org>
> Cc: Alan Tull <atull@kernel.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-fpga@vger.kernel.org
> ---
> 
> Changes from v1:
> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
> 
> ---
>  drivers/fpga/zynq-fpga.c | 28 +++++++++++++++++++++++++---
>  1 file changed, 25 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
> index 34cb981..70b15b3 100644
> --- a/drivers/fpga/zynq-fpga.c
> +++ b/drivers/fpga/zynq-fpga.c
> @@ -72,6 +72,10 @@
>  #define CTRL_PCAP_PR_MASK		BIT(27)
>  /* Enable PCAP */
>  #define CTRL_PCAP_MODE_MASK		BIT(26)
> +/* Lower rate to allow decrypt on the fly */
> +#define CTRL_PCAP_RATE_EN_MASK		BIT(25)
> +/* System booted in secure mode */
> +#define CTRL_SEC_EN_MASK		BIT(7)
>  
>  /* Miscellaneous Control Register bit definitions */
>  /* Internal PCAP loopback */
> @@ -266,6 +270,17 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
>  	if (err)
>  		return err;
>  
> +	/* check if bitstream is encrypted & and system's still secure */
> +	if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM) {
> +		ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
> +		if (!(ctrl & CTRL_SEC_EN_MASK)) {
> +			dev_err(&mgr->dev,
> +				"System not secure, can't use crypted bitstreams\n");
> +			err = -EINVAL;
> +			goto out_err;
> +		}
> +	}
> +
>  	/* don't globally reset PL if we're doing partial reconfig */
>  	if (!(info->flags & FPGA_MGR_PARTIAL_RECONFIG)) {
>  		if (!zynq_fpga_has_sync(buf, count)) {
> @@ -337,12 +352,19 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
>  
>  	/* set configuration register with following options:
>  	 * - enable PCAP interface
> -	 * - set throughput for maximum speed
> +	 * - set throughput for maximum speed (if bistream not crypted)
>  	 * - set CPU in user mode
>  	 */
>  	ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
> -	zynq_fpga_write(priv, CTRL_OFFSET,
> -			(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK | ctrl));
> +	if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM)
> +		zynq_fpga_write(priv, CTRL_OFFSET,
> +				(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
> +				 | CTRL_PCAP_RATE_EN_MASK | ctrl));
> +	else
> +		zynq_fpga_write(priv, CTRL_OFFSET,
> +				(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
> +				 | ctrl));
> +
>  
>  	/* We expect that the command queue is empty right now. */
>  	status = zynq_fpga_read(priv, STATUS_OFFSET);
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v2 2/3] fpga: zynq: Add support for encrypted bitstreams

[Michal Simek]

On 20.2.2017 21:55, mdf@kernel.org wrote:
> From: Moritz Fischer <mdf@kernel.org>
> 
> Add support for encrypted bitstreams. For this to work the system
> must be booted in secure mode.
> 
> In order for on-the-fly decryption to work, the PCAP clock rate
> needs to be lowered via the PCAP_RATE_EN bit.
> 
> Signed-off-by: Moritz Fischer <mdf@kernel.org>
> Cc: Alan Tull <atull@kernel.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-fpga@vger.kernel.org
> ---
> 
> Changes from v1:
> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
> 
> ---
>  drivers/fpga/zynq-fpga.c | 28 +++++++++++++++++++++++++---
>  1 file changed, 25 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
> index 34cb981..70b15b3 100644
> --- a/drivers/fpga/zynq-fpga.c
> +++ b/drivers/fpga/zynq-fpga.c
> @@ -72,6 +72,10 @@
>  #define CTRL_PCAP_PR_MASK		BIT(27)
>  /* Enable PCAP */
>  #define CTRL_PCAP_MODE_MASK		BIT(26)
> +/* Lower rate to allow decrypt on the fly */
> +#define CTRL_PCAP_RATE_EN_MASK		BIT(25)
> +/* System booted in secure mode */
> +#define CTRL_SEC_EN_MASK		BIT(7)
>  
>  /* Miscellaneous Control Register bit definitions */
>  /* Internal PCAP loopback */
> @@ -266,6 +270,17 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
>  	if (err)
>  		return err;
>  
> +	/* check if bitstream is encrypted & and system's still secure */
> +	if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM) {
> +		ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
> +		if (!(ctrl & CTRL_SEC_EN_MASK)) {
> +			dev_err(&mgr->dev,
> +				"System not secure, can't use crypted bitstreams\n");
> +			err = -EINVAL;
> +			goto out_err;
> +		}
> +	}
> +
>  	/* don't globally reset PL if we're doing partial reconfig */
>  	if (!(info->flags & FPGA_MGR_PARTIAL_RECONFIG)) {
>  		if (!zynq_fpga_has_sync(buf, count)) {
> @@ -337,12 +352,19 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
>  
>  	/* set configuration register with following options:
>  	 * - enable PCAP interface
> -	 * - set throughput for maximum speed
> +	 * - set throughput for maximum speed (if bistream not crypted)
>  	 * - set CPU in user mode
>  	 */
>  	ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
> -	zynq_fpga_write(priv, CTRL_OFFSET,
> -			(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK | ctrl));
> +	if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM)
> +		zynq_fpga_write(priv, CTRL_OFFSET,
> +				(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
> +				 | CTRL_PCAP_RATE_EN_MASK | ctrl));
> +	else
> +		zynq_fpga_write(priv, CTRL_OFFSET,
> +				(CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
> +				 | ctrl));
> +
>  
>  	/* We expect that the command queue is empty right now. */
>  	status = zynq_fpga_read(priv, STATUS_OFFSET);
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v2 2/3] fpga: zynq: Add support for encrypted bitstreams

[Alan Tull]

On Tue, Feb 21, 2017 at 7:55 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 20.2.2017 21:55, mdf@kernel.org wrote:
>> From: Moritz Fischer <mdf@kernel.org>
>>
>> Add support for encrypted bitstreams. For this to work the system
>> must be booted in secure mode.
>>
>> In order for on-the-fly decryption to work, the PCAP clock rate
>> needs to be lowered via the PCAP_RATE_EN bit.
>>
>> Signed-off-by: Moritz Fischer <mdf@kernel.org>
>> Cc: Alan Tull <atull@kernel.org>
>> Cc: Michal Simek <michal.simek@xilinx.com>
>> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
>> Cc: linux-kernel@vger.kernel.org
>> Cc: linux-fpga@vger.kernel.org
>> ---
>>
>> Changes from v1:
>> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
>>
>> ---
>>  drivers/fpga/zynq-fpga.c | 28 +++++++++++++++++++++++++---
>>  1 file changed, 25 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
>> index 34cb981..70b15b3 100644
>> --- a/drivers/fpga/zynq-fpga.c
>> +++ b/drivers/fpga/zynq-fpga.c
>> @@ -72,6 +72,10 @@
>>  #define CTRL_PCAP_PR_MASK            BIT(27)
>>  /* Enable PCAP */
>>  #define CTRL_PCAP_MODE_MASK          BIT(26)
>> +/* Lower rate to allow decrypt on the fly */
>> +#define CTRL_PCAP_RATE_EN_MASK               BIT(25)
>> +/* System booted in secure mode */
>> +#define CTRL_SEC_EN_MASK             BIT(7)
>>
>>  /* Miscellaneous Control Register bit definitions */
>>  /* Internal PCAP loopback */
>> @@ -266,6 +270,17 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
>>       if (err)
>>               return err;
>>
>> +     /* check if bitstream is encrypted & and system's still secure */
>> +     if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM) {
>> +             ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
>> +             if (!(ctrl & CTRL_SEC_EN_MASK)) {
>> +                     dev_err(&mgr->dev,
>> +                             "System not secure, can't use crypted bitstreams\n");
>> +                     err = -EINVAL;
>> +                     goto out_err;
>> +             }
>> +     }
>> +
>>       /* don't globally reset PL if we're doing partial reconfig */
>>       if (!(info->flags & FPGA_MGR_PARTIAL_RECONFIG)) {
>>               if (!zynq_fpga_has_sync(buf, count)) {
>> @@ -337,12 +352,19 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
>>
>>       /* set configuration register with following options:
>>        * - enable PCAP interface
>> -      * - set throughput for maximum speed
>> +      * - set throughput for maximum speed (if bistream not crypted)
>>        * - set CPU in user mode
>>        */
>>       ctrl = zynq_fpga_read(priv, CTRL_OFFSET);
>> -     zynq_fpga_write(priv, CTRL_OFFSET,
>> -                     (CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK | ctrl));
>> +     if (info->flags & FPGA_MGR_ENCRYPTED_BITSTREAM)
>> +             zynq_fpga_write(priv, CTRL_OFFSET,
>> +                             (CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
>> +                              | CTRL_PCAP_RATE_EN_MASK | ctrl));
>> +     else
>> +             zynq_fpga_write(priv, CTRL_OFFSET,
>> +                             (CTRL_PCAP_PR_MASK | CTRL_PCAP_MODE_MASK
>> +                              | ctrl));
>> +
>>
>>       /* We expect that the command queue is empty right now. */
>>       status = zynq_fpga_read(priv, STATUS_OFFSET);
>>
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>

Acked-by: Alan Tull <atull@kernel.org>

>
> Thanks,
> Michal
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fpga" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 3/3] fpga: region: Add fpga-region property 'encrypted-fpga-config'

[mdf]

From: Moritz Fischer <mdf@kernel.org>

Add fpga-region property to allow passing the fact that the bitstream is
encrypted to the fpga-region and ultimately to the low-level driver.

Signed-off-by: Moritz Fischer <mdf@kernel.org>
Cc: Alan Tull <atull@kernel.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-fpga@vger.kernel.org
---
 Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 +
 drivers/fpga/fpga-region.c                             | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
index 3b32ba1..81bf3ad 100644
--- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
+++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
@@ -186,6 +186,7 @@ Optional properties:
 	otherwise full reconfiguration is done.
 - external-fpga-config : boolean, set if the FPGA has already been configured
 	prior to OS boot up.
+- encrypted-fpga-config : boolean, set if the bitstream is encrypted
 - region-unfreeze-timeout-us : The maximum time in microseconds to wait for
 	bridges to successfully become enabled after the region has been
 	programmed.
diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 3222fdb..2fe2a52 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -337,8 +337,9 @@ static int child_regions_with_firmware(struct device_node *overlay)
  * The overlay must add either firmware-name or external-fpga-config property
  * to the FPGA Region.
  *
- *   firmware-name        : program the FPGA
- *   external-fpga-config : FPGA is already programmed
+ *   firmware-name         : program the FPGA
+ *   external-fpga-config  : FPGA is already programmed
+ *   encrypted-fpga-config : FPGA bitstream is encrypted
  *
  * The overlay can add other FPGA regions, but child FPGA regions cannot have a
  * firmware-name property since those regions don't exist yet.
@@ -373,6 +374,9 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
 	if (of_property_read_bool(nd->overlay, "external-fpga-config"))
 		info->flags |= FPGA_MGR_EXTERNAL_CONFIG;
 
+	if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
+		info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
+
 	of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
 
 	of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",
-- 
2.7.4

Re: [PATCH v2 3/3] fpga: region: Add fpga-region property 'encrypted-fpga-config'

[Michal Simek]

On 20.2.2017 21:55, mdf@kernel.org wrote:
> From: Moritz Fischer <mdf@kernel.org>
> 
> Add fpga-region property to allow passing the fact that the bitstream is
> encrypted to the fpga-region and ultimately to the low-level driver.
> 
> Signed-off-by: Moritz Fischer <mdf@kernel.org>
> Cc: Alan Tull <atull@kernel.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-fpga@vger.kernel.org
> ---
>  Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 +
>  drivers/fpga/fpga-region.c                             | 8 ++++++--
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
> index 3b32ba1..81bf3ad 100644
> --- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
> +++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
> @@ -186,6 +186,7 @@ Optional properties:
>  	otherwise full reconfiguration is done.
>  - external-fpga-config : boolean, set if the FPGA has already been configured
>  	prior to OS boot up.
> +- encrypted-fpga-config : boolean, set if the bitstream is encrypted
>  - region-unfreeze-timeout-us : The maximum time in microseconds to wait for
>  	bridges to successfully become enabled after the region has been
>  	programmed.
> diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
> index 3222fdb..2fe2a52 100644
> --- a/drivers/fpga/fpga-region.c
> +++ b/drivers/fpga/fpga-region.c
> @@ -337,8 +337,9 @@ static int child_regions_with_firmware(struct device_node *overlay)
>   * The overlay must add either firmware-name or external-fpga-config property
>   * to the FPGA Region.
>   *
> - *   firmware-name        : program the FPGA
> - *   external-fpga-config : FPGA is already programmed
> + *   firmware-name         : program the FPGA
> + *   external-fpga-config  : FPGA is already programmed
> + *   encrypted-fpga-config : FPGA bitstream is encrypted
>   *
>   * The overlay can add other FPGA regions, but child FPGA regions cannot have a
>   * firmware-name property since those regions don't exist yet.
> @@ -373,6 +374,9 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
>  	if (of_property_read_bool(nd->overlay, "external-fpga-config"))
>  		info->flags |= FPGA_MGR_EXTERNAL_CONFIG;
>  
> +	if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
> +		info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
> +
>  	of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
>  
>  	of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v2 3/3] fpga: region: Add fpga-region property 'encrypted-fpga-config'

[Michal Simek]

On 20.2.2017 21:55, mdf@kernel.org wrote:
> From: Moritz Fischer <mdf@kernel.org>
> 
> Add fpga-region property to allow passing the fact that the bitstream is
> encrypted to the fpga-region and ultimately to the low-level driver.
> 
> Signed-off-by: Moritz Fischer <mdf@kernel.org>
> Cc: Alan Tull <atull@kernel.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-fpga@vger.kernel.org
> ---
>  Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 +
>  drivers/fpga/fpga-region.c                             | 8 ++++++--
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
> index 3b32ba1..81bf3ad 100644
> --- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
> +++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
> @@ -186,6 +186,7 @@ Optional properties:
>  	otherwise full reconfiguration is done.
>  - external-fpga-config : boolean, set if the FPGA has already been configured
>  	prior to OS boot up.
> +- encrypted-fpga-config : boolean, set if the bitstream is encrypted
>  - region-unfreeze-timeout-us : The maximum time in microseconds to wait for
>  	bridges to successfully become enabled after the region has been
>  	programmed.
> diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
> index 3222fdb..2fe2a52 100644
> --- a/drivers/fpga/fpga-region.c
> +++ b/drivers/fpga/fpga-region.c
> @@ -337,8 +337,9 @@ static int child_regions_with_firmware(struct device_node *overlay)
>   * The overlay must add either firmware-name or external-fpga-config property
>   * to the FPGA Region.
>   *
> - *   firmware-name        : program the FPGA
> - *   external-fpga-config : FPGA is already programmed
> + *   firmware-name         : program the FPGA
> + *   external-fpga-config  : FPGA is already programmed
> + *   encrypted-fpga-config : FPGA bitstream is encrypted
>   *
>   * The overlay can add other FPGA regions, but child FPGA regions cannot have a
>   * firmware-name property since those regions don't exist yet.
> @@ -373,6 +374,9 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
>  	if (of_property_read_bool(nd->overlay, "external-fpga-config"))
>  		info->flags |= FPGA_MGR_EXTERNAL_CONFIG;
>  
> +	if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
> +		info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
> +
>  	of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
>  
>  	of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v2 3/3] fpga: region: Add fpga-region property 'encrypted-fpga-config'

[Alan Tull]

On Tue, Feb 21, 2017 at 7:55 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 20.2.2017 21:55, mdf@kernel.org wrote:
>> From: Moritz Fischer <mdf@kernel.org>
>>
>> Add fpga-region property to allow passing the fact that the bitstream is
>> encrypted to the fpga-region and ultimately to the low-level driver.
>>
>> Signed-off-by: Moritz Fischer <mdf@kernel.org>
>> Cc: Alan Tull <atull@kernel.org>
>> Cc: Michal Simek <michal.simek@xilinx.com>
>> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
>> Cc: linux-kernel@vger.kernel.org
>> Cc: linux-fpga@vger.kernel.org
>> ---
>>  Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 +
>>  drivers/fpga/fpga-region.c                             | 8 ++++++--
>>  2 files changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
>> index 3b32ba1..81bf3ad 100644
>> --- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
>> +++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
>> @@ -186,6 +186,7 @@ Optional properties:
>>       otherwise full reconfiguration is done.
>>  - external-fpga-config : boolean, set if the FPGA has already been configured
>>       prior to OS boot up.
>> +- encrypted-fpga-config : boolean, set if the bitstream is encrypted
>>  - region-unfreeze-timeout-us : The maximum time in microseconds to wait for
>>       bridges to successfully become enabled after the region has been
>>       programmed.
>> diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
>> index 3222fdb..2fe2a52 100644
>> --- a/drivers/fpga/fpga-region.c
>> +++ b/drivers/fpga/fpga-region.c
>> @@ -337,8 +337,9 @@ static int child_regions_with_firmware(struct device_node *overlay)
>>   * The overlay must add either firmware-name or external-fpga-config property
>>   * to the FPGA Region.
>>   *
>> - *   firmware-name        : program the FPGA
>> - *   external-fpga-config : FPGA is already programmed
>> + *   firmware-name         : program the FPGA
>> + *   external-fpga-config  : FPGA is already programmed
>> + *   encrypted-fpga-config : FPGA bitstream is encrypted
>>   *
>>   * The overlay can add other FPGA regions, but child FPGA regions cannot have a
>>   * firmware-name property since those regions don't exist yet.
>> @@ -373,6 +374,9 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
>>       if (of_property_read_bool(nd->overlay, "external-fpga-config"))
>>               info->flags |= FPGA_MGR_EXTERNAL_CONFIG;
>>
>> +     if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
>> +             info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
>> +
>>       of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
>>
>>       of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",
>>
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>

Acked-by: Alan Tull <atull@kernel.org>

>
> Thanks,
> Michal
>

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Michal Simek]

On 20.2.2017 21:55, mdf@kernel.org wrote:
> From: Moritz Fischer <mdf@kernel.org>
> 
> Add a flag that is passed to the write_init() callback, indicating
> that the bitstream is encrypted.
> 
> The low-level driver will deal with the flag, or return an error,
> if encrypted bitstreams are not supported.
> 
> Signed-off-by: Moritz Fischer <mdf@kernel.org>
> Cc: Alan Tull <atull@kernel.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-fpga@vger.kernel.org
> ---
> 
> Changes from v1:
> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
> 
> ---
>  include/linux/fpga/fpga-mgr.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
> index 57beb5d..e2ef94f 100644
> --- a/include/linux/fpga/fpga-mgr.h
> +++ b/include/linux/fpga/fpga-mgr.h
> @@ -70,6 +70,7 @@ enum fpga_mgr_states {
>   */
>  #define FPGA_MGR_PARTIAL_RECONFIG	BIT(0)
>  #define FPGA_MGR_EXTERNAL_CONFIG	BIT(1)
> +#define FPGA_MGR_ENCRYPTED_BITSTREAM	BIT(2)
>  
>  /**
>   * struct fpga_image_info - information specific to a FPGA image
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Michal Simek]

On 20.2.2017 21:55, mdf@kernel.org wrote:
> From: Moritz Fischer <mdf@kernel.org>
> 
> Add a flag that is passed to the write_init() callback, indicating
> that the bitstream is encrypted.
> 
> The low-level driver will deal with the flag, or return an error,
> if encrypted bitstreams are not supported.
> 
> Signed-off-by: Moritz Fischer <mdf@kernel.org>
> Cc: Alan Tull <atull@kernel.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-fpga@vger.kernel.org
> ---
> 
> Changes from v1:
> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
> 
> ---
>  include/linux/fpga/fpga-mgr.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
> index 57beb5d..e2ef94f 100644
> --- a/include/linux/fpga/fpga-mgr.h
> +++ b/include/linux/fpga/fpga-mgr.h
> @@ -70,6 +70,7 @@ enum fpga_mgr_states {
>   */
>  #define FPGA_MGR_PARTIAL_RECONFIG	BIT(0)
>  #define FPGA_MGR_EXTERNAL_CONFIG	BIT(1)
> +#define FPGA_MGR_ENCRYPTED_BITSTREAM	BIT(2)
>  
>  /**
>   * struct fpga_image_info - information specific to a FPGA image
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Alan Tull]

On Tue, Feb 21, 2017 at 7:55 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 20.2.2017 21:55, mdf@kernel.org wrote:
>> From: Moritz Fischer <mdf@kernel.org>
>>
>> Add a flag that is passed to the write_init() callback, indicating
>> that the bitstream is encrypted.
>>
>> The low-level driver will deal with the flag, or return an error,
>> if encrypted bitstreams are not supported.
>>
>> Signed-off-by: Moritz Fischer <mdf@kernel.org>
>> Cc: Alan Tull <atull@kernel.org>
>> Cc: Michal Simek <michal.simek@xilinx.com>
>> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
>> Cc: linux-kernel@vger.kernel.org
>> Cc: linux-fpga@vger.kernel.org
>> ---
>>
>> Changes from v1:
>> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
>>
>> ---
>>  include/linux/fpga/fpga-mgr.h | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
>> index 57beb5d..e2ef94f 100644
>> --- a/include/linux/fpga/fpga-mgr.h
>> +++ b/include/linux/fpga/fpga-mgr.h
>> @@ -70,6 +70,7 @@ enum fpga_mgr_states {
>>   */
>>  #define FPGA_MGR_PARTIAL_RECONFIG    BIT(0)
>>  #define FPGA_MGR_EXTERNAL_CONFIG     BIT(1)
>> +#define FPGA_MGR_ENCRYPTED_BITSTREAM BIT(2)
>>
>>  /**
>>   * struct fpga_image_info - information specific to a FPGA image
>>
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>

Acked-by: Alan Tull <atull@kernel.org>

>
> Thanks,
> Michal
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fpga" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Alan Tull]

On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>

Hi Greg,

Would it be helpful for us to resend patches for you to take with you
on cc?  Or is it enough that they are on lkml?

Thanks,
Alan Tull

wrote:
> On Tue, Feb 21, 2017 at 7:55 AM, Michal Simek <michal.simek@xilinx.com> wrote:
>> On 20.2.2017 21:55, mdf@kernel.org wrote:
>>> From: Moritz Fischer <mdf@kernel.org>
>>>
>>> Add a flag that is passed to the write_init() callback, indicating
>>> that the bitstream is encrypted.
>>>
>>> The low-level driver will deal with the flag, or return an error,
>>> if encrypted bitstreams are not supported.
>>>
>>> Signed-off-by: Moritz Fischer <mdf@kernel.org>
>>> Cc: Alan Tull <atull@kernel.org>
>>> Cc: Michal Simek <michal.simek@xilinx.com>
>>> Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
>>> Cc: linux-kernel@vger.kernel.org
>>> Cc: linux-fpga@vger.kernel.org
>>> ---
>>>
>>> Changes from v1:
>>> - Renamed flag from FPGA_MGR_DECRYPT_BITSTREAM->FPGA_MGR_ENCRYPTED_BITSTREAM
>>>
>>> ---
>>>  include/linux/fpga/fpga-mgr.h | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
>>> index 57beb5d..e2ef94f 100644
>>> --- a/include/linux/fpga/fpga-mgr.h
>>> +++ b/include/linux/fpga/fpga-mgr.h
>>> @@ -70,6 +70,7 @@ enum fpga_mgr_states {
>>>   */
>>>  #define FPGA_MGR_PARTIAL_RECONFIG    BIT(0)
>>>  #define FPGA_MGR_EXTERNAL_CONFIG     BIT(1)
>>> +#define FPGA_MGR_ENCRYPTED_BITSTREAM BIT(2)
>>>
>>>  /**
>>>   * struct fpga_image_info - information specific to a FPGA image
>>>
>>
>> Acked-by: Michal Simek <michal.simek@xilinx.com>
>
> Acked-by: Alan Tull <atull@kernel.org>
>
>>
>> Thanks,
>> Michal
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-fpga" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Michal Simek]

On 21.2.2017 19:26, Alan Tull wrote:
> On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>
> 
> Hi Greg,
> 
> Would it be helpful for us to resend patches for you to take with you
> on cc?  Or is it enough that they are on lkml?

Can I know the reason for this? I know that there were some discussion
in past. But just add them to your linux-fpga.git repo and send pull
request to Greg and proper time when he expects that.

Thanks,
Michal

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Alan Tull]

On Tue, Feb 21, 2017 at 12:36 PM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 21.2.2017 19:26, Alan Tull wrote:
>> On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>
>>
>> Hi Greg,
>>
>> Would it be helpful for us to resend patches for you to take with you
>> on cc?  Or is it enough that they are on lkml?
>
> Can I know the reason for this? I know that there were some discussion
> in past. But just add them to your linux-fpga.git repo and send pull
> request to Greg and proper time when he expects that.
>

Greg said it was easier for him to take them from email.

Alan

> Thanks,
> Michal
>

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Greg Kroah-Hartman]

On Tue, Feb 21, 2017 at 12:26:17PM -0600, Alan Tull wrote:
> On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>
> 
> Hi Greg,
> 
> Would it be helpful for us to resend patches for you to take with you
> on cc?  Or is it enough that they are on lkml?

Yes, please send patches with your signed-off-by: for what I should
take.

thanks,

greg k-h

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Michal Simek]

On 22.2.2017 08:15, Greg Kroah-Hartman wrote:
> On Tue, Feb 21, 2017 at 12:26:17PM -0600, Alan Tull wrote:
>> On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>
>>
>> Hi Greg,
>>
>> Would it be helpful for us to resend patches for you to take with you
>> on cc?  Or is it enough that they are on lkml?
> 
> Yes, please send patches with your signed-off-by: for what I should
> take.

Does it make sense to have git repo in MAINTAINERS file then?

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git

Thanks,
Michal

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Greg Kroah-Hartman]

On Wed, Feb 22, 2017 at 09:22:19AM +0100, Michal Simek wrote:
> On 22.2.2017 08:15, Greg Kroah-Hartman wrote:
> > On Tue, Feb 21, 2017 at 12:26:17PM -0600, Alan Tull wrote:
> >> On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>
> >>
> >> Hi Greg,
> >>
> >> Would it be helpful for us to resend patches for you to take with you
> >> on cc?  Or is it enough that they are on lkml?
> > 
> > Yes, please send patches with your signed-off-by: for what I should
> > take.
> 
> Does it make sense to have git repo in MAINTAINERS file then?
> 
> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git

Why not, that doesn't mean that's where they get pulled from, but
rather, where the latest version of the patches can be found at.

thanks,

greg k-h

Re: [PATCH v2 1/3] fpga: Add flag to indicate bitstream needs decrypting

[Michal Simek]

On 22.2.2017 14:04, Greg Kroah-Hartman wrote:
> On Wed, Feb 22, 2017 at 09:22:19AM +0100, Michal Simek wrote:
>> On 22.2.2017 08:15, Greg Kroah-Hartman wrote:
>>> On Tue, Feb 21, 2017 at 12:26:17PM -0600, Alan Tull wrote:
>>>> On Tue, Feb 21, 2017 at 10:35 AM, Alan Tull <delicious.quinoa@gmail.com>
>>>>
>>>> Hi Greg,
>>>>
>>>> Would it be helpful for us to resend patches for you to take with you
>>>> on cc?  Or is it enough that they are on lkml?
>>>
>>> Yes, please send patches with your signed-off-by: for what I should
>>> take.
>>
>> Does it make sense to have git repo in MAINTAINERS file then?
>>
>> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
> 
> Why not, that doesn't mean that's where they get pulled from, but
> rather, where the latest version of the patches can be found at.

ok.

Thanks,
Michal