iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SoCFPGA fix for v5.16

Browse Source 
- Fix crash when CONFIG_FORTIRY_SOURCE is enabled
 -----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEEoHhMeiyk5VmwVMwNGZQEC4GjKPQFAmGXwFUUHGRpbmd1eWVu
 QGtlcm5lbC5vcmcACgkQGZQEC4GjKPSzJw/+Jop5K/RUfLW1rypHZAP3EZusxAg2
 RfBmzpaEH1DcXj/qbLZD+tC85p2UrY60U7kySOpoJ9w6n1gAJ20lvmPXAiTsArYY
 S5DBa8zQgsAHXWjNx/7yH0ewNOW8KBTcmg+89lTB93uDXnDxWsbraMShizMDCpcm
 jTrq/KvrJU/4DLVv1X1ZIjfQIJ7V9DPUzSCcyvaFHAKs7Qll1qGxRI9ZCMa9p7u2
 UIZ4Y/T6AVnaPA/SeQJPEdN1aZd3N85xNCxfFZ91PX5zo1qQVKoH044nfJvcI+h0
 YnEiMZ3my8ps7pWE5btlYzi3ddTgpcdMlXRfQiFdgUyrmNeGJdbb5jG08U2Wv7F+
 2mhTnPEAjA/lyYt2QXdGxb2pl/o/0TkExWbqRgU6N07uRnu0vm4LE2l02HOlfScw
 41Es9wnbSp5tFATf6Zskn8VZmBUlv29r1B4na5lRT/f7HC5+1wfkzTEsnuNGAYdH
 TPdKsM/5wR7cU+M+vK6EA3y7DjTokYVlPQeWkuC4OWotQUEyaLXwuopBgPEjZwrQ
 QcVUvEcg2GjAtfOcCP9hQ4JLhmu+E7YxRkwtlU9sPgPUAyJXYSaj+ZC+mkV4VPiW
 b0LmRcuWRZZHkBtzTQ3ddqRuASBHi97hVbEGbSvyjM/oGiTMfOyMVWfpPbL3PnQF
 15qJsU38XYMGkFg=
 =cWCT
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmGbc+cACgkQmmx57+YA
 GNlJMA/8D5ljOsr1Ep3XnS9tc90bcClFSy9KYSfh9KCTDONT5IAd/vp1ogwnjIp8
 77uesKyXWpt9RQpEsdY3eUCBpltpTnEFoZJL2LHFP1h/UdvkkWMDCZlnA6gtGtTl
 p8tHtd8u0YQhVo6FLvWqM63JkLf6+d3Aqwd/mFTQue3U9+mf0YpOV6NTiM/u2D/7
 EJsor/v1evV1PgK/X5biaethiulPKuHCD8l4x6L/Ts+WvLUnLNWDtYb1gDc6Y2fP
 z26ksSKxtg2ehmnm5ikgS6OcFT65qN3f447y9zlunMkMrn0bBAgx5+Ov5O5mYhfA
 0eL4m1HlM1mJxPUxssBO4PmMyXLRkQ0WPwidqXwB/gSl9oXxEcSeAs0rBM82WNPg
 4iAzfYC1ot2O9QbvO7Nc46noAvxh4w2l0YHsfZQWgJOE5pzk3U+BaH0a3M5OSiZi
 gQ/hFeb6gZlPESJa+TVh5ChaX+AgygYUXhUZiMwhZECaw9KnhF+MDwNUcci0AVaM
 U3GrSDrzXvgchG5pUgbXlYTdaQ9WY5JoYLnpkAk9Svyrykc5yzt8qeD9dON0daON
 kh6n+ZCBIb40AxaAgDxTEYaHzcMXWH5fjtcoKQti1sxPy/btBTqNpRaS/vpGdK2v
 kOSLZek02zH+WK8xNCk8UK8ewLpCtCFE++qNM74zFVrGMYpdQDY=
 =0xm1
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-11-22 11:41:42 +01:00
commit 4fd932a725
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-socfpga/core.h
View File

@ -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;

8
arch/arm/mach-socfpga/platsmp.c
View File

@ -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));