Skip to contentSkip to conversation

Extend Intel service layer, FPGA manager and region

PATCH Superseded [email protected] 3 participants 17 messages Nov 18, 2020 – Dec 14, 2020

Subsystems (3)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover Extend Intel service layer, FPGA manager and region

From: Richard Gong <[email protected]>

This is 2nd submission of Intel service layer and FPGA patches.

The customer wants to verify that a FPGA bitstream can be started properly before saving the bitstream to the QSPI flash memory.

Bitstream authentication makes sure a signed bitstream has valid signatures.

The customer sends the bitstream via FPGA framework and overlay, the firmware will authenticate the bitstream but not program the bitstream to device. If the authentication passes, the bitstream will be programmed into QSPI flash and will be expected to boot without issues.

Extend Intel service layer, FPGA manager and region drivers to support the bitstream authentication feature.

Richard Gong (5):
firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag
fpga: fpga-mgr: add FPGA_MGR_BITSTREM_AUTHENTICATION flag
fpga: of-fpga-region: add authenticate-fpga-config property
dt-bindings: fpga: add authenticate-fpga-config property
fpga: stratix10-soc: entend driver for bitstream authentication

 Documentation/devicetree/bindings/fpga/fpga-region.txt |  1 +
 drivers/fpga/of-fpga-region.c                          |  3 +++
 drivers/fpga/stratix10-soc.c                           |  3 +++
 include/linux/firmware/intel/stratix10-svc-client.h    | 11 ++++++++---
 include/linux/fpga/fpga-mgr.h                          | 13 ++++++++-----
 5 files changed, 23 insertions(+), 8 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/5 firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

From: Richard Gong <[email protected]>

Add COMMAND_AUTHENTICATE_BITSTREAM command flag for new added bitstream authentication feature. Authenticating a bistream is to make sure a signed bitstream has the valid signatures.

Except for the actual configuration of the device, the bitstream authentication works the same way as FPGA configuration does. If the authentication passes, the signed bitstream will be programmed into QSPI flash memory and will be expected to boot without issues.

Clean up COMMAND_RECONFIG_FLAG_PARTIAL flag by resetting it to 0, which aligns with the firmware settings.

---
v2: new added

---
 include/linux/firmware/intel/stratix10-svc-client.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
include/linux/firmware/intel/stratix10-svc-client.h +8 -3
index a93d859..85463c8 100644
@@ -51,12 +51,17 @@
 #define SVC_STATUS_NO_SUPPORT		6
 
 /**
- * Flag bit for COMMAND_RECONFIG
+ * Flag bit for COMMAND_RECONFIG, in bit number
  *
  * COMMAND_RECONFIG_FLAG_PARTIAL:
- * Set to FPGA configuration type (full or partial).
+ * Set for partial FPGA configuration.
+ *
+ * COMMAND_AUTHENTICATE_BITSTREAM:
+ * Set for bitstream authentication, which makes sure a signed bitstream
+ * has valid signatures before committing it to QSPI flash memory.
  */
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1
 
 /**
  * Timeout settings for service clients:
Signature · 1 line
2.7.4
maintainer
#2 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Quoted 6 lines · On Wed, Nov 18, 2020 at 08:29:09AM -0600, [email protected] wrote:

From: Richard Gong <[email protected]>

Add COMMAND_AUTHENTICATE_BITSTREAM command flag for new added bitstream authentication feature. Authenticating a bistream is to make sure a signed bitstream has the valid signatures.

Quoted 7 lines

Except for the actual configuration of the device, the bitstream authentication works the same way as FPGA configuration does. If the authentication passes, the signed bitstream will be programmed into QSPI flash memory and will be expected to boot without issues.

Clean up COMMAND_RECONFIG_FLAG_PARTIAL flag by resetting it to 0, which aligns with the firmware settings.

Should this be down with the v2: ?

Quoted 20 lines

---
v2: new added

---
 include/linux/firmware/intel/stratix10-svc-client.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
include/linux/firmware/intel/stratix10-svc-client.h +1 -1
index a93d859..85463c8 100644
@@ -51,12 +51,17 @@
 #define SVC_STATUS_NO_SUPPORT		6
 
 /**
- * Flag bit for COMMAND_RECONFIG
+ * Flag bit for COMMAND_RECONFIG, in bit number
  *
  * COMMAND_RECONFIG_FLAG_PARTIAL:

include/linux/firmware/intel/stratix10-svc-client.h line 64

Quoted 10 lines
include/linux/firmware/intel/stratix10-svc-client.h +7 -2
- * Set to FPGA configuration type (full or partial).
+ * Set for partial FPGA configuration.
+ *
+ * COMMAND_AUTHENTICATE_BITSTREAM:
+ * Set for bitstream authentication, which makes sure a signed bitstream
+ * has valid signatures before committing it to QSPI flash memory.
  */
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1

