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
nexedi
linux
Commits
97d0b5d0
Commit
97d0b5d0
authored
Jun 10, 2020
by
Vineet Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARCv2: boot log: detect newer/upconing HS3x/HS4x releases
Signed-off-by:
Vineet Gupta
<
vgupta@synopsys.com
>
parent
b7faf971
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
12 deletions
+7
-12
arch/arc/kernel/setup.c
arch/arc/kernel/setup.c
+7
-12
No files found.
arch/arc/kernel/setup.c
View file @
97d0b5d0
...
...
@@ -58,10 +58,12 @@ static const struct id_to_str arc_legacy_rel[] = {
{
0x00
,
NULL
}
};
static
const
struct
id_to_str
arc_
cpu
_rel
[]
=
{
static
const
struct
id_to_str
arc_
hs_ver54
_rel
[]
=
{
/* UARCH.MAJOR, Release */
{
0
,
"R3.10a"
},
{
1
,
"R3.50a"
},
{
2
,
"R3.60a"
},
{
3
,
"R4.00a"
},
{
0xFF
,
NULL
}
};
...
...
@@ -117,12 +119,6 @@ static void decode_arc_core(struct cpuinfo_arc *cpu)
struct
bcr_uarch_build_arcv2
uarch
;
const
struct
id_to_str
*
tbl
;
/*
* Up until (including) the first core4 release (0x54) things were
* simple: AUX IDENTITY.ARCVER was sufficient to identify arc family
* and release: 0x50 to 0x53 was HS38, 0x54 was HS48 (dual issue)
*/
if
(
cpu
->
core
.
family
<
0x54
)
{
/* includes arc700 */
for
(
tbl
=
&
arc_legacy_rel
[
0
];
tbl
->
id
!=
0
;
tbl
++
)
{
...
...
@@ -143,11 +139,10 @@ static void decode_arc_core(struct cpuinfo_arc *cpu)
}
/*
*
However the subsequent HS release (same 0x54) allow HS38 or HS48
*
configurations and encode this info in a different BCR.
*
The BCR was introduced in 0x54 so can't be read unconditionally
.
*
Initial HS cores bumped AUX IDENTITY.ARCVER for each release until
*
ARCVER 0x54 which introduced AUX MICRO_ARCH_BUILD and subsequent
*
releases only update it
.
*/
READ_BCR
(
ARC_REG_MICRO_ARCH_BCR
,
uarch
);
if
(
uarch
.
prod
==
4
)
{
...
...
@@ -158,7 +153,7 @@ static void decode_arc_core(struct cpuinfo_arc *cpu)
cpu
->
name
=
"HS38"
;
}
for
(
tbl
=
&
arc_
cpu
_rel
[
0
];
tbl
->
id
!=
0xFF
;
tbl
++
)
{
for
(
tbl
=
&
arc_
hs_ver54
_rel
[
0
];
tbl
->
id
!=
0xFF
;
tbl
++
)
{
if
(
uarch
.
maj
==
tbl
->
id
)
{
cpu
->
release
=
tbl
->
str
;
break
;
...
...
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