Skip to content

Commit a38aa56

Browse files
authored
Merge pull request #1 from xianyi/develop
Update
2 parents 8212472 + 729e925 commit a38aa56

27 files changed

+3307
-82
lines changed

TargetList.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,4 @@ THUNDERX2T99
9494
9.System Z:
9595
ZARCH_GENERIC
9696
Z13
97+
Z14

cpuid_zarch.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,14 @@ void get_cpuconfig(void)
114114
break;
115115
case CPU_Z14:
116116
printf("#define Z14\n");
117+
printf("#define L1_DATA_SIZE 131072\n");
118+
printf("#define L1_DATA_LINESIZE 256\n");
119+
printf("#define L1_DATA_ASSOCIATIVE 8\n");
120+
printf("#define L2_SIZE 4194304\n");
121+
printf("#define L2_LINESIZE 256\n");
122+
printf("#define L2_ASSOCIATIVE 8\n");
117123
printf("#define DTB_DEFAULT_ENTRIES 64\n");
124+
printf("#define DTB_SIZE 4096\n");
118125
break;
119126
}
120127
}

getarch.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,16 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10851085
#define CORENAME "Z13"
10861086
#endif
10871087

1088+
#ifdef FORCE_Z14
1089+
#define FORCE
1090+
#define ARCHITECTURE "ZARCH"
1091+
#define SUBARCHITECTURE "Z14"
1092+
#define ARCHCONFIG "-DZ14 " \
1093+
"-DDTB_DEFAULT_ENTRIES=64"
1094+
#define LIBNAME "z14"
1095+
#define CORENAME "Z14"
1096+
#endif
1097+
10881098
#ifndef FORCE
10891099

10901100
#ifdef USER_TARGET

kernel/Makefile.L3

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ ifeq ($(ARCH), zarch)
4848
USE_TRMM = 1
4949
endif
5050

51+
ifeq ($(CORE), Z14)
52+
USE_TRMM = 1
53+
endif
54+
5155

5256

5357

kernel/power/KERNEL.POWER8

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ CSWAPKERNEL = cswap.c
147147
ZSWAPKERNEL = zswap.c
148148
#
149149

150-
#SGEMVNKERNEL = ../arm/gemv_n.c
150+
SGEMVNKERNEL = sgemv_n.c
151151
DGEMVNKERNEL = dgemv_n.c
152-
#CGEMVNKERNEL = ../arm/zgemv_n.c
152+
CGEMVNKERNEL = cgemv_n.c
153153
ZGEMVNKERNEL = zgemv_n_4.c
154154
#
155-
#SGEMVTKERNEL = ../arm/gemv_t.c
155+
SGEMVTKERNEL = sgemv_t.c
156156
DGEMVTKERNEL = dgemv_t.c
157-
#CGEMVTKERNEL = ../arm/zgemv_t.c
157+
CGEMVTKERNEL = cgemv_t.c
158158
ZGEMVTKERNEL = zgemv_t_4.c
159159

160160

0 commit comments

Comments
 (0)