|
From: <sv...@va...> - 2014-01-29 15:58:19
|
Author: petarj
Date: Wed Jan 29 15:58:09 2014
New Revision: 13782
Log:
mips64: detect Cavium Octeon II in mips_features
Detect Cavium Octeon II CPU. This is needed as a prerequisite for
successful execution of cavium-octeon2 specific tests.
Patch by Zahid Anwar.
Related to Bugzilla issue 326444.
Modified:
trunk/tests/mips_features.c
Modified: trunk/tests/mips_features.c
==============================================================================
--- trunk/tests/mips_features.c (original)
+++ trunk/tests/mips_features.c Wed Jan 29 15:58:09 2014
@@ -47,7 +47,7 @@
static int go(char *feature)
{
int cpuinfo;
- if ( (strcmp(feature, "mips32-dsp") == 0)) {
+ if (strcmp(feature, "mips32-dsp") == 0) {
const char *dsp = "dsp";
cpuinfo = mipsCPUInfo(dsp);
if (cpuinfo == 1) {
@@ -55,7 +55,7 @@
} else{
return FEATURE_NOT_PRESENT;
}
- } else if ((strcmp(feature, "mips32-dspr2") == 0)) {
+ } else if (strcmp(feature, "mips32-dspr2") == 0) {
const char *dsp2 = "dsp2";
cpuinfo = mipsCPUInfo(dsp2);
if (cpuinfo == 1) {
@@ -63,7 +63,7 @@
} else{
return FEATURE_NOT_PRESENT;
}
- } else if ((strcmp(feature, "cavium-octeon") == 0)) {
+ } else if (strcmp(feature, "cavium-octeon") == 0) {
const char *cavium = "Cavium Octeon";
cpuinfo = mipsCPUInfo(cavium);
if (cpuinfo == 1) {
@@ -71,6 +71,14 @@
} else{
return FEATURE_NOT_PRESENT;
}
+ } else if (strcmp(feature, "cavium-octeon2") == 0) {
+ const char *cavium2 = "Cavium Octeon II";
+ cpuinfo = mipsCPUInfo(cavium2);
+ if (cpuinfo == 1) {
+ return FEATURE_PRESENT;
+ } else{
+ return FEATURE_NOT_PRESENT;
+ }
} else {
return UNRECOGNISED_FEATURE;
}
|