Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
99eb45f9
Commit
99eb45f9
authored
Jun 22, 2016
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
c0053bd5
' into omap-for-v4.8/soc
parents
218092af
c0053bd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
5 deletions
+52
-5
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Kconfig
+8
-0
arch/arm/mach-omap2/omap-secure.h
arch/arm/mach-omap2/omap-secure.h
+1
-0
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-omap2/omap-smp.c
+43
-5
No files found.
arch/arm/mach-omap2/Kconfig
View file @
99eb45f9
...
@@ -240,4 +240,12 @@ endmenu
...
@@ -240,4 +240,12 @@ endmenu
endif
endif
config OMAP5_ERRATA_801819
bool "Errata 801819: An eviction from L1 data cache might stall indefinitely"
depends on SOC_OMAP5 || SOC_DRA7XX
help
A livelock can occur in the L2 cache arbitration that might prevent
a snoop from completing. Under certain conditions this can cause the
system to deadlock.
endmenu
endmenu
arch/arm/mach-omap2/omap-secure.h
View file @
99eb45f9
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
#define OMAP5_DRA7_MON_SET_CNTFRQ_INDEX 0x109
#define OMAP5_DRA7_MON_SET_CNTFRQ_INDEX 0x109
#define OMAP5_MON_AMBA_IF_INDEX 0x108
#define OMAP5_MON_AMBA_IF_INDEX 0x108
#define OMAP5_DRA7_MON_SET_ACR_INDEX 0x107
/* Secure PPA(Primary Protected Application) APIs */
/* Secure PPA(Primary Protected Application) APIs */
#define OMAP4_PPA_L2_POR_INDEX 0x23
#define OMAP4_PPA_L2_POR_INDEX 0x23
...
...
arch/arm/mach-omap2/omap-smp.c
View file @
99eb45f9
...
@@ -50,6 +50,39 @@ void __iomem *omap4_get_scu_base(void)
...
@@ -50,6 +50,39 @@ void __iomem *omap4_get_scu_base(void)
return
scu_base
;
return
scu_base
;
}
}
#ifdef CONFIG_OMAP5_ERRATA_801819
void
omap5_erratum_workaround_801819
(
void
)
{
u32
acr
,
revidr
;
u32
acr_mask
;
/* REVIDR[3] indicates erratum fix available on silicon */
asm
volatile
(
"mrc p15, 0, %0, c0, c0, 6"
:
"=r"
(
revidr
));
if
(
revidr
&
(
0x1
<<
3
))
return
;
asm
volatile
(
"mrc p15, 0, %0, c1, c0, 1"
:
"=r"
(
acr
));
/*
* BIT(27) - Disables streaming. All write-allocate lines allocate in
* the L1 or L2 cache.
* BIT(25) - Disables streaming. All write-allocate lines allocate in
* the L1 cache.
*/
acr_mask
=
(
0x3
<<
25
)
|
(
0x3
<<
27
);
/* do we already have it done.. if yes, skip expensive smc */
if
((
acr
&
acr_mask
)
==
acr_mask
)
return
;
acr
|=
acr_mask
;
omap_smc1
(
OMAP5_DRA7_MON_SET_ACR_INDEX
,
acr
);
pr_debug
(
"%s: ARM erratum workaround 801819 applied on CPU%d
\n
"
,
__func__
,
smp_processor_id
());
}
#else
static
inline
void
omap5_erratum_workaround_801819
(
void
)
{
}
#endif
static
void
omap4_secondary_init
(
unsigned
int
cpu
)
static
void
omap4_secondary_init
(
unsigned
int
cpu
)
{
{
/*
/*
...
@@ -64,12 +97,15 @@ static void omap4_secondary_init(unsigned int cpu)
...
@@ -64,12 +97,15 @@ static void omap4_secondary_init(unsigned int cpu)
omap_secure_dispatcher
(
OMAP4_PPA_CPU_ACTRL_SMP_INDEX
,
omap_secure_dispatcher
(
OMAP4_PPA_CPU_ACTRL_SMP_INDEX
,
4
,
0
,
0
,
0
,
0
,
0
);
4
,
0
,
0
,
0
,
0
,
0
);
/*
if
(
soc_is_omap54xx
()
||
soc_is_dra7xx
())
{
* Configure the CNTFRQ register for the secondary cpu's which
/*
* indicates the frequency of the cpu local timers.
* Configure the CNTFRQ register for the secondary cpu's which
*/
* indicates the frequency of the cpu local timers.
if
(
soc_is_omap54xx
()
||
soc_is_dra7xx
())
*/
set_cntfreq
();
set_cntfreq
();
/* Configure ACR to disable streaming WA for 801819 */
omap5_erratum_workaround_801819
();
}
/*
/*
* Synchronise with the boot thread.
* Synchronise with the boot thread.
...
@@ -218,6 +254,8 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
...
@@ -218,6 +254,8 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
if
(
cpu_is_omap446x
())
if
(
cpu_is_omap446x
())
startup_addr
=
omap4460_secondary_startup
;
startup_addr
=
omap4460_secondary_startup
;
if
(
soc_is_dra74x
()
||
soc_is_omap54xx
())
omap5_erratum_workaround_801819
();
/*
/*
* Write the address of secondary startup routine into the
* Write the address of secondary startup routine into the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment