From: Richard Gong <[email protected]>
Add a compatible property value so we can reuse Intel Stratix10 FPGA
manager and service layer drivers on Intel Agilex SoC platform.
Richard Gong (7):
dt-bindings: fpga: add compatible value to Stratix10 SoC FPGA manager
binding
arm64: dts: agilex: correct FPGA manager driver's compatible value
fpga: stratix10-soc: add compatible property value for intel agilex
dt-bindings, firmware: add compatible value Intel Stratix10 service
layer binding
arm64: dts: agilex: correct service layer driver's compatible value
firmware: stratix10-svc: add the compatible value for intel agilex
firmware: intel_stratix10_service: add depend on agilex
Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt | 2 +-
.../devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 ++-
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 ++--
drivers/firmware/Kconfig | 2 +-
drivers/firmware/stratix10-svc.c | 1 +
drivers/fpga/stratix10-soc.c | 3 ++-
6 files changed, 9 insertions(+), 6 deletions(-)
--
2.7.4
From: Richard Gong <[email protected]>
Add a compatible property value to Stratix10 SoC FPGA manager binding file
Signed-off-by: Richard Gong <[email protected]>
---
.../devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
index 6e03f79..0f87413 100644
--- a/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
+++ b/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
@@ -4,7 +4,8 @@ Required properties:
The fpga_mgr node has the following mandatory property, must be located under
firmware/svc node.
-- compatible : should contain "intel,stratix10-soc-fpga-mgr"
+- compatible : should contain "intel,stratix10-soc-fpga-mgr" or
+ "intel,agilex-soc-fpga-mgr"
Example:
--
2.7.4
From: Richard Gong <[email protected]>
A a compatible property value to Intel Stratix10 service layer binding
Signed-off-by: Richard Gong <[email protected]>
---
Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt b/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
index 1fa6606..6eff1af 100644
--- a/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
+++ b/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
@@ -23,7 +23,7 @@ Required properties:
The svc node has the following mandatory properties, must be located under
the firmware node.
-- compatible: "intel,stratix10-svc"
+- compatible: "intel,stratix10-svc" or "intel,agilex-svc"
- method: smc or hvc
smc - Secure Monitor Call
hvc - Hypervisor Call
--
2.7.4
From: Richard Gong <[email protected]>
Correct the compatible property value for FPGA manager driver on
Intel Agilex SoC platform.
Signed-off-by: Richard Gong <[email protected]>
---
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
index e1d357e..8c29853 100644
--- a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
+++ b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
@@ -544,7 +544,7 @@
memory-region = <&service_reserved>;
fpga_mgr: fpga-mgr {
- compatible = "intel,stratix10-soc-fpga-mgr";
+ compatible = "intel,agilex-soc-fpga-mgr";
};
};
};
--
2.7.4
From: Richard Gong <[email protected]>
Add depend on Agilex for Intel Agilex SoC platform.
Signed-off-by: Richard Gong <[email protected]>
---
drivers/firmware/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index ea869ad..8007d4a 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -206,7 +206,7 @@ config FW_CFG_SYSFS_CMDLINE
config INTEL_STRATIX10_SERVICE
tristate "Intel Stratix10 Service Layer"
- depends on ARCH_STRATIX10 && HAVE_ARM_SMCCC
+ depends on (ARCH_STRATIX10 || ARCH_AGILEX) && HAVE_ARM_SMCCC
default n
help
Intel Stratix10 service layer runs at privileged exception level,
--
2.7.4
From: Richard Gong <[email protected]>
Add compatible property value so we can reuse FPGA manager driver on
Intel Agilex SoC platform.
Signed-off-by: Richard Gong <[email protected]>
---
drivers/fpga/stratix10-soc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 215d337..bac93d0 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -482,7 +482,8 @@ static int s10_remove(struct platform_device *pdev)
}
static const struct of_device_id s10_of_match[] = {
- { .compatible = "intel,stratix10-soc-fpga-mgr", },
+ {.compatible = "intel,stratix10-soc-fpga-mgr"},
+ {.compatible = "intel,agilex-soc-fpga-mgr"},
{},
};
--
2.7.4
From: Richard Gong <[email protected]>
Correct the compatible property value for Intel Service Layer driver
on Intel Agilex SoC platform.
Signed-off-by: Richard Gong <[email protected]>
---
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
index 8c29853..d48218c 100644
--- a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
+++ b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
@@ -539,7 +539,7 @@
firmware {
svc {
- compatible = "intel,stratix10-svc";
+ compatible = "intel,agilex-svc";
method = "smc";
memory-region = <&service_reserved>;
--
2.7.4
From: Richard Gong <[email protected]>
Add the compatible property value so we can reuse Intel Stratix10
Service Layer driver on Intel Agilex SoC platform.
Signed-off-by: Richard Gong <[email protected]>
---
drivers/firmware/stratix10-svc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 7ffb42b..d5f0769 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -966,6 +966,7 @@ EXPORT_SYMBOL_GPL(stratix10_svc_free_memory);
static const struct of_device_id stratix10_svc_drv_match[] = {
{.compatible = "intel,stratix10-svc"},
+ {.compatible = "intel,agilex-svc"},
{},
};
--
2.7.4
On Fri, 14 Feb 2020 10:00:46 -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Add a compatible property value to Stratix10 SoC FPGA manager binding file
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> .../devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Acked-by: Rob Herring <[email protected]>
On Fri, 14 Feb 2020 10:00:49 -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> A a compatible property value to Intel Stratix10 service layer binding
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Acked-by: Rob Herring <[email protected]>
On Fri, Feb 14, 2020 at 10:00:49AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> A a compatible property value to Intel Stratix10 service layer binding
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt b/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
> index 1fa6606..6eff1af 100644
> --- a/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
> +++ b/Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
> @@ -23,7 +23,7 @@ Required properties:
> The svc node has the following mandatory properties, must be located under
> the firmware node.
>
> -- compatible: "intel,stratix10-svc"
> +- compatible: "intel,stratix10-svc" or "intel,agilex-svc"
> - method: smc or hvc
> smc - Secure Monitor Call
> hvc - Hypervisor Call
> --
> 2.7.4
>
Applied to for-next,
Thanks
On Fri, Feb 14, 2020 at 10:00:46AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Add a compatible property value to Stratix10 SoC FPGA manager binding file
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> .../devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
> index 6e03f79..0f87413 100644
> --- a/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
> +++ b/Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
> @@ -4,7 +4,8 @@ Required properties:
> The fpga_mgr node has the following mandatory property, must be located under
> firmware/svc node.
>
> -- compatible : should contain "intel,stratix10-soc-fpga-mgr"
> +- compatible : should contain "intel,stratix10-soc-fpga-mgr" or
> + "intel,agilex-soc-fpga-mgr"
>
> Example:
>
> --
> 2.7.4
>
Applied to for-next,
Thanks
On Fri, Feb 14, 2020 at 10:00:47AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Correct the compatible property value for FPGA manager driver on
> Intel Agilex SoC platform.
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
> index e1d357e..8c29853 100644
> --- a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
> +++ b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
> @@ -544,7 +544,7 @@
> memory-region = <&service_reserved>;
>
> fpga_mgr: fpga-mgr {
> - compatible = "intel,stratix10-soc-fpga-mgr";
> + compatible = "intel,agilex-soc-fpga-mgr";
> };
> };
> };
> --
> 2.7.4
>
Applied to for-next,
Thanks
On Fri, Feb 14, 2020 at 10:00:48AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Add compatible property value so we can reuse FPGA manager driver on
> Intel Agilex SoC platform.
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> drivers/fpga/stratix10-soc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
> index 215d337..bac93d0 100644
> --- a/drivers/fpga/stratix10-soc.c
> +++ b/drivers/fpga/stratix10-soc.c
> @@ -482,7 +482,8 @@ static int s10_remove(struct platform_device *pdev)
> }
>
> static const struct of_device_id s10_of_match[] = {
> - { .compatible = "intel,stratix10-soc-fpga-mgr", },
> + {.compatible = "intel,stratix10-soc-fpga-mgr"},
> + {.compatible = "intel,agilex-soc-fpga-mgr"},
> {},
> };
>
> --
> 2.7.4
>
Applied to for-next,
Thanks
On Fri, Feb 14, 2020 at 10:00:50AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Correct the compatible property value for Intel Service Layer driver
> on Intel Agilex SoC platform.
>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
> index 8c29853..d48218c 100644
> --- a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
> +++ b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
> @@ -539,7 +539,7 @@
>
> firmware {
> svc {
> - compatible = "intel,stratix10-svc";
> + compatible = "intel,agilex-svc";
> method = "smc";
> memory-region = <&service_reserved>;
>
> --
> 2.7.4
>
Applied to for-next,
Thanks
On Fri, Feb 14, 2020 at 10:00:51AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Add the compatible property value so we can reuse Intel Stratix10
> Service Layer driver on Intel Agilex SoC platform.
>
Acked-by: Moritz Fischer <[email protected]>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> drivers/firmware/stratix10-svc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
> index 7ffb42b..d5f0769 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -966,6 +966,7 @@ EXPORT_SYMBOL_GPL(stratix10_svc_free_memory);
>
> static const struct of_device_id stratix10_svc_drv_match[] = {
> {.compatible = "intel,stratix10-svc"},
> + {.compatible = "intel,agilex-svc"},
> {},
> };
>
> --
> 2.7.4
>
On Fri, Feb 14, 2020 at 10:00:52AM -0600, [email protected] wrote:
> From: Richard Gong <[email protected]>
>
> Add depend on Agilex for Intel Agilex SoC platform.
>
Acked-by: Moritz Fischer <[email protected]>
> Signed-off-by: Richard Gong <[email protected]>
> ---
> drivers/firmware/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index ea869ad..8007d4a 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -206,7 +206,7 @@ config FW_CFG_SYSFS_CMDLINE
>
> config INTEL_STRATIX10_SERVICE
> tristate "Intel Stratix10 Service Layer"
> - depends on ARCH_STRATIX10 && HAVE_ARM_SMCCC
> + depends on (ARCH_STRATIX10 || ARCH_AGILEX) && HAVE_ARM_SMCCC
> default n
> help
> Intel Stratix10 service layer runs at privileged exception level,
> --
> 2.7.4
>