Can you explain how this commit by itself doesn't break things?

Before this change firmware expected BIT(0) to be set for partial reconfiguration, now BIT(0) suddenly means authentication? How doest his work? :)

Was there a firmware version change? Did this never work before?

If this is version depenedent for firmware, then this might need a different compatible string / id / some form of probing?

Entirely possible that I'm missing something, but it doesn't *seem* right.

Quoted 6 lines
include/linux/firmware/intel/stratix10-svc-client.h +0 -0
 /**
  * Timeout settings for service clients:
Signature · 1 line
2.7.4

Cheers,
Moritz

#3 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Hi Moritz,

Quoted 12 lines · Moritz Fischer
Quoted 11 lines · On Wed, Nov 18, 2020 at 08:29:09AM -0600, [email protected] wrote:

From: Richard Gong <[email protected]>

Add COMMAND_AUTHENTICATE_BITSTREAM command flag for new added bitstream authentication feature. Authenticating a bistream is to make sure a signed bitstream has the valid signatures.

Except for the actual configuration of the device, the bitstream authentication works the same way as FPGA configuration does. If the authentication passes, the signed bitstream will be programmed into QSPI flash memory and will be expected to boot without issues.

Quoted 4 lines
Quoted 2 lines

Clean up COMMAND_RECONFIG_FLAG_PARTIAL flag by resetting it to 0, which aligns with the firmware settings.

Should this be down with the v2: ?

I think the commit message should describe all the changes made in the patch, is it?

Quoted 36 lines
Quoted 20 lines

---
v2: new added

---
  include/linux/firmware/intel/stratix10-svc-client.h | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
include/linux/firmware/intel/stratix10-svc-client.h +1 -1
index a93d859..85463c8 100644
@@ -51,12 +51,17 @@
  #define SVC_STATUS_NO_SUPPORT		6
 
  /**
- * Flag bit for COMMAND_RECONFIG
+ * Flag bit for COMMAND_RECONFIG, in bit number
   *
   * COMMAND_RECONFIG_FLAG_PARTIAL:

include/linux/firmware/intel/stratix10-svc-client.h line 64

Quoted 10 lines
include/linux/firmware/intel/stratix10-svc-client.h +7 -2
- * Set to FPGA configuration type (full or partial).
+ * Set for partial FPGA configuration.
+ *
+ * COMMAND_AUTHENTICATE_BITSTREAM:
+ * Set for bitstream authentication, which makes sure a signed bitstream
+ * has valid signatures before committing it to QSPI flash memory.
   */
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1

Can you explain how this commit by itself doesn't break things?

Before this change firmware expected BIT(0) to be set for partial reconfiguration, now BIT(0) suddenly means authentication? How doest his work? :)

Quoted 8 lines
Quoted 1 line

Was there a firmware version change? Did this never work before?

If this is version depenedent for firmware, then this might need a different compatible string / id / some form of probing?

Entirely possible that I'm missing something, but it doesn't *seem* right.

Quoted 1 line

It did work before.

