.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * This file contains Xilinx specific SMP code, used to start up |
---|
3 | 4 | * the second processor. |
---|
.. | .. |
---|
7 | 8 | * based on linux/arch/arm/mach-realview/platsmp.c |
---|
8 | 9 | * |
---|
9 | 10 | * Copyright (C) 2002 ARM Ltd. |
---|
10 | | - * |
---|
11 | | - * This software is licensed under the terms of the GNU General Public |
---|
12 | | - * License version 2, as published by the Free Software Foundation, and |
---|
13 | | - * may be copied, distributed, and modified under those terms. |
---|
14 | | - * |
---|
15 | | - * This program is distributed in the hope that it will be useful, |
---|
16 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
17 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
18 | | - * GNU General Public License for more details. |
---|
19 | 11 | */ |
---|
20 | 12 | |
---|
21 | 13 | #include <linux/export.h> |
---|
.. | .. |
---|
23 | 15 | #include <linux/init.h> |
---|
24 | 16 | #include <linux/io.h> |
---|
25 | 17 | #include <asm/cacheflush.h> |
---|
| 18 | +#include <asm/smp_plat.h> |
---|
26 | 19 | #include <asm/smp_scu.h> |
---|
27 | 20 | #include <linux/irqchip/arm-gic.h> |
---|
28 | 21 | #include "common.h" |
---|
.. | .. |
---|
38 | 31 | { |
---|
39 | 32 | u32 trampoline_code_size = &zynq_secondary_trampoline_end - |
---|
40 | 33 | &zynq_secondary_trampoline; |
---|
| 34 | + u32 phy_cpuid = cpu_logical_map(cpu); |
---|
41 | 35 | |
---|
42 | 36 | /* MS: Expectation that SLCR are directly map and accessible */ |
---|
43 | 37 | /* Not possible to jump to non aligned address */ |
---|
.. | .. |
---|
47 | 41 | u32 trampoline_size = &zynq_secondary_trampoline_jump - |
---|
48 | 42 | &zynq_secondary_trampoline; |
---|
49 | 43 | |
---|
50 | | - zynq_slcr_cpu_stop(cpu); |
---|
| 44 | + zynq_slcr_cpu_stop(phy_cpuid); |
---|
51 | 45 | if (address) { |
---|
52 | 46 | if (__pa(PAGE_OFFSET)) { |
---|
53 | 47 | zero = ioremap(0, trampoline_code_size); |
---|
.. | .. |
---|
76 | 70 | if (__pa(PAGE_OFFSET)) |
---|
77 | 71 | iounmap(zero); |
---|
78 | 72 | } |
---|
79 | | - zynq_slcr_cpu_start(cpu); |
---|
| 73 | + zynq_slcr_cpu_start(phy_cpuid); |
---|
80 | 74 | |
---|
81 | 75 | return 0; |
---|
82 | 76 | } |
---|
.. | .. |
---|
89 | 83 | |
---|
90 | 84 | static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle) |
---|
91 | 85 | { |
---|
92 | | - return zynq_cpun_start(__pa_symbol(secondary_startup), cpu); |
---|
| 86 | + return zynq_cpun_start(__pa_symbol(secondary_startup_arm), cpu); |
---|
93 | 87 | } |
---|
94 | 88 | |
---|
95 | 89 | /* |
---|