Eric Lee / smarc-uboot

29
Download as
Browse Code ยป

Commit 1544698816a32284947322d0f0fe1478a9b65ad3

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 217f92bb79
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: armv7: move ARMV7_PSCI_NR_CPUS to Kconfig 

Move this option to Kconfig and set its default value to 4; this
increases the number of supported CPUs for some boards.

It consumes 1KB memory per CPU for PSCI stack, but it should not
be a big deal, given the amount of memory used for the modern OSes.

Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 12 changed files with 9 additions and 22 deletions Side-by-side Diff

arch/arm/cpu/armv7/Kconfig
Diff comments   View file @ 1544698
... ... @@ -41,6 +41,15 @@
41 41 help
42 42 Say Y here to enable PSCI support.
43 43  
  44 +config ARMV7_PSCI_NR_CPUS
  45 + int "Maximum supported CPUs for PSCI"
  46 + depends on ARMV7_NONSEC
  47 + default 4
  48 + help
  49 + The maximum number of CPUs supported in the PSCI firmware.
  50 + It is no problem to set a larger value than the number of
  51 + CPUs in the actual hardware implementation.
  52 +
44 53 config ARMV7_LPAE
45 54 bool "Use LPAE page table format" if EXPERT
46 55 depends on CPU_V7
include/configs/arndale.h
Diff comments   View file @ 1544698
... ... @@ -45,7 +45,6 @@
45 45  
46 46 #define CONFIG_S5P_PA_SYSRAM 0x02020000
47 47 #define CONFIG_SMP_PEN_ADDR CONFIG_S5P_PA_SYSRAM
48   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
49 48  
50 49 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
51 50 #define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000
include/configs/bcm_ep_board.h
Diff comments   View file @ 1544698
... ... @@ -91,7 +91,6 @@
91 91 /* Misc utility code */
92 92 #define CONFIG_BOUNCE_BUFFER
93 93 #define CONFIG_CRC32_VERIFY
94   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
95 94  
96 95 #endif /* __BCM_EP_BOARD_H */
include/configs/jetson-tk1.h
Diff comments   View file @ 1544698
... ... @@ -60,7 +60,6 @@
60 60 #include "tegra-common-usb-gadget.h"
61 61 #include "tegra-common-post.h"
62 62  
63   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
64 63 /* Reserve top 1M for secure RAM */
65 64 #define CONFIG_ARMV7_SECURE_BASE 0xfff00000
66 65 #define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000
include/configs/ls1021aqds.h
Diff comments   View file @ 1544698
... ... @@ -10,7 +10,6 @@
10 10 #define CONFIG_LS102XA
11 11  
12 12 #define CONFIG_ARMV7_PSCI_1_0
13   -#define CONFIG_ARMV7_PSCI_NR_CPUS CONFIG_MAX_CPUS
14 13  
15 14 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR
16 15  
include/configs/ls1021atwr.h
Diff comments   View file @ 1544698
... ... @@ -10,7 +10,6 @@
10 10 #define CONFIG_LS102XA
11 11  
12 12 #define CONFIG_ARMV7_PSCI_1_0
13   -#define CONFIG_ARMV7_PSCI_NR_CPUS CONFIG_MAX_CPUS
14 13  
15 14 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR
16 15  
include/configs/mx7_common.h
Diff comments   View file @ 1544698
... ... @@ -72,7 +72,6 @@
72 72 #define CONFIG_CMD_FUSE
73 73 #define CONFIG_MXC_OCOTP
74 74  
75   -#define CONFIG_ARMV7_PSCI_NR_CPUS 2
76 75 #define CONFIG_ARMV7_SECURE_BASE 0x00900000
77 76  
78 77 #endif
include/configs/sun6i.h
Diff comments   View file @ 1544698
... ... @@ -22,7 +22,6 @@
22 22  
23 23 #define CONFIG_SUNXI_USB_PHYS 3
24 24  
25   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
26 25 #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE
27 26 #define CONFIG_ARMV7_SECURE_MAX_SIZE (64 * 1024) /* 64 KB */
28 27  
include/configs/sun7i.h
Diff comments   View file @ 1544698
... ... @@ -20,7 +20,6 @@
20 20  
21 21 #define CONFIG_SUNXI_USB_PHYS 3
22 22  
23   -#define CONFIG_ARMV7_PSCI_NR_CPUS 2
24 23 #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE
25 24 #define CONFIG_ARMV7_SECURE_MAX_SIZE (64 * 1024) /* 64 KB */
26 25  
include/configs/sun8i.h
Diff comments   View file @ 1544698
... ... @@ -26,18 +26,6 @@
26 26 #define CONFIG_SUNXI_USB_PHYS 2
27 27 #endif
28 28  
29   -#ifndef CONFIG_MACH_SUN8I_A83T
30   -#if defined(CONFIG_MACH_SUN8I_A23)
31   -#define CONFIG_ARMV7_PSCI_NR_CPUS 2
32   -#elif defined(CONFIG_MACH_SUN8I_A33)
33   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
34   -#elif defined(CONFIG_MACH_SUN8I_H3)
35   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
36   -#else
37   -#error Unsupported sun8i variant
38   -#endif
39   -#endif
40   -
41 29 /*
42 30 * Include common sunxi configuration where most the settings are
43 31 */
include/configs/uniphier.h
Diff comments   View file @ 1544698
... ... @@ -12,7 +12,6 @@
12 12 #define __CONFIG_UNIPHIER_COMMON_H__
13 13  
14 14 #define CONFIG_ARMV7_PSCI_1_0
15   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
16 15  
17 16 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
18 17  
include/configs/vexpress_ca15_tc2.h
Diff comments   View file @ 1544698
... ... @@ -16,7 +16,6 @@
16 16  
17 17 #define CONFIG_SYSFLAGS_ADDR 0x1c010030
18 18 #define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR
19   -#define CONFIG_ARMV7_PSCI_NR_CPUS 4
20 19  
21 20 #endif