ARMv8/sec_firmware: relocated and renamed the config FSL_PPA_ARMV8_PSCI

Moved the config FSL_PPA_ARMV8_PSCI from fsl-layerscape's Kconfig to
Kconfig under armv8 and renamed it to SEC_FIRMWARE_ARMV8_PSCI.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
index 7ef9c2fc523963531e9023aa884fc199d08b81e2..0b3d98ef2a73720218e098b6effee91d03c08370 100644 (file)
--- a/arch/arm/cpu/armv8/Kconfig
+++ b/arch/arm/cpu/armv8/Kconfig
@@ -63,6 +63,14 @@ config SPL_ARMV8_SEC_FIRMWARE_SUPPORT
        help
          Say Y here to support this framework in SPL phase.
 
+config SEC_FIRMWARE_ARMV8_PSCI
+       bool "PSCI implementation in secure monitor firmware"
+       depends on ARMV8_SEC_FIRMWARE_SUPPORT || SPL_ARMV8_SEC_FIRMWARE_SUPPORT
+       help
+         This config enables the ARMv8 PSCI implementation in secure monitor
+         firmware. This is a private PSCI implementation and different from
+         those implemented under the common ARMv8 PSCI framework.
+
 config ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT
        bool "ARMv8 secure monitor firmware ERET address byteorder swap"
        depends on ARMV8_SEC_FIRMWARE_SUPPORT || SPL_ARMV8_SEC_FIRMWARE_SUPPORT

diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c
index 3a5afe89be18adeba33bb4c0be116a4a0dbe9068..5156a15d110cbc2b10d65f7e3acd0bf2928b813c 100644 (file)
--- a/arch/arm/cpu/armv8/cpu-dt.c
+++ b/arch/arm/cpu/armv8/cpu-dt.c
@@ -14,7 +14,7 @@
 int psci_update_dt(void *fdt)
 {
 #ifdef CONFIG_MP
-#if defined(CONFIG_ARMV8_PSCI) || defined(CONFIG_FSL_PPA_ARMV8_PSCI)
+#if defined(CONFIG_ARMV8_PSCI) || defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
 
 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
        /*

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 66588e96968a62cbd4e8fe76de63ddd317deb464..0b8d30004c332ec1fda8678038250cedf5dd220c 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -103,20 +103,12 @@ config FSL_LS_PPA
        bool "FSL Layerscape PPA firmware support"
        depends on !ARMV8_PSCI
        depends on ARCH_LS1043A || ARCH_LS1046A
-       select FSL_PPA_ARMV8_PSCI
+       select SEC_FIRMWARE_ARMV8_PSCI
        help
          The FSL Primary Protected Application (PPA) is a software component
          which is loaded during boot stage, and then remains resident in RAM
          and runs in the TrustZone after boot.
          Say y to enable it.
-
-config FSL_PPA_ARMV8_PSCI
-       bool "PSCI implementation in PPA firmware"
-       depends on FSL_LS_PPA
-       help
-         This config enables the ARMv8 PSCI implementation in PPA firmware.
-         This is a private PSCI implementation and different from those
-         implemented under the common ARMv8 PSCI framework.
 endmenu
 
 config SYS_FSL_ERRATUM_A010315

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 3bdeb0e33998b16e00dc55f3a62aed3527f496ed..335f2251816807da6e1f734a95a5991c218a847f 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -412,7 +412,7 @@ int arch_early_init_r(void)
 #endif
 #ifdef CONFIG_MP
 #if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \
-       defined(CONFIG_FSL_PPA_ARMV8_PSCI)
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        /* Check the psci version to determine if the psci is supported */
        psci_ver = sec_firmware_support_psci_version();
 #endif

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index dae9605bbdc0b1c17d7933f15c9c97d6a8579a6b..26d4a303a536fa82cc15b002030eeb156abe4104 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -43,7 +43,7 @@ void ft_fixup_cpu(void *blob)
        u64 val, core_id;
        size_t *boot_code_size = &(__secondary_boot_code_size);
 #if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \
-       defined(CONFIG_FSL_PPA_ARMV8_PSCI)
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        int node;
        u32 psci_ver;
 

diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 0b973f02f6a5496d11e766caa1f81f9c89289a19..ec9cf40241a14e4c817a2bd6734957291a00f9ee 100644 (file)
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -209,7 +209,7 @@ __weak bool sec_firmware_is_valid(const void *sec_firmware_img)
        return true;
 }
 
-#ifdef CONFIG_FSL_PPA_ARMV8_PSCI
+#ifdef CONFIG_SEC_FIRMWARE_ARMV8_PSCI
 /*
  * The PSCI_VERSION function is added from PSCI v0.2. When the PSCI
  * v0.1 received this function, the NOT_SUPPORTED (0xffff_ffff) error

diff --git a/arch/arm/cpu/armv8/sec_firmware_asm.S b/arch/arm/cpu/armv8/sec_firmware_asm.S
index 3275e95c587f8a311e9e3acf6905dc43c67a2dc9..30563ebe7be4a4e525f94e47dfcc191b79e721b8 100644 (file)
--- a/arch/arm/cpu/armv8/sec_firmware_asm.S
+++ b/arch/arm/cpu/armv8/sec_firmware_asm.S
@@ -41,7 +41,7 @@ WEAK(_sec_firmware_entry)
         ret
 ENDPROC(_sec_firmware_entry)
 
-#ifdef CONFIG_FSL_PPA_ARMV8_PSCI
+#ifdef CONFIG_SEC_FIRMWARE_ARMV8_PSCI
 ENTRY(_sec_firmware_support_psci_version)
        mov     x0, 0x84000000
        mov     x1, 0x0

diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h
index a4e144b171da9b83c359c906fc5f08fa830e9d35..5ae00fa8d20b5d5bce15fd264c4e87d8971da2d9 100644 (file)
--- a/arch/arm/include/asm/armv8/sec_firmware.h
+++ b/arch/arm/include/asm/armv8/sec_firmware.h
@@ -14,7 +14,7 @@
 int sec_firmware_init(const void *, u32 *, u32 *);
 int _sec_firmware_entry(const void *, u32 *, u32 *);
 bool sec_firmware_is_valid(const void *);
-#ifdef CONFIG_FSL_PPA_ARMV8_PSCI
+#ifdef CONFIG_SEC_FIRMWARE_ARMV8_PSCI
 unsigned int sec_firmware_support_psci_version(void);
 unsigned int _sec_firmware_support_psci_version(void);
 #endif

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index e261d4febf6f63e1d69dfafbd8f31893304c1b75..d84789c7a8a458af5903ae694db597d458a3f2cb 100644 (file)
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -53,7 +53,7 @@ int arch_fixup_fdt(void *blob)
 #endif
 
 #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \
-       defined(CONFIG_FSL_PPA_ARMV8_PSCI)
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        ret = psci_update_dt(blob);
        if (ret)
                return ret;

diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 45af037f0a4833cd161cfd82ffdd1f7c78f1252c..05e0ad6e70d4b922a12131ce0d9343c07a3c136b 100644 (file)
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -17,7 +17,7 @@
 int fdt_psci(void *fdt)
 {
 #if defined(CONFIG_ARMV7_PSCI) || defined(CONFIG_ARMV8_PSCI) || \
-       defined(CONFIG_FSL_PPA_ARMV8_PSCI)
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        int nodeoff;
        unsigned int psci_ver = 0;
        int tmp;