mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-10-30 19:48:19 +00:00 
			
		
		
		
	psci_update_dt() is also required if CONFIG_ARMV8_PSCI is set, that is, if u-boot is the PSCI provider. Guard the check which is intended to call into the PSCI implementation in the secure firmware, by the proper macro SEC_FIRMWARE_ARMV8_PSCI. Mark the function as weak because - unfortunately - there is already a stub of the same function in arch/arm/mach-rmobile/psci-r8a779a0.c which does not the same as the common one. Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
		
			
				
	
	
		
			35 lines
		
	
	
		
			905 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			905 B
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0+
 | |
| /*
 | |
|  * Copyright 2016 NXP Semiconductor, Inc.
 | |
|  */
 | |
| 
 | |
| #include <common.h>
 | |
| #include <asm/cache.h>
 | |
| #include <asm/psci.h>
 | |
| #include <asm/system.h>
 | |
| #include <asm/armv8/sec_firmware.h>
 | |
| #include <linux/libfdt.h>
 | |
| 
 | |
| __weak int psci_update_dt(void *fdt)
 | |
| {
 | |
| 	/*
 | |
| 	 * If the PSCI in SEC Firmware didn't work, avoid to update the
 | |
| 	 * device node of PSCI. But still return 0 instead of an error
 | |
| 	 * number to support detecting PSCI dynamically and then switching
 | |
| 	 * the SMP boot method between PSCI and spin-table.
 | |
| 	 */
 | |
| 	if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) &&
 | |
| 	    sec_firmware_support_psci_version() == PSCI_INVALID_VER)
 | |
| 		return 0;
 | |
| 
 | |
| 	fdt_psci(fdt);
 | |
| 
 | |
| #if defined(CONFIG_ARMV8_PSCI) && !defined(CONFIG_ARMV8_SECURE_BASE)
 | |
| 	/* secure code lives in RAM, keep it alive */
 | |
| 	fdt_add_mem_rsv(fdt, (unsigned long)__secure_start,
 | |
| 			__secure_end - __secure_start);
 | |
| #endif
 | |
| 
 | |
| 	return 0;
 | |
| }
 |