Enable FPGA Manager support for Agilex5
Subsystems (2)
v3 cover Enable FPGA Manager support for Agilex5
This patch series adds device tree bindings, driver and DTS updates to enable FPGA Manager functionality for Intel Agilex5 SoC.
These changes are intended to enable FPGA programming and FPGA management capabilities on Agilex5-based platforms.
---
Notes:
Patch #2 depends on "arm64: dts: intel: Add Agilex5 SVC node with memory region" from
https://lore.kernel.org/all/3381ef56c1ff34a0b54cf76010889b5523ead825.1762387665.git.khairul.anuar.romli@altera.com/
This patch series is applied on socfpga maintainer's tree
https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git/log/?h=socfpga_dts_for_v6.19
Changes in v3:
- Add fallback in altera's soc fpga manager compatible properties.
- Validate with make CHECK_DBTS=y on:
- intel/socfpga_agilex5_socdk.dtb (fallback)
- intel/socfpga_agilex_socdk.dtb (non-fallback)
- altera/socfpga_stratix10_socdk.dtb (non-fallback)
Changes in v2:
- Drop "fpga: stratix10-soc: Add support for Agilex5"
- Add fallback compatible in DT
---
Khairul Anuar Romli (2):
dt-bindings: fpga: stratix10: add support for Agilex5
arm64: dts: agilex5: add fpga-region and fpga-mgr nodes
.../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 12 ++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-)
Signature · 1 line
2.43.7
PATCH v3 1/2 dt-bindings: fpga: stratix10: add support for Agilex5
Agilex5 introduces changes in how reserved memory is mapped and accessed compared to previous SoC generations. Agilex5 compatible allows stratix10- FPGA manager driver to handle these changes.
Fallback is added for driver probe and init that rely on matching of table and DT node.
---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5 (fallback)
Changes in v2:
- No changes in this patch
--- .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +11 -3
@@ -20,9 +20,17 @@ description: properties: compatible: - enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - items: + - enum: + - intel,stratix10-soc-fpga-mgr + - intel,agilex-soc-fpga-mgr + + - description: Agilex5 Device + items: + - enum: + - intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgr required: - compatible
Signature · 1 line
2.43.7
Re: [PATCH v3 1/2] dt-bindings: fpga: stratix10: add support for Agilex5
Quoted 26 lines · Khairul Anuar Romli
Agilex5 introduces changes in how reserved memory is mapped and accessed compared to previous SoC generations. Agilex5 compatible allows stratix10- FPGA manager driver to handle these changes.
Fallback is added for driver probe and init that rely on matching of table and DT node.
Reviewed-by Xu Yilun <[email protected]>Signed-off-by Khairul Anuar Romli <[email protected]>---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5 (fallback)
Changes in v2:
- No changes in this patch--- .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +0
-0
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description: · line 25
Quoted 9 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +3
-3@@ -20,9 +20,17 @@ description: properties: compatible: - enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - items: + - enum:
This construct is redundant, "items: - enum" is the same as just having "enum".
pw-bot: changes-requested
Quoted 14 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +8
-0+ - intel,stratix10-soc-fpga-mgr + - intel,agilex-soc-fpga-mgr + + - description: Agilex5 Device + items: + - enum: + - intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgr required: - compatibleSignature · 1 line
2.43.7
Re: [PATCH v3 1/2] dt-bindings: fpga: stratix10: add support for Agilex5
Quoted 28 lines · Conor Dooley
Quoted 27 lines · Khairul Anuar Romli
Agilex5 introduces changes in how reserved memory is mapped and accessed compared to previous SoC generations. Agilex5 compatible allows stratix10- FPGA manager driver to handle these changes.
Fallback is added for driver probe and init that rely on matching of table and DT node.
Reviewed-by Xu Yilun <[email protected]>Signed-off-by Khairul Anuar Romli <[email protected]>---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5 (fallback)
Changes in v2:
- No changes in this patch--- .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +0
-0@@ -20,9 +20,17 @@ description:
Quoted 13 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description: · line 25
Quoted 8 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +3
-3properties: compatible: - enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - items: + - enum:This construct is redundant, "items: - enum" is the same as just having "enum".
pw-bot: changes-requested
I've tried to look for some of the already merged bindings i.e arm/qcom.yaml (although all the properties has enum - constant combination), it is using items with enum. I tried to keep the enum without items but I keep getting error while validating the changes.
Another option that I've validated is using the following changes.
- enum:
- - intel,stratix10-soc-fpga-mgr
- - intel,agilex-soc-fpga-mgr
+ oneOf:
+ - description: Intel Stratix10 Devices
+ items:
+ - const: intel,stratix10-soc-fpga-mgr
+ - description: Intel Agilex Devices
+ items:
+ - const: intel,agilex-soc-fpga-mgr
+ - description: Intel Agilex5 Devices
+ items:
+ - const: intel,agilex5-soc-fpga-mgr
+ - const: intel,agilex-soc-fpga-mgr
The drawback of this is we will need to implement enum instead of constant for first element if we need to add new devices under "Intel Agilex5 Devices" in the future.
Thanks.
Best Regards,
Khairul
Quoted 14 lines
Quoted 14 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +8
-0+ - intel,stratix10-soc-fpga-mgr + - intel,agilex-soc-fpga-mgr + + - description: Agilex5 Device + items: + - enum: + - intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgr required: - compatibleSignature · 1 line
2.43.7
Re: [PATCH v3 1/2] dt-bindings: fpga: stratix10: add support for Agilex5
Quoted 42 lines · Khairul Anuar
Quoted 28 lines · Conor Dooley
Quoted 27 lines · Khairul Anuar Romli
Agilex5 introduces changes in how reserved memory is mapped and accessed compared to previous SoC generations. Agilex5 compatible allows stratix10- FPGA manager driver to handle these changes.
Fallback is added for driver probe and init that rely on matching of table and DT node.
Reviewed-by Xu Yilun <[email protected]>Signed-off-by Khairul Anuar Romli <[email protected]>---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5 (fallback)
Changes in v2:
- No changes in this patch--- .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +0
-0@@ -20,9 +20,17 @@ description:Quoted 13 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description: · line 25
Quoted 8 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +3
-3properties: compatible: - enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - items: + - enum:This construct is redundant, "items: - enum" is the same as just having "enum".
pw-bot: changes-requested
Quoted 4 lines
I've tried to look for some of the already merged bindings i.e
arm/qcom.yaml(although all the properties has enum - constant combination), it is using items with enum. I tried to keep the enum without items but I keep getting error while validating the changes.
I literally told you what to change, so I don't know why you didn't just do that. Replacing "items: - enum" with "enum" is what you need to do. You didn't even include the error you got, so I cannot help you with that at all, nor even if you did what I told you to do.
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description:
Quoted 9 lines
Another option that I've validated is using the following changes.
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +4
-3- enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - description: Intel Stratix10 Devices + items: + - const: intel,stratix10-soc-fpga-mgr
These just have the same problem as your original patch. "items: - const" is just the same as "const".
Since item "items" properties do not do anything other than bloat the schema.
Quoted 32 lines
(quoted diff) +7
-0+ - description: Intel Agilex Devices + items: + - const: intel,agilex-soc-fpga-mgr + - description: Intel Agilex5 Devices + items: + - const: intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgrThe drawback of this is we will need to implement enum instead of constant for first element if we need to add new devices under "Intel Agilex5 Devices" in the future.
Thanks.
Best Regards,
KhairulQuoted 14 lines
Quoted 14 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +8
-0+ - intel,stratix10-soc-fpga-mgr + - intel,agilex-soc-fpga-mgr + + - description: Agilex5 Device + items: + - enum: + - intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgr required: - compatibleSignature · 1 line
2.43.7
Re: [PATCH v3 1/2] dt-bindings: fpga: stratix10: add support for Agilex5
Quoted 48 lines · Conor Dooley
Quoted 42 lines · Khairul Anuar
Quoted 28 lines · Conor Dooley
Quoted 27 lines · Khairul Anuar Romli
Agilex5 introduces changes in how reserved memory is mapped and accessed compared to previous SoC generations. Agilex5 compatible allows stratix10- FPGA manager driver to handle these changes.
Fallback is added for driver probe and init that rely on matching of table and DT node.
Reviewed-by Xu Yilun <[email protected]>Signed-off-by Khairul Anuar Romli <[email protected]>---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5 (fallback)
Changes in v2:
- No changes in this patch--- .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +0
-0@@ -20,9 +20,17 @@ description:Quoted 13 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description: · line 25
Quoted 8 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +3
-3properties: compatible: - enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - items: + - enum:This construct is redundant, "items: - enum" is the same as just having "enum".
pw-bot: changes-requestedQuoted 4 lines
I've tried to look for some of the already merged bindings i.e
arm/qcom.yaml(although all the properties has enum - constant combination), it is using items with enum. I tried to keep the enum without items but I keep getting error while validating the changes.
Quoted 4 lines
I literally told you what to change, so I don't know why you didn't just do that. Replacing "items: - enum" with "enum" is what you need to do. You didn't even include the error you got, so I cannot help you with that at all, nor even if you did what I told you to do.
nor even know if you did*
Quoted 48 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description:
Quoted 10 lines
Another option that I've validated is using the following changes.
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +4
-3- enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - description: Intel Stratix10 Devices + items: + - const: intel,stratix10-soc-fpga-mgrThese just have the same problem as your original patch. "items: - const" is just the same as "const".
Since item "items" properties do not do anything other than bloat the schema.Quoted 32 lines
(quoted diff) +7
-0+ - description: Intel Agilex Devices + items: + - const: intel,agilex-soc-fpga-mgr + - description: Intel Agilex5 Devices + items: + - const: intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgrThe drawback of this is we will need to implement enum instead of constant for first element if we need to add new devices under "Intel Agilex5 Devices" in the future.
Thanks.
Best Regards,
KhairulQuoted 14 lines
Quoted 14 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +8
-0+ - intel,stratix10-soc-fpga-mgr + - intel,agilex-soc-fpga-mgr + + - description: Agilex5 Device + items: + - enum: + - intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgr required: - compatibleSignature · 1 line
2.43.7
Re: [PATCH v3 1/2] dt-bindings: fpga: stratix10: add support for Agilex5
Quoted 49 lines · Conor Dooley
Quoted 48 lines · Conor Dooley
Quoted 46 lines · Khairul Anuar
Quoted 28 lines · Conor Dooley
Quoted 27 lines · Khairul Anuar Romli
Agilex5 introduces changes in how reserved memory is mapped and accessed compared to previous SoC generations. Agilex5 compatible allows stratix10- FPGA manager driver to handle these changes.
Fallback is added for driver probe and init that rely on matching of table and DT node.
Reviewed-by Xu Yilun <[email protected]>Signed-off-by Khairul Anuar Romli <[email protected]>---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5 (fallback)
Changes in v2:
- No changes in this patch--- .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +0
-0@@ -20,9 +20,17 @@ description:Quoted 13 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description: · line 25
Quoted 8 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +3
-3properties: compatible: - enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - items: + - enum:This construct is redundant, "items: - enum" is the same as just having "enum".
pw-bot: changes-requestedI've tried to look for some of the already merged bindings i.e
arm/qcom.yaml(although all the properties has enum - constant combination), it is using items with enum. I tried to keep the enum without items but I keep getting error while validating the changes.
Quoted 7 lines
Quoted 4 lines
I literally told you what to change, so I don't know why you didn't just do that. Replacing "items: - enum" with "enum" is what you need to do. You didn't even include the error you got, so I cannot help you with that at all, nor even if you did what I told you to do.
nor even know if you did*
properties:
compatible:
- enum:
- - intel,stratix10-soc-fpga-mgr
- - intel,agilex-soc-fpga-mgr
+ oneOf:
+ - enum:
+ - intel,stratix10-soc-fpga-mgr
+ - intel,agilex-soc-fpga-mgr
+ - enum:
+ - intel,agilex5-soc-fpga-mgr
+ const: intel,agilex-soc-fpga-mgr
$ make -j24 CHECK_DTBS=y intel/socfpga_agilex5_socdk.dtb
/linux-socfpga/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dtb:
fpga-mgr (intel,agilex5-soc-fpga-mgr): compatible: 'oneOf' conditional failed, one must be fixed:
['intel,agilex5-soc-fpga-mgr', 'intel,agilex-soc-fpga-mgr'] is too long 'intel,agilex5-soc-fpga-mgr' is not one of
['intel,stratix10-soc-fpga-mgr', 'intel,agilex-soc-fpga-mgr']
'intel,agilex-soc-fpga-mgr' was expected
from schema $id:
http://devicetree.org/schemas/fpga/intel,stratix10-soc-fpga-mgr.yaml#
$ make -j24 CHECK_DTBS=y DT_SCHEMA_FILES=intel,stratix10-soc-fpga-mgr.yaml intel/socfpga_agilex5_socdk.dtb
DTC [C] arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dtb
/linux-socfpga/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dtb:
fpga-mgr (intel,agilex5-soc-fpga-mgr): compatible: 'oneOf' conditional failed, one must be fixed:
['intel,agilex5-soc-fpga-mgr', 'intel,agilex-soc-fpga-mgr'] is too long 'intel,agilex5-soc-fpga-mgr' is not one of
['intel,stratix10-soc-fpga-mgr', 'intel,agilex-soc-fpga-mgr']
'intel,agilex-soc-fpga-mgr' was expected
from schema $id:
http://devicetree.org/schemas/fpga/intel,stratix10-soc-fpga-mgr.yaml#
This error is not seen if we use the "redundant" items - enum.
Documentation/devicetree/bindings/example-schema.yaml still shows the use of items - enum though.
Thanks.
Best Regards,
Khairul
Quoted 50 lines
Quoted 48 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml description:
Quoted 10 lines
Another option that I've validated is using the following changes.
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +4
-3- enum: - - intel,stratix10-soc-fpga-mgr - - intel,agilex-soc-fpga-mgr + oneOf: + - description: Intel Stratix10 Devices + items: + - const: intel,stratix10-soc-fpga-mgrThese just have the same problem as your original patch. "items: - const" is just the same as "const".
Since item "items" properties do not do anything other than bloat the schema.Quoted 32 lines
(quoted diff) +7
-0+ - description: Intel Agilex Devices + items: + - const: intel,agilex-soc-fpga-mgr + - description: Intel Agilex5 Devices + items: + - const: intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgrThe drawback of this is we will need to implement enum instead of constant for first element if we need to add new devices under "Intel Agilex5 Devices" in the future.
Thanks.
Best Regards,
KhairulQuoted 14 lines
Quoted 14 lines
Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml +8
-0+ - intel,stratix10-soc-fpga-mgr + - intel,agilex-soc-fpga-mgr + + - description: Agilex5 Device + items: + - enum: + - intel,agilex5-soc-fpga-mgr + - const: intel,agilex-soc-fpga-mgr required: - compatibleSignature · 1 line
2.43.7
Re: [PATCH v3 1/2] dt-bindings: fpga: stratix10: add support for Agilex5
Quoted 111 lines · Conor Dooley
Quoted 59 lines · Conor Dooley
Quoted 58 lines · Conor Dooley
Quoted 56 lines · Khairul Anuar
Quoted 41 lines · Conor Dooley
Quoted 40 lines · Khairul Anuar Romli
Agilex5 introduces changes in how reserved memory is mapped and accessed
compared to previous SoC generations. Agilex5 compatible allows stratix10-
FPGA manager driver to handle these changes.Fallback is added for driver probe and init that rely on matching of table
and DT node.Reviewed-by Xu Yilun <[email protected]>Signed-off-by Khairul Anuar Romli <[email protected]>---
Changes in v3:
- Add description for Agilex5 Device
- Add and define fallback to "intel,agilex-soc-fpga-mgr"
- Validate against Agilex and Stratix10 (non-fallback) and Agilex5
(fallback)
Changes in v2:
- No changes in this patch
---
.../fpga/intel,stratix10-soc-fpga-mgr.yaml | 14 +++++++
++++---1 file changed, 11 insertions(+), 3 deletions(-)(quoted diff) +0
-0intel,stratix10-soc-fpga-mgr.yaml b/Documentation/devicetree/
bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml
index6e536d6b28a9..8eb414163d08100644
--- a/Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml
+++ b/Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml(quoted diff) +0
-0@@ -20,9 +20,17 @@ description:properties:
compatible:
- enum:
- - intel,stratix10-soc-fpga-mgr
- - intel,agilex-soc-fpga-mgrQuoted 9 lines
Quoted 3 lines
+ oneOf:
+ - items:
+ - enum:This construct is redundant, "items: - enum" is the same as just having
"enum".
pw-bot: changes-requestedI've tried to look for some of the already merged bindings i.e
arm/qcom.yaml(although all the properties has enum - constant combination), it is using items with enum. I tried to keep the enum without
items but I keep getting error while validating the changes.Quoted 7 lines
Quoted 4 lines
I literally told you what to change, so I don't know why you didn't just do that. Replacing "items: - enum" with "enum" is what you need to do. You didn't even include the error you got, so I cannot help you with that at all, nor even if you did what I told you to do.
nor even know if you did*
properties:
compatible:
- enum:
- - intel,stratix10-soc-fpga-mgr
- - intel,agilex-soc-fpga-mgr
+ oneOf:
+ - enum:
+ - intel,stratix10-soc-fpga-mgr
+ - intel,agilex-soc-fpga-mgr
+ - enum:
+ - intel,agilex5-soc-fpga-mgr
+ const: intel,agilex-soc-fpga-mgr$ make -j24 CHECK_DTBS=y intel/socfpga_agilex5_socdk.dtb/linux-socfpga/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dtb:
fpga-mgr (intel,agilex5-soc-fpga-mgr): compatible: 'oneOf' conditional failed, one must be fixed:
['intel,agilex5-soc-fpga-mgr', 'intel,agilex-soc-fpga-mgr'] is too
long
'intel,agilex5-soc-fpga-mgr' is not one of ['intel,stratix10-soc-
fpga-mgr', 'intel,agilex-soc-fpga-mgr']
'intel,agilex-soc-fpga-mgr' was expected
from schema $id: http://devicetree.org/schemas/fpga/
intel,stratix10-soc-fpga-mgr.yaml#$ make -j24 CHECK_DTBS=y DT_SCHEMA_FILES=intel,stratix10-soc-fpga- mgr.yaml intel/socfpga_agilex5_socdk.dtbDTC [C]
arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dtb
/linux-socfpga/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dtb:
fpga-mgr (intel,agilex5-soc-fpga-mgr): compatible: 'oneOf' conditional failed, one must be fixed:
['intel,agilex5-soc-fpga-mgr', 'intel,agilex-soc-fpga-mgr'] is too
long
'intel,agilex5-soc-fpga-mgr' is not one of ['intel,stratix10-soc-
fpga-mgr', 'intel,agilex-soc-fpga-mgr']
'intel,agilex-soc-fpga-mgr' was expected
from schema $id: http://devicetree.org/schemas/fpga/
intel,stratix10-soc-fpga-mgr.yaml#This error is not seen if we use the "redundant" items - enum.
Quoted 8 lines
Documentation/devicetree/bindings/example-schema.yamlstill shows the use of items - enum though.Thanks.
Best Regards,
Khairul
Upon doing some more reading through other examples, I am able to get to make changes as you suggested and get it validated without any error on the fallback and non-fallback DT.
I will sent that in the next version.
Thank you so much for the feedback.
Best Regards,
Khairul
Quoted 50 lines
Quoted 49 lines
Quoted 47 lines
Quoted 10 lines
Another option that I've validated is using the following changes.
- enum:
- - intel,stratix10-soc-fpga-mgr
- - intel,agilex-soc-fpga-mgr
+ oneOf:
+ - description: Intel Stratix10 Devices
+ items:
+ - const: intel,stratix10-soc-fpga-mgrThese just have the same problem as your original patch. "items: - const" is just the same as "const".
Since item "items" properties do not do anything other than bloat the schema.Quoted 31 lines
+ - description: Intel Agilex Devices
+ items:
+ - const: intel,agilex-soc-fpga-mgr
+ - description: Intel Agilex5 Devices
+ items:
+ - const: intel,agilex5-soc-fpga-mgr
+ - const: intel,agilex-soc-fpga-mgrThe drawback of this is we will need to implement enum instead of constant for first element if we need to add new devices under "Intel Agilex5 Devices" in the future.
Thanks.
Best Regards,
KhairulQuoted 13 lines
Quoted 13 lines
+ - intel,stratix10-soc-fpga-mgr
+ - intel,agilex-soc-fpga-mgr
+
+ - description: Agilex5 Device
+ items:
+ - enum:
+ - intel,agilex5-soc-fpga-mgr
+ - const: intel,agilex-soc-fpga-mgr
required:
- compatibleSignature · 1 line
2.43.7
PATCH v3 2/2 arm64: dts: agilex5: add fpga-region and fpga-mgr nodes
In reply to Khairul Anuar RomliThe Intel Agilex 5 SoC contains a programmable FPGA region that requires proper device tree description to enable FPGA manager support in the Linux kernel.
The fpga-region node is introduced to support FPGA partial reconfiguration through the FPGA Manager framework. This node defines a region in the device tree that can be dynamically programmed at runtime.
---
Changes in v3:
- tested with intel,stratix10-soc-fpga-mgr.yaml
- Rephrase commit message to make it more concise.
Changes in v2:
- All fallback compatible string to ensure driver is still able to initialize without new compatible string added in the driver.
--- arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi +12 -0
@@ -85,9 +85,21 @@ svc { method = "smc"; memory-region = <&service_reserved>; iommus = <&smmu 10>; + + fpga_mgr: fpga-mgr { + compatible = "intel,agilex5-soc-fpga-mgr", + "intel,agilex-soc-fpga-mgr"; + }; }; }; + fpga-region { + compatible = "fpga-region"; + #address-cells = <0x2>; + #size-cells = <0x2>; + fpga-mgr = <&fpga_mgr>; + }; + psci { compatible = "arm,psci-0.2"; method = "smc";
Signature · 1 line
2.43.7