Before this change, firmware only checks if the received flag value is zero. If the value is zero, it preforms full reconfiguration. Otherwise it does partial reconfiguration.

To support bitstream authentication feature, firmware is updated to check the received flag value as below:
0 --- full reconfiguration
BIT(0) --- partial reconfiguration
BIT(1) --- bitstream authentication

Therefore I have updated the command flag setting at Intel service layer driver to align with firmware.

Regards,
Richard

Quoted 9 lines
Quoted 5 lines

/**
* Timeout settings for service clients:

Signature · 1 line
2.7.4

Cheers,
Moritz

maintainer
#4 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Richard,

Quoted 23 lines · Richard Gong
Quoted 9 lines

include/linux/firmware/intel/stratix10-svc-client.h line 64

Quoted 3 lines
include/linux/firmware/intel/stratix10-svc-client.h +2 -1
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1

Can you explain how this commit by itself doesn't break things?

Before this change firmware expected BIT(0) to be set for partial reconfiguration, now BIT(0) suddenly means authentication? How doest his work? :)

Quoted 7 lines
Quoted 1 line

Was there a firmware version change? Did this never work before?

If this is version depenedent for firmware, then this might need a different compatible string / id / some form of probing?

Entirely possible that I'm missing something, but it doesn't *seem* right.

It did work before.

Before this change, firmware only checks if the received flag value is zero. If the value is zero, it preforms full reconfiguration. Otherwise it does partial reconfiguration.

Quoted 5 lines

To support bitstream authentication feature, firmware is updated to check the received flag value as below:
0 --- full reconfiguration
BIT(0) --- partial reconfiguration
BIT(1) --- bitstream authentication

So there are two different versions of firmware involved that behave differently?

Old firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags != 0 -> Partial reconfig

New firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags = 0x1 -> Partial reconfig
- ctype.flags = 0x2 -> Authenticate

Old software:
- Send 0x0 for Full
- Send 0x1 for Partial

New software:
- Send 0x0 for Full
- Send 0x1 for Partial
- Send 0x2 for Auth

If I send request for authentication BIT(1) (new software) to old firmware it'd try and attempt a partial reconfiguration with the data I send? Is that safe?

Is there a way for software to figure out the firmware version and do the right thing?

Quoted 15 lines

Therefore I have updated the command flag setting at Intel service layer driver to align with firmware.

Regards,
Richard

Quoted 9 lines
Quoted 5 lines

/**
* Timeout settings for service clients:

Signature · 1 line
2.7.4

Cheers,
Moritz

Thanks,
Moritz

#5 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Hi Moritz,

Sorry for late reply, I was out last week.

Quoted 49 lines · Moritz Fischer

Richard,

Quoted 23 lines · Richard Gong
Quoted 9 lines

include/linux/firmware/intel/stratix10-svc-client.h line 64

Quoted 3 lines
include/linux/firmware/intel/stratix10-svc-client.h +2 -1
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1

Can you explain how this commit by itself doesn't break things?

Before this change firmware expected BIT(0) to be set for partial reconfiguration, now BIT(0) suddenly means authentication? How doest his work? :)

Quoted 7 lines
Quoted 1 line

Was there a firmware version change? Did this never work before?

If this is version depenedent for firmware, then this might need a different compatible string / id / some form of probing?

Entirely possible that I'm missing something, but it doesn't *seem* right.

It did work before.

Before this change, firmware only checks if the received flag value is zero. If the value is zero, it preforms full reconfiguration. Otherwise it does partial reconfiguration.

Quoted 5 lines

To support bitstream authentication feature, firmware is updated to check the received flag value as below:
0 --- full reconfiguration
BIT(0) --- partial reconfiguration
BIT(1) --- bitstream authentication

So there are two different versions of firmware involved that behave differently?

Old firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags != 0 -> Partial reconfig

New firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags = 0x1 -> Partial reconfig
- ctype.flags = 0x2 -> Authenticate

Old software:
- Send 0x0 for Full
- Send 0x1 for Partial

Quoted 9 lines

New software:
- Send 0x0 for Full
- Send 0x1 for Partial
- Send 0x2 for Auth

If I send request for authentication BIT(1) (new software) to old firmware it'd try and attempt a partial reconfiguration with the data I send? Is that safe?

Yes, it is possible and it is not safe. But we will inform our customers they should update to the latest firmware (SDM firmware and ATF) if they want to have authentication feature.

We are migrating boot loader boot flow to the new ATF boot flow, which is SDM firmware -> SPL -> ATF -> U-boot proper -> Linux. The new authentication feature is supported only in the new ATF boot flow. ATF communicates with SDM firmware via mailbox, and SDM firmware performs the actual full/partial reconfiguration and bitstream authentication. ATF sets up EL3 environment and initializes PSCI services.

The old boot flow is SDM firmware -> SPL -> U-boot proper -> Linux, which SPL/U-boot handles PSCI services and communicates with SDM firmware via mailbox. SDM firmware performs the actual full/partial reconfiguration.

ATF = Arm Trust Firmware, SDM = Secure Device Manager

Quoted 2 lines

Is there a way for software to figure out the firmware version and do the right thing?

It is not feasible for kernel driver to get the firmware version per current designs and implementations. I don't think there is other way around this.

Quoted 13 lines
Quoted 13 lines

Therefore I have updated the command flag setting at Intel service layer driver to align with firmware.

Regards,
Richard

Quoted 6 lines
Quoted 5 lines

/**
* Timeout settings for service clients:

Signature · 1 line
2.7.4
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines

Cheers,
Moritz

Thanks,
Moritz

Regards,
Richard

maintainer
#6 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Hi Richard,

Quoted 4 lines · Richard Gong

Hi Moritz,

Sorry for late reply, I was out last week.

No worries, usually I'm late with replies ;-)

Quoted 65 lines · Moritz Fischer
Quoted 49 lines

Richard,

Quoted 23 lines · Richard Gong
Quoted 9 lines

include/linux/firmware/intel/stratix10-svc-client.h line 64

Quoted 3 lines
include/linux/firmware/intel/stratix10-svc-client.h +2 -1
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1

Can you explain how this commit by itself doesn't break things?

Before this change firmware expected BIT(0) to be set for partial reconfiguration, now BIT(0) suddenly means authentication? How doest his work? :)

Quoted 7 lines
Quoted 1 line

Was there a firmware version change? Did this never work before?

If this is version depenedent for firmware, then this might need a different compatible string / id / some form of probing?

Entirely possible that I'm missing something, but it doesn't *seem* right.

It did work before.

Before this change, firmware only checks if the received flag value is zero. If the value is zero, it preforms full reconfiguration. Otherwise it does partial reconfiguration.

Quoted 5 lines

To support bitstream authentication feature, firmware is updated to check the received flag value as below:
0 --- full reconfiguration
BIT(0) --- partial reconfiguration
BIT(1) --- bitstream authentication

So there are two different versions of firmware involved that behave differently?

Old firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags != 0 -> Partial reconfig

New firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags = 0x1 -> Partial reconfig
- ctype.flags = 0x2 -> Authenticate

Old software:
- Send 0x0 for Full
- Send 0x1 for Partial

Quoted 9 lines

New software:
- Send 0x0 for Full
- Send 0x1 for Partial
- Send 0x2 for Auth

If I send request for authentication BIT(1) (new software) to old firmware it'd try and attempt a partial reconfiguration with the data I send? Is that safe?

Yes, it is possible and it is not safe. But we will inform our customers they should update to the latest firmware (SDM firmware and ATF) if they want to have authentication feature.

Quoted 6 lines

We are migrating boot loader boot flow to the new ATF boot flow, which is SDM firmware -> SPL -> ATF -> U-boot proper -> Linux. The new authentication feature is supported only in the new ATF boot flow. ATF communicates with SDM firmware via mailbox, and SDM firmware performs the actual full/partial reconfiguration and bitstream authentication. ATF sets up EL3 environment and initializes PSCI services.

Can U-Boot determine whether it's the new or old flow? Can you set a different compatible value in your device-tree, to disambiguate behaviors?

Quoted 29 lines

The old boot flow is SDM firmware -> SPL -> U-boot proper -> Linux, which SPL/U-boot handles PSCI services and communicates with SDM firmware via mailbox. SDM firmware performs the actual full/partial reconfiguration.

ATF = Arm Trust Firmware, SDM = Secure Device Manager

Quoted 2 lines

Is there a way for software to figure out the firmware version and do the right thing?

It is not feasible for kernel driver to get the firmware version per current designs and implementations. I don't think there is other way around this.

Quoted 17 lines
Quoted 16 lines

Therefore I have updated the command flag setting at Intel service layer driver to align with firmware.

Regards,
Richard

Quoted 9 lines
Quoted 5 lines

/**
* Timeout settings for service clients:

Signature · 1 line
2.7.4

Cheers,
Moritz

Quoted 5 lines
Quoted 3 lines

Thanks,
Moritz

Regards,
Richard

Thanks,
Moritz

#7 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Hi Moritz,

Quoted 81 lines · Moritz Fischer

Hi Richard,

Quoted 4 lines · Richard Gong

Hi Moritz,

Sorry for late reply, I was out last week.

No worries, usually I'm late with replies ;-)

Quoted 65 lines · Moritz Fischer
Quoted 49 lines

Richard,

Quoted 23 lines · Richard Gong
Quoted 9 lines

include/linux/firmware/intel/stratix10-svc-client.h line 64

Quoted 3 lines
include/linux/firmware/intel/stratix10-svc-client.h +2 -1
-#define COMMAND_RECONFIG_FLAG_PARTIAL	1
+#define COMMAND_RECONFIG_FLAG_PARTIAL	0
+#define COMMAND_AUTHENTICATE_BITSTREAM	1

Can you explain how this commit by itself doesn't break things?

Before this change firmware expected BIT(0) to be set for partial reconfiguration, now BIT(0) suddenly means authentication? How doest his work? :)

Quoted 7 lines
Quoted 1 line

Was there a firmware version change? Did this never work before?

If this is version depenedent for firmware, then this might need a different compatible string / id / some form of probing?

Entirely possible that I'm missing something, but it doesn't *seem* right.

It did work before.

Before this change, firmware only checks if the received flag value is zero. If the value is zero, it preforms full reconfiguration. Otherwise it does partial reconfiguration.

Quoted 5 lines

To support bitstream authentication feature, firmware is updated to check the received flag value as below:
0 --- full reconfiguration
BIT(0) --- partial reconfiguration
BIT(1) --- bitstream authentication

So there are two different versions of firmware involved that behave differently?

Old firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags != 0 -> Partial reconfig

New firmware:
- ctype.flags = 0x0 -> Full reconfig
- ctype.flags = 0x1 -> Partial reconfig
- ctype.flags = 0x2 -> Authenticate

Old software:
- Send 0x0 for Full
- Send 0x1 for Partial

Quoted 9 lines

New software:
- Send 0x0 for Full
- Send 0x1 for Partial
- Send 0x2 for Auth

If I send request for authentication BIT(1) (new software) to old firmware it'd try and attempt a partial reconfiguration with the data I send? Is that safe?

Yes, it is possible and it is not safe. But we will inform our customers they should update to the latest firmware (SDM firmware and ATF) if they want to have authentication feature.

Quoted 6 lines

We are migrating boot loader boot flow to the new ATF boot flow, which is SDM firmware -> SPL -> ATF -> U-boot proper -> Linux. The new authentication feature is supported only in the new ATF boot flow. ATF communicates with SDM firmware via mailbox, and SDM firmware performs the actual full/partial reconfiguration and bitstream authentication. ATF sets up EL3 environment and initializes PSCI services.

Quoted 4 lines

Can U-Boot determine whether it's the new or old flow? Can you set a different compatible value in your device-tree, to disambiguate behaviors?

The boot flow is determined by defconfig during compilation, which means each boot flow will have its own defconfig.

SDM firmware loads SPL into OCRAM, then SPL will load the apporiate ATF or U-boot into the DRAM according to the setting of CONFIG_SPL_ATF. If CONFIG_SPL_ATF=y, SPL loads ATF and then jumps to ATF. ATF setups EL3 environment and initialize the PSCI services.

CONFIG_SPL_ATF is not set for the old boot flow.

Quoted 29 lines
Quoted 29 lines

The old boot flow is SDM firmware -> SPL -> U-boot proper -> Linux, which SPL/U-boot handles PSCI services and communicates with SDM firmware via mailbox. SDM firmware performs the actual full/partial reconfiguration.

ATF = Arm Trust Firmware, SDM = Secure Device Manager

Quoted 2 lines

Is there a way for software to figure out the firmware version and do the right thing?

It is not feasible for kernel driver to get the firmware version per current designs and implementations. I don't think there is other way around this.

Quoted 17 lines
Quoted 16 lines

Therefore I have updated the command flag setting at Intel service layer driver to align with firmware.

Regards,
Richard

Quoted 9 lines
Quoted 5 lines

/**
* Timeout settings for service clients:

Signature · 1 line
2.7.4

Cheers,
Moritz

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

Thanks,
Moritz

Regards,
Richard

Thanks,
Moritz

Regards,
Richard

maintainer
#8 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Hi Richard,

Quoted 8 lines · Richard Gong
Quoted 4 lines

Can U-Boot determine whether it's the new or old flow? Can you set a different compatible value in your device-tree, to disambiguate behaviors?

The boot flow is determined by defconfig during compilation, which means each boot flow will have its own defconfig.

Quoted 6 lines

SDM firmware loads SPL into OCRAM, then SPL will load the apporiate ATF or U-boot into the DRAM according to the setting of CONFIG_SPL_ATF. If CONFIG_SPL_ATF=y, SPL loads ATF and then jumps to ATF. ATF setups EL3 environment and initialize the PSCI services.

CONFIG_SPL_ATF is not set for the old boot flow.

So you know at (U-Boot) build time? Can you just pass a different DT to the kernel in that case?

- Moritz

#9 lore raw

Re: [PATCHv2 1/5] firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag

Hi Moritz,

Quoted 17 lines · Moritz Fischer

Hi Richard,

Quoted 13 lines · Richard Gong
Quoted 4 lines

Can U-Boot determine whether it's the new or old flow? Can you set a different compatible value in your device-tree, to disambiguate behaviors?

The boot flow is determined by defconfig during compilation, which means each boot flow will have its own defconfig.

SDM firmware loads SPL into OCRAM, then SPL will load the apporiate ATF or U-boot into the DRAM according to the setting of CONFIG_SPL_ATF. If CONFIG_SPL_ATF=y, SPL loads ATF and then jumps to ATF. ATF setups EL3 environment and initialize the PSCI services.

Quoted 5 lines
Quoted 1 line

CONFIG_SPL_ATF is not set for the old boot flow.

So you know at (U-Boot) build time? Can you just pass a different DT to the kernel in that case?

Yes, we have decided the boot flow at build time. Starting from the next release, our U-boot will use the ATF boot flow.

Per my limited knowledge in U-boot, I don't think we can follow your suggestion. Or it will take a lot of efforts to achieve.

I think that back compatibility is your main concern, correct? the issue does exist with the old boot flow and old firmware, whenever the customers try to use authentication. Unfortunately we can't update U-boot or firmware that has been released.

The authentication feature is supported only at the ATF boot flow, updated kernel and firmware. We will have a well-documented document to inform our customers that if they want to have authentication feature, they need to upgrade the latest U-boot, kernel and firmware.

We always encourage our customers to take the latest U-boot, kernel and firmware releases in their developments.

Quoted 2 lines

- Moritz

Regards,
Richard

#10 lore raw

PATCH v2 2/5 fpga: fpga-mgr: add FPGA_MGR_BITSTREM_AUTHENTICATION flag

In reply to [email protected]

From: Richard Gong <[email protected]>

Add FPGA_MGR_BITSTREM_AUTHENTICATION flag for FPGA bitstream authentication, which makes sure a signed bitstream has valid signatures.

Except for the actual configuration of the device, the authentication works the same way as FPGA configuration does. If the authentication passes, the bitstream will be programmed into QSPI flash and will be expected to boot without issues.

---
v2: align all FPGA_MGR_* flags
update the commit messages

---
 include/linux/fpga/fpga-mgr.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
include/linux/fpga/fpga-mgr.h +8 -5
index 2bc3030..4fb3400 100644
@@ -67,12 +67,15 @@ enum fpga_mgr_states {
  * %FPGA_MGR_BITSTREAM_LSB_FIRST: SPI bitstream bit order is LSB first
  *
  * %FPGA_MGR_COMPRESSED_BITSTREAM: FPGA bitstream is compressed
+ *
+ * %FPGA_MGR_BITSTREM_AUTHENTICATION: do FPGA bitstream authentication only
  */
