fpga: altera: Rename Stratix10 FPGA to Intel FPGA SDM Mailbox

Rename Stratix10 FPGA driver to Intel FPGA SDM Mailbox driver
because it is using generic SDM (Secure Device Manager) Mailbox
interface shared by other platform (e.g. Agilex) as well.

Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com>
Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>

diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index a3699e82a19e6edd475aef43179a6de1b0df84b6..32549913cc748773439176b6774172bad320df00 100644 (file)
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -79,7 +79,7 @@ config TARGET_SOCFPGA_STRATIX10
        select ARMV8_MULTIENTRY
        select ARMV8_SET_SMPEN
        select ARMV8_SPIN_TABLE
-       select FPGA_STRATIX10
+       select FPGA_INTEL_SDM_MAILBOX
 
 choice
        prompt "Altera SOCFPGA board select"

diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 07dfa5ed0b97700b9a9a2550d0dc554e7f079c48..0d67b0fd8360b7d9216a42a33b3b8364cc347f6f 100644 (file)
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static Altera_desc altera_fpga[] = {
        {
                /* Family */
-               Intel_FPGA_Stratix10,
+               Intel_FPGA_SDM_Mailbox,
                /* Interface type */
                secure_device_manager_mailbox,
                /* No limitation as additional data will be ignored */

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index fe398a1d4965b33b2ff4e244b61e877c2913ae1f..dd0b39a8d1e1feeb6120ba0333b45a933484cad1 100644 (file)
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -31,16 +31,16 @@ config FPGA_CYCLON2
          Enable FPGA driver for loading bitstream in BIT and BIN format
          on Altera Cyclone II device.
 
-config FPGA_STRATIX10
-       bool "Enable Altera FPGA driver for Stratix 10"
+config FPGA_INTEL_SDM_MAILBOX
+       bool "Enable Intel FPGA Full Reconfiguration SDM Mailbox driver"
        depends on TARGET_SOCFPGA_STRATIX10
        select FPGA_ALTERA
        help
-         Say Y here to enable the Altera Stratix 10 FPGA specific driver
+         Say Y here to enable the Intel FPGA Full Reconfig SDM Mailbox driver
 
-         This provides common functionality for Altera Stratix 10 devices.
-         Enable FPGA driver for writing bitstream into Altera Stratix10
-         device.
+         This provides common functionality for Intel FPGA devices.
+         Enable FPGA driver for writing full bitstream into Intel FPGA
+         devices through SDM (Secure Device Manager) Mailbox.
 
 config FPGA_XILINX
        bool "Enable Xilinx FPGA drivers"

diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
index 04e6480f202c74c1c937b69383395fe8ed4e1dfa..83243fb1070f8a7279d854638c3fa47ce57926f6 100644 (file)
--- a/drivers/fpga/Makefile
+++ b/drivers/fpga/Makefile
@@ -16,9 +16,9 @@ ifdef CONFIG_FPGA_ALTERA
 obj-y += altera.o
 obj-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o
 obj-$(CONFIG_FPGA_CYCLON2) += cyclon2.o
+obj-$(CONFIG_FPGA_INTEL_SDM_MAILBOX) += intel_sdm_mb.o
 obj-$(CONFIG_FPGA_STRATIX_II) += stratixII.o
 obj-$(CONFIG_FPGA_STRATIX_V) += stratixv.o
-obj-$(CONFIG_FPGA_STRATIX10) += stratix10.o
 obj-$(CONFIG_FPGA_SOCFPGA) += socfpga.o
 obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += socfpga_gen5.o
 obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += socfpga_arria10.o

diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index bb27b3778f310d3731cd069ec4909b7c72e3ac70..10c0475d25959ed141b27a4cf169475d91a3564f 100644 (file)
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -40,12 +40,13 @@ static const struct altera_fpga {
 #if defined(CONFIG_FPGA_STRATIX_V)
        { Altera_StratixV, "StratixV", stratixv_load, NULL, NULL },
 #endif
-#if defined(CONFIG_FPGA_STRATIX10)
-       { Intel_FPGA_Stratix10, "Stratix10", stratix10_load, NULL, NULL },
-#endif
 #if defined(CONFIG_FPGA_SOCFPGA)
        { Altera_SoCFPGA, "SoC FPGA", socfpga_load, NULL, NULL },
 #endif
+#if defined(CONFIG_FPGA_INTEL_SDM_MAILBOX)
+       { Intel_FPGA_SDM_Mailbox, "Intel SDM Mailbox", intel_sdm_mb_load, NULL,
+         NULL },
+#endif
 };
 
 static int altera_validate(Altera_desc *desc, const char *fn)

diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/intel_sdm_mb.c
similarity index 98%
rename from drivers/fpga/stratix10.c
rename to drivers/fpga/intel_sdm_mb.c
index da8fa315e36622bfdb3f6e36629d95adf14e654b..350823119166fb72dc4a800523be6a1ef6b85613 100644 (file)
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/intel_sdm_mb.c
@@ -247,7 +247,7 @@ static int send_reconfig_data(const void *rbf_data, size_t rbf_size,
  * This is the interface used by FPGA driver.
  * Return 0 for success, non-zero for error.
  */
-int stratix10_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
+int intel_sdm_mb_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
 {
        int ret;
        u32 resp_len = 2;

diff --git a/include/altera.h b/include/altera.h
index 22d55cfd73e70dd17a979d1dc8d508053bd4f29e..946413c66e88413de39c95a881fe11e4ac6a6b26 100644 (file)
--- a/include/altera.h
+++ b/include/altera.h
@@ -56,10 +56,10 @@ enum altera_family {
        Altera_StratixII,
        /* StratixV Family */
        Altera_StratixV,
-       /* Stratix10 Family */
-       Intel_FPGA_Stratix10,
        /* SoCFPGA Family */
        Altera_SoCFPGA,
+       /* Intel FPGA Family with SDM (Secure Device Manager) Mailbox */
+       Intel_FPGA_SDM_Mailbox,
 
        /* Add new models here */
 
@@ -120,8 +120,9 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size);
 int stratixv_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size);
 #endif
 
-#ifdef CONFIG_FPGA_STRATIX10
-int stratix10_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size);
+#ifdef CONFIG_FPGA_INTEL_SDM_MAILBOX
+int intel_sdm_mb_load(Altera_desc *desc, const void *rbf_data,
+                     size_t rbf_size);
 #endif
 
 #endif /* _ALTERA_H_ */