diff options
| author | Christian Daudt <csd@broadcom.com> | 2013-08-07 00:04:54 (GMT) |
|---|---|---|
| committer | Christian Daudt <csd@broadcom.com> | 2013-08-20 17:51:39 (GMT) |
| commit | 3a76b35186cb967a69c4a3935caf2fdf428e933b (patch) | |
| tree | d26dd20cad8966e895b642c282f115dd8a75e071 /arch/arm/mach-bcm/board_bcm281xx.c | |
| parent | aea237bfa0a8ce8fe364e3fa7de6850777044a60 (diff) | |
| download | linux-3a76b35186cb967a69c4a3935caf2fdf428e933b.tar.xz | |
ARM: bcm: Make secure API call optional
The current bcm_kona_smc_init function throws a BUG_ON if there's no SMC
device node defined in the device tree.
Since secure API access is optional depending the chip configuration,
fix this by allowing the rest of the code to run even if there's no SMC
device node defined
Signed-off-by: Christian Daudt <csd@broadcom.com>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Diffstat (limited to 'arch/arm/mach-bcm/board_bcm281xx.c')
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm281xx.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index 3fe1e4d..8d9f931 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -29,15 +29,18 @@ static int __init kona_l2_cache_init(void) if (!IS_ENABLED(CONFIG_CACHE_L2X0)) return 0; + if (bcm_kona_smc_init() < 0) { + pr_info("Kona secure API not available. Skipping L2 init\n"); + return 0; + } + bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0); /* * The aux_val and aux_mask have no effect since L2 cache is already * enabled. Pass 0s for aux_val and 1s for aux_mask for default value. */ - l2x0_of_init(0, ~0); - - return 0; + return l2x0_of_init(0, ~0); } static void bcm_board_setup_restart(void) @@ -58,7 +61,6 @@ static void __init board_init(void) of_platform_populate(NULL, of_default_bus_match_table, NULL, &platform_bus); - bcm_kona_smc_init(); bcm_board_setup_restart(); kona_l2_cache_init(); } |