-#define FPGA_MGR_PARTIAL_RECONFIG	BIT(0)
-#define FPGA_MGR_EXTERNAL_CONFIG	BIT(1)
-#define FPGA_MGR_ENCRYPTED_BITSTREAM	BIT(2)
-#define FPGA_MGR_BITSTREAM_LSB_FIRST	BIT(3)
-#define FPGA_MGR_COMPRESSED_BITSTREAM	BIT(4)
+#define FPGA_MGR_PARTIAL_RECONFIG		BIT(0)
+#define FPGA_MGR_EXTERNAL_CONFIG		BIT(1)
+#define FPGA_MGR_ENCRYPTED_BITSTREAM		BIT(2)
+#define FPGA_MGR_BITSTREAM_LSB_FIRST		BIT(3)
+#define FPGA_MGR_COMPRESSED_BITSTREAM		BIT(4)
+#define FPGA_MGR_BITSTREM_AUTHENTICATION	BIT(5)
 
 /**
  * struct fpga_image_info - information specific to a FPGA image
Signature · 1 line
2.7.4
#11 lore raw

PATCH v2 3/5 fpga: of-fpga-region: add authenticate-fpga-config property

In reply to [email protected]

From: Richard Gong <[email protected]>

Add authenticate-fpga-config property to support FPGA bitstream authentication, which makes sure a signed bitstream has valid signatures.

---
v2: changed in alphabetical order

---
 drivers/fpga/of-fpga-region.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/fpga/of-fpga-region.c +3 -0
index e405309..3840883 100644
@@ -219,6 +219,9 @@ static struct fpga_image_info *of_fpga_region_parse_ov(
 	info->overlay = overlay;
 
 	/* Read FPGA region properties from the overlay */
