Merge d122242a1c
into 1da365312a
This commit is contained in:
commit
74b5a2728f
|
@ -17,6 +17,10 @@ ifdef CPUIDEMU
|
||||||
EXFLAGS = -DCPUIDEMU -DVENDOR=99
|
EXFLAGS = -DCPUIDEMU -DVENDOR=99
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(TARGET), 1004K)
|
||||||
|
TARGET_FLAGS = -mips32r2
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGET), P5600)
|
ifeq ($(TARGET), P5600)
|
||||||
TARGET_FLAGS = -mips32r5
|
TARGET_FLAGS = -mips32r5
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -564,6 +564,11 @@ CCOMMON_OPT += -march=mips64
|
||||||
FCOMMON_OPT += -march=mips64
|
FCOMMON_OPT += -march=mips64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CORE), 1004K)
|
||||||
|
CCOMMON_OPT += -mips32r2 $(MSA_FLAGS)
|
||||||
|
FCOMMON_OPT += -mips32r2 $(MSA_FLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(CORE), P5600)
|
ifeq ($(CORE), P5600)
|
||||||
CCOMMON_OPT += -mips32r5 -mnan=2008 -mtune=p5600 $(MSA_FLAGS)
|
CCOMMON_OPT += -mips32r5 -mnan=2008 -mtune=p5600 $(MSA_FLAGS)
|
||||||
FCOMMON_OPT += -mips32r5 -mnan=2008 -mtune=p5600 $(MSA_FLAGS)
|
FCOMMON_OPT += -mips32r5 -mnan=2008 -mtune=p5600 $(MSA_FLAGS)
|
||||||
|
|
48
cpuid_mips.c
48
cpuid_mips.c
|
@ -72,10 +72,16 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
#define CPU_UNKNOWN 0
|
#define CPU_UNKNOWN 0
|
||||||
#define CPU_P5600 1
|
#define CPU_P5600 1
|
||||||
|
#define CPU_LOONGSON3A 2
|
||||||
|
#define CPU_LOONGSON3B 3
|
||||||
|
#define CPU_1004K 4
|
||||||
|
|
||||||
static char *cpuname[] = {
|
static char *cpuname[] = {
|
||||||
"UNKOWN",
|
"UNKOWN",
|
||||||
"P5600"
|
"P5600",
|
||||||
|
"LOONGSON3A",
|
||||||
|
"LOONGSON3B",
|
||||||
|
"1004K"
|
||||||
};
|
};
|
||||||
|
|
||||||
int detect(void){
|
int detect(void){
|
||||||
|
@ -90,7 +96,7 @@ int detect(void){
|
||||||
if (!strncmp("cpu", buffer, 3)){
|
if (!strncmp("cpu", buffer, 3)){
|
||||||
p = strchr(buffer, ':') + 2;
|
p = strchr(buffer, ':') + 2;
|
||||||
#if 0
|
#if 0
|
||||||
fprintf(stderr, "%s\n", p);
|
fprintf(stderr, "%s \n", p);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -115,27 +121,13 @@ int detect(void){
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
if (strstr(p, "loongson3a"))
|
if (strstr(p, "loongson3a"))
|
||||||
return CPU_LOONGSON3A;
|
return CPU_LOONGSON3A;
|
||||||
}else{
|
}else if (strstr(p, "5600")) {
|
||||||
|
return CPU_P5600;
|
||||||
|
} else if (strstr(p, "1004K")) {
|
||||||
|
return CPU_1004K;
|
||||||
|
} else
|
||||||
return CPU_UNKNOWN;
|
return CPU_UNKNOWN;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
//Check model name for Loongson3
|
|
||||||
infile = fopen("/proc/cpuinfo", "r");
|
|
||||||
p = (char *)NULL;
|
|
||||||
while (fgets(buffer, sizeof(buffer), infile)){
|
|
||||||
if (!strncmp("model name", buffer, 10)){
|
|
||||||
p = strchr(buffer, ':') + 2;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fclose(infile);
|
|
||||||
if(p != NULL){
|
|
||||||
if (strstr(p, "Loongson-3A")){
|
|
||||||
return CPU_LOONGSON3A;
|
|
||||||
}else if(strstr(p, "Loongson-3B")){
|
|
||||||
return CPU_LOONGSON3B;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
return CPU_UNKNOWN;
|
return CPU_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
@ -149,7 +141,7 @@ void get_architecture(void){
|
||||||
}
|
}
|
||||||
|
|
||||||
void get_subarchitecture(void){
|
void get_subarchitecture(void){
|
||||||
if(detect()==CPU_P5600){
|
if(detect()==CPU_P5600|| detect()==CPU_1004K){
|
||||||
printf("P5600");
|
printf("P5600");
|
||||||
}else{
|
}else{
|
||||||
printf("UNKNOWN");
|
printf("UNKNOWN");
|
||||||
|
@ -161,7 +153,7 @@ void get_subdirname(void){
|
||||||
}
|
}
|
||||||
|
|
||||||
void get_cpuconfig(void){
|
void get_cpuconfig(void){
|
||||||
if(detect()==CPU_P5600){
|
if(detect()==CPU_P5600 || detect()==CPU_1004K){
|
||||||
printf("#define P5600\n");
|
printf("#define P5600\n");
|
||||||
printf("#define L1_DATA_SIZE 65536\n");
|
printf("#define L1_DATA_SIZE 65536\n");
|
||||||
printf("#define L1_DATA_LINESIZE 32\n");
|
printf("#define L1_DATA_LINESIZE 32\n");
|
||||||
|
@ -170,6 +162,14 @@ void get_cpuconfig(void){
|
||||||
printf("#define DTB_DEFAULT_ENTRIES 64\n");
|
printf("#define DTB_DEFAULT_ENTRIES 64\n");
|
||||||
printf("#define DTB_SIZE 4096\n");
|
printf("#define DTB_SIZE 4096\n");
|
||||||
printf("#define L2_ASSOCIATIVE 8\n");
|
printf("#define L2_ASSOCIATIVE 8\n");
|
||||||
|
} else if (detect()==CPU_1004K) {
|
||||||
|
printf("#define 1004K\n");
|
||||||
|
printf("#define L1_DATA_SIZE 32768\n");
|
||||||
|
printf("#define L1_DATA_LINESIZE 32\n");
|
||||||
|
printf("#define L2_SIZE 26144\n");
|
||||||
|
printf("#define DTB_DEFAULT_ENTRIES 8\n");
|
||||||
|
printf("#define DTB_SIZE 4096\n");
|
||||||
|
printf("#define L2_ASSOCIATIVE 4\n");
|
||||||
}else{
|
}else{
|
||||||
printf("#define UNKNOWN\n");
|
printf("#define UNKNOWN\n");
|
||||||
}
|
}
|
||||||
|
@ -178,6 +178,8 @@ void get_cpuconfig(void){
|
||||||
void get_libname(void){
|
void get_libname(void){
|
||||||
if(detect()==CPU_P5600) {
|
if(detect()==CPU_P5600) {
|
||||||
printf("p5600\n");
|
printf("p5600\n");
|
||||||
|
} else if (detect()==CPU_1004K) {
|
||||||
|
printf("1004K\n");
|
||||||
}else{
|
}else{
|
||||||
printf("mips\n");
|
printf("mips\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
include $(KERNELDIR)/KERNEL.P5600
|
|
@ -38,8 +38,8 @@ ZASUMKERNEL = ../mips/zasum_msa.c
|
||||||
else
|
else
|
||||||
SASUMKERNEL = ../mips/asum.c
|
SASUMKERNEL = ../mips/asum.c
|
||||||
DASUMKERNEL = ../mips/asum.c
|
DASUMKERNEL = ../mips/asum.c
|
||||||
CASUMKERNEL = ../mips/asum.c
|
CASUMKERNEL = ../mips/zasum.c
|
||||||
ZASUMKERNEL = ../mips/asum.c
|
ZASUMKERNEL = ../mips/zasum.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef HAVE_MSA
|
ifdef HAVE_MSA
|
||||||
|
@ -254,3 +254,4 @@ ZTRSMKERNEL_LT = ../generic/trsm_kernel_LT.c
|
||||||
ZTRSMKERNEL_RN = ../generic/trsm_kernel_RN.c
|
ZTRSMKERNEL_RN = ../generic/trsm_kernel_RN.c
|
||||||
ZTRSMKERNEL_RT = ../generic/trsm_kernel_RT.c
|
ZTRSMKERNEL_RT = ../generic/trsm_kernel_RT.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue