mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2026-01-24 17:29:05 +00:00
Pull ARM updates from Russell King:
"Included in this update:
- perf updates from Will Deacon:
The main changes are callchain stability fixes from Jean Pihet and
event mapping and PMU name rework from Mark Rutland
The latter is preparatory work for enabling some code re-use with
arm64 in the future.
- updates for nommu from Uwe Kleine-König:
Two different fixes for the same problem making some ARM nommu
configurations not boot since 3.6-rc1. The problem is that
user_addr_max returned the biggest available RAM address which
makes some copy_from_user variants fail to read from XIP memory.
- deprecate legacy OMAP DMA API, in preparation for it's removal.
The popular drivers have been converted over, leaving a very small
number of rarely used drivers, which hopefully can be converted
during the next cycle with a bit more visibility (and hopefully
people popping out of the woodwork to help test)
- more tweaks for BE systems, particularly with the kernel image
format. In connection with this, I've cleaned up the way we
generate the linker script for the decompressor.
- removal of hard-coded assumptions of the kernel stack size, making
everywhere depend on the value of THREAD_SIZE_ORDER.
- MCPM updates from Nicolas Pitre.
- Make it easier for proper CPU part number checks (which should
always include the vendor field).
- Assembly code optimisation - use the "bx" instruction when
returning from a function on ARMv6+ rather than "mov pc, reg".
- Save the last kernel misaligned fault location and report it via
the procfs alignment file.
- Clean up the way we create the initial stack frame, which is a
repeated pattern in several different locations.
- Support for 8-byte get_user(), needed for some DRM implementations.
- mcs locking from Will Deacon.
- Save and restore a few more Cortex-A9 registers (for errata
workarounds)
- Fix various aspects of the SWP emulation, and the ELF hwcap for the
SWP instruction.
- Update LPAE logic for pte_write and pmd_write to make it more
correct.
- Support for Broadcom Brahma15 CPU cores.
- ARM assembly crypto updates from Ard Biesheuvel"
* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (53 commits)
ARM: add comments to the early page table remap code
ARM: 8122/1: smp_scu: enable SCU standby support
ARM: 8121/1: smp_scu: use macro for SCU enable bit
ARM: 8120/1: crypto: sha512: add ARM NEON implementation
ARM: 8119/1: crypto: sha1: add ARM NEON implementation
ARM: 8118/1: crypto: sha1/make use of common SHA-1 structures
ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>
ARM: 8111/1: Enable erratum 798181 for Broadcom Brahma-B15
ARM: 8110/1: do CPU-specific init for Broadcom Brahma15 cores
ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE
ARM: 8108/1: mm: Introduce {pte,pmd}_isset and {pte,pmd}_isclear
ARM: hwcap: disable HWCAP_SWP if the CPU advertises it has exclusives
ARM: SWP emulation: only initialise on ARMv7 CPUs
ARM: SWP emulation: always enable when SMP is enabled
ARM: 8103/1: save/restore Cortex-A9 CP15 registers on suspend/resume
ARM: 8098/1: mcs lock: implement wfe-based polling for MCS locking
ARM: 8091/2: add get_user() support for 8 byte types
ARM: 8097/1: unistd.h: relocate comments back to place
ARM: 8096/1: Describe required sort order for textofs-y (TEXT_OFFSET)
ARM: 8090/1: add revision info for PL310 errata 588369 and 727915
...
263 lines
6.0 KiB
C
263 lines
6.0 KiB
C
/* linux/arch/arm/mach-exynos4/platsmp.c
|
|
*
|
|
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com
|
|
*
|
|
* Cloned from linux/arch/arm/mach-vexpress/platsmp.c
|
|
*
|
|
* Copyright (C) 2002 ARM Ltd.
|
|
* All Rights Reserved
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/device.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of_address.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/firmware.h>
|
|
|
|
#include "common.h"
|
|
#include "regs-pmu.h"
|
|
|
|
extern void exynos4_secondary_startup(void);
|
|
|
|
static inline void __iomem *cpu_boot_reg_base(void)
|
|
{
|
|
if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
|
|
return S5P_INFORM5;
|
|
return sysram_base_addr;
|
|
}
|
|
|
|
static inline void __iomem *cpu_boot_reg(int cpu)
|
|
{
|
|
void __iomem *boot_reg;
|
|
|
|
boot_reg = cpu_boot_reg_base();
|
|
if (!boot_reg)
|
|
return ERR_PTR(-ENODEV);
|
|
if (soc_is_exynos4412())
|
|
boot_reg += 4*cpu;
|
|
else if (soc_is_exynos5420() || soc_is_exynos5800())
|
|
boot_reg += 4;
|
|
return boot_reg;
|
|
}
|
|
|
|
/*
|
|
* Write pen_release in a way that is guaranteed to be visible to all
|
|
* observers, irrespective of whether they're taking part in coherency
|
|
* or not. This is necessary for the hotplug code to work reliably.
|
|
*/
|
|
static void write_pen_release(int val)
|
|
{
|
|
pen_release = val;
|
|
smp_wmb();
|
|
sync_cache_w(&pen_release);
|
|
}
|
|
|
|
static void __iomem *scu_base_addr(void)
|
|
{
|
|
return (void __iomem *)(S5P_VA_SCU);
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(boot_lock);
|
|
|
|
static void exynos_secondary_init(unsigned int cpu)
|
|
{
|
|
/*
|
|
* let the primary processor know we're out of the
|
|
* pen, then head off into the C entry point
|
|
*/
|
|
write_pen_release(-1);
|
|
|
|
/*
|
|
* Synchronise with the boot thread.
|
|
*/
|
|
spin_lock(&boot_lock);
|
|
spin_unlock(&boot_lock);
|
|
}
|
|
|
|
static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
unsigned long timeout;
|
|
u32 mpidr = cpu_logical_map(cpu);
|
|
u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
|
int ret = -ENOSYS;
|
|
|
|
/*
|
|
* Set synchronisation state between this boot processor
|
|
* and the secondary one
|
|
*/
|
|
spin_lock(&boot_lock);
|
|
|
|
/*
|
|
* The secondary processor is waiting to be released from
|
|
* the holding pen - release it, then wait for it to flag
|
|
* that it has been released by resetting pen_release.
|
|
*
|
|
* Note that "pen_release" is the hardware CPU core ID, whereas
|
|
* "cpu" is Linux's internal ID.
|
|
*/
|
|
write_pen_release(core_id);
|
|
|
|
if (!exynos_cpu_power_state(core_id)) {
|
|
exynos_cpu_power_up(core_id);
|
|
timeout = 10;
|
|
|
|
/* wait max 10 ms until cpu1 is on */
|
|
while (exynos_cpu_power_state(core_id)
|
|
!= S5P_CORE_LOCAL_PWR_EN) {
|
|
if (timeout-- == 0)
|
|
break;
|
|
|
|
mdelay(1);
|
|
}
|
|
|
|
if (timeout == 0) {
|
|
printk(KERN_ERR "cpu1 power enable failed");
|
|
spin_unlock(&boot_lock);
|
|
return -ETIMEDOUT;
|
|
}
|
|
}
|
|
/*
|
|
* Send the secondary CPU a soft interrupt, thereby causing
|
|
* the boot monitor to read the system wide flags register,
|
|
* and branch to the address found there.
|
|
*/
|
|
|
|
timeout = jiffies + (1 * HZ);
|
|
while (time_before(jiffies, timeout)) {
|
|
unsigned long boot_addr;
|
|
|
|
smp_rmb();
|
|
|
|
boot_addr = virt_to_phys(exynos4_secondary_startup);
|
|
|
|
/*
|
|
* Try to set boot address using firmware first
|
|
* and fall back to boot register if it fails.
|
|
*/
|
|
ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr);
|
|
if (ret && ret != -ENOSYS)
|
|
goto fail;
|
|
if (ret == -ENOSYS) {
|
|
void __iomem *boot_reg = cpu_boot_reg(core_id);
|
|
|
|
if (IS_ERR(boot_reg)) {
|
|
ret = PTR_ERR(boot_reg);
|
|
goto fail;
|
|
}
|
|
__raw_writel(boot_addr, cpu_boot_reg(core_id));
|
|
}
|
|
|
|
call_firmware_op(cpu_boot, core_id);
|
|
|
|
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
|
|
|
|
if (pen_release == -1)
|
|
break;
|
|
|
|
udelay(10);
|
|
}
|
|
|
|
/*
|
|
* now the secondary core is starting up let it run its
|
|
* calibrations, then wait for it to finish
|
|
*/
|
|
fail:
|
|
spin_unlock(&boot_lock);
|
|
|
|
return pen_release != -1 ? ret : 0;
|
|
}
|
|
|
|
/*
|
|
* Initialise the CPU possible map early - this describes the CPUs
|
|
* which may be present or become present in the system.
|
|
*/
|
|
|
|
static void __init exynos_smp_init_cpus(void)
|
|
{
|
|
void __iomem *scu_base = scu_base_addr();
|
|
unsigned int i, ncores;
|
|
|
|
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
|
|
ncores = scu_base ? scu_get_core_count(scu_base) : 1;
|
|
else
|
|
/*
|
|
* CPU Nodes are passed thru DT and set_cpu_possible
|
|
* is set by "arm_dt_init_cpu_maps".
|
|
*/
|
|
return;
|
|
|
|
/* sanity check */
|
|
if (ncores > nr_cpu_ids) {
|
|
pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
|
|
ncores, nr_cpu_ids);
|
|
ncores = nr_cpu_ids;
|
|
}
|
|
|
|
for (i = 0; i < ncores; i++)
|
|
set_cpu_possible(i, true);
|
|
}
|
|
|
|
static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
int i;
|
|
|
|
exynos_sysram_init();
|
|
|
|
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
|
|
scu_enable(scu_base_addr());
|
|
|
|
/*
|
|
* Write the address of secondary startup into the
|
|
* system-wide flags register. The boot monitor waits
|
|
* until it receives a soft interrupt, and then the
|
|
* secondary CPU branches to this address.
|
|
*
|
|
* Try using firmware operation first and fall back to
|
|
* boot register if it fails.
|
|
*/
|
|
for (i = 1; i < max_cpus; ++i) {
|
|
unsigned long boot_addr;
|
|
u32 mpidr;
|
|
u32 core_id;
|
|
int ret;
|
|
|
|
mpidr = cpu_logical_map(i);
|
|
core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
|
boot_addr = virt_to_phys(exynos4_secondary_startup);
|
|
|
|
ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr);
|
|
if (ret && ret != -ENOSYS)
|
|
break;
|
|
if (ret == -ENOSYS) {
|
|
void __iomem *boot_reg = cpu_boot_reg(core_id);
|
|
|
|
if (IS_ERR(boot_reg))
|
|
break;
|
|
__raw_writel(boot_addr, cpu_boot_reg(core_id));
|
|
}
|
|
}
|
|
}
|
|
|
|
struct smp_operations exynos_smp_ops __initdata = {
|
|
.smp_init_cpus = exynos_smp_init_cpus,
|
|
.smp_prepare_cpus = exynos_smp_prepare_cpus,
|
|
.smp_secondary_init = exynos_secondary_init,
|
|
.smp_boot_secondary = exynos_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = exynos_cpu_die,
|
|
#endif
|
|
};
|