+	if (of_property_read_bool(overlay, "authenticate-fpga-config"))
+		info->flags |= FPGA_MGR_BITSTREM_AUTHENTICATION;
+
 	if (of_property_read_bool(overlay, "partial-fpga-config"))
 		info->flags |= FPGA_MGR_PARTIAL_RECONFIG;
 
Signature · 1 line
2.7.4
#12 lore raw

PATCH v2 4/5 dt-bindings: fpga: add authenticate-fpga-config property

In reply to [email protected]

From: Richard Gong <[email protected]>

Add authenticate-fpga-config property for FPGA bitstream authentication, which makes sure a signed bitstream has valid signatures.

---
v2: put authenticate-fpga-config above partial-fpga-config
update commit messages

---
 Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/fpga/fpga-region.txt +1 -0
index e811cf8..d0d3234 100644
@@ -182,6 +182,7 @@ Optional properties:
 	This property is optional if the FPGA Manager handles the bridges.
         If the fpga-region is  the child of a fpga-bridge, the list should not
         contain the parent bridge.
+- authenticate-fpga-config : boolean, set if do bitstream authentication only.
 - partial-fpga-config : boolean, set if partial reconfiguration is to be done,
 	otherwise full reconfiguration is done.
 - external-fpga-config : boolean, set if the FPGA has already been configured
