Unverified Commit 4fd932a7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_fix_for_v5.16' of... 

Merge tag 'socfpga_fix_for_v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

SoCFPGA fix for v5.16
- Fix crash when CONFIG_FORTIRY_SOURCE is enabled

* tag 'socfpga_fix_for_v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE

Link: https://lore.kernel.org/r/20211119153224.2761257-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d17c4bf2 187bea47

arch/arm/mach-socfpga/core.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern void __iomem *sdr_ctl_base_addr; 
u32 socfpga_sdram_self_refresh(u32 sdr_base);

extern unsigned int socfpga_sdram_self_refresh_sz;



extern char secondary_trampoline, secondary_trampoline_end;

extern char secondary_trampoline[], secondary_trampoline_end[];



extern unsigned long socfpga_cpu1start_addr;

arch/arm/mach-socfpga/platsmp.c

+4 −4
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ 


static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;

	int trampoline_size = secondary_trampoline_end - secondary_trampoline;



	if (socfpga_cpu1start_addr) {

		/* This will put CPU #1 into reset. */

		writel(RSTMGR_MPUMODRST_CPU1,

		       rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);



		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);

		memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);



		writel(__pa_symbol(secondary_startup),

		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));
@@ -45,12 +45,12 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle) 


static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;

	int trampoline_size = secondary_trampoline_end - secondary_trampoline;



	if (socfpga_cpu1start_addr) {

		writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr +

		       SOCFPGA_A10_RSTMGR_MODMPURST);

		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);

		memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);



		writel(__pa_symbol(secondary_startup),

		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));