Skip to content

Exynos 5422 patch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SusannaMaria wants to merge 2 commits into
base: rtxen-v2.2-full-feature
Choose a base branch
from
Open

Exynos 5422 patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d718d7f
Apply patch https://github.com/bkrepo/xen/commit/8d56205455a4a1e02334…
SusannaMaria Dec 4, 2015
6a392a2
fixing type cast error in xen/common/sched_rt.c
SusannaMaria Dec 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion xen/arch/arm/platforms/exynos5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ static void exynos_cpu_power_up(void __iomem *power, int cpu)

static int exynos5_cpu_power_up(void __iomem *power, int cpu)
{
unsigned int timeout;
unsigned int timeout, val;

cpu = (cpu + 4) % 8; // logical mapping for EXYNOS5422 cores
if ( !exynos_cpu_power_state(power, cpu) )
{
exynos_cpu_power_up(power, cpu);
Expand All @@ -187,6 +188,19 @@ static int exynos5_cpu_power_up(void __iomem *power, int cpu)
return -ETIMEDOUT;
}
}

cpu = (cpu + 4) % 8; // logical mapping for EXYNOS5422 cores
if ( cpu < 4 )
{
while (!__raw_readl(power + EXYNOS5_PMU_SPARE2))
udelay(10);

udelay(10);

val = ((1 << 20) | (1 << 8)) << cpu;
__raw_writel(val, power + EXYNOS5_SWRESET);
}

return 0;
}

Expand Down Expand Up @@ -298,6 +312,7 @@ static const char * const exynos5250_dt_compat[] __initconst =
static const char * const exynos5_dt_compat[] __initconst =
{
"samsung,exynos5410",
"samsung,exynos5422",
NULL
};

Expand Down
7 changes: 6 additions & 1 deletion xen/arch/arm/traps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
#include <asm/gic.h>
#include <asm/vgic.h>

#include <asm/processor.h>

/* The base of the stack must always be double-word aligned, which means
* that both the kernel half of struct cpu_user_regs (which is pushed in
* entry.S) and struct cpu_info (which lives at the bottom of a Xen
Expand Down Expand Up @@ -2523,7 +2525,10 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs)
*/
GUEST_BUG_ON(!psr_mode_is_32bit(regs->cpsr));
perfc_incr(trap_smc32);
inject_undef32_exception(regs);
if (current->domain->domain_id == 0)
call_smc(regs->r0, regs->r1, regs->r2, regs->r3);
else
inject_undef32_exception(regs);
break;
case HSR_EC_HVC32:
GUEST_BUG_ON(!psr_mode_is_32bit(regs->cpsr));
Expand Down
2 changes: 1 addition & 1 deletion xen/common/sched_rt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ rt_dom_cntl(
budget < MICROSECS(10) || budget > period )
{
printk("RTDS: period (%ld) or budget (%ld) is invalid",
period, budget);
(long int) period, (long int) budget);
rc = -EINVAL;
break;
}
Expand Down
1 change: 1 addition & 0 deletions xen/include/asm-arm/platforms/exynos5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define EXYNOS5_PA_TIMER 0x12dd0000

#define EXYNOS5_SWRESET 0x0400 /* Relative to PA_PMU */
#define EXYNOS5_PMU_SPARE2 0x0908

#endif /* __ASM_ARM_PLATFORMS_EXYNOS5_H */
/*
Expand Down