Signature · 1 line
2.7.4
#13 lore raw

PATCH v2 5/5 fpga: stratix10-soc: extend driver for bitstream authentication

In reply to [email protected]

From: Richard Gong <[email protected]>

Extend FPGA manager driver to support FPGA bitstream authentication on Intel SocFPGA platforms.

---
v2: use flag defined in stratix10-svc driver

---
 drivers/fpga/stratix10-soc.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/fpga/stratix10-soc.c +3 -0
index 657a70c..b77067e 100644
@@ -186,6 +186,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
 	if (info->flags & FPGA_MGR_PARTIAL_RECONFIG) {
 		dev_dbg(dev, "Requesting partial reconfiguration.\n");
 		ctype.flags |= BIT(COMMAND_RECONFIG_FLAG_PARTIAL);
+	} else if (info->flags & FPGA_MGR_BITSTREM_AUTHENTICATION) {
+		dev_dbg(dev, "Requesting bitstream authentication.\n");
+		ctype.flags |= BIT(COMMAND_AUTHENTICATE_BITSTREAM);
 	} else {
 		dev_dbg(dev, "Requesting full reconfiguration.\n");
 	}
Signature · 1 line
2.7.4
#14 lore raw
In reply to [email protected]

Hi Moritz, Greg,

Sorry for asking.

Any comment on Intel service layer and FPGA patches submitted on 11/18/20?

Regards,
Richard

Quoted 31 lines · On 11/18/20 8:29 AM, [email protected] wrote:

From: Richard Gong <[email protected]>

This is 2nd submission of Intel service layer and FPGA patches.

The customer wants to verify that a FPGA bitstream can be started properly before saving the bitstream to the QSPI flash memory.

Bitstream authentication makes sure a signed bitstream has valid signatures.

The customer sends the bitstream via FPGA framework and overlay, the firmware will authenticate the bitstream but not program the bitstream to device. If the authentication passes, the bitstream will be programmed into QSPI flash and will be expected to boot without issues.

Extend Intel service layer, FPGA manager and region drivers to support the bitstream authentication feature.

Richard Gong (5):
firmware: stratix10-svc: add COMMAND_AUTHENTICATE_BITSTREAM flag
fpga: fpga-mgr: add FPGA_MGR_BITSTREM_AUTHENTICATION flag
fpga: of-fpga-region: add authenticate-fpga-config property
dt-bindings: fpga: add authenticate-fpga-config property
fpga: stratix10-soc: entend driver for bitstream authentication

  Documentation/devicetree/bindings/fpga/fpga-region.txt |  1 +
  drivers/fpga/of-fpga-region.c                          |  3 +++
  drivers/fpga/stratix10-soc.c                           |  3 +++
  include/linux/firmware/intel/stratix10-svc-client.h    | 11 ++++++++---
  include/linux/fpga/fpga-mgr.h                          | 13 ++++++++-----
  5 files changed, 23 insertions(+), 8 deletions(-)
#15 lore raw
Quoted 6 lines · Richard Gong

Hi Moritz, Greg,

Sorry for asking.

Any comment on Intel service layer and FPGA patches submitted on 11/18/20?

I don't see them in my review queue, sorry.

greg k-h

#16 lore raw

Hi Greg,

Quoted 10 lines · Greg KH
Quoted 6 lines · Richard Gong

Hi Moritz, Greg,

Sorry for asking.

Any comment on Intel service layer and FPGA patches submitted on 11/18/20?

I don't see them in my review queue, sorry.

I just re-submitted the patches.

Quoted 1 line

greg k-h >

Regards,
Richard