111077SCurtis.Dunham@arm.com# Add all ARMv8 state 211077SCurtis.Dunham@arm.comdef upgrader(cpt): 311077SCurtis.Dunham@arm.com if cpt.get('root','isa') != 'arm': 411077SCurtis.Dunham@arm.com return 511077SCurtis.Dunham@arm.com import re 611077SCurtis.Dunham@arm.com print "Warning: The size of the FP register file has changed. "\ 711077SCurtis.Dunham@arm.com "To get similar results you need to adjust the number of "\ 811077SCurtis.Dunham@arm.com "physical registers in the CPU you're restoring into by "\ 911077SCurtis.Dunham@arm.com "NNNN." 1011077SCurtis.Dunham@arm.com # Find the CPU context's and upgrade their registers 1111077SCurtis.Dunham@arm.com for sec in cpt.sections(): 1211077SCurtis.Dunham@arm.com re_xc_match = re.match('^.*?sys.*?\.cpu(\d+)*\.xc\.*', sec) 1311077SCurtis.Dunham@arm.com if not re_xc_match: 1411077SCurtis.Dunham@arm.com continue 1511077SCurtis.Dunham@arm.com 1611077SCurtis.Dunham@arm.com # Update floating point regs 1711077SCurtis.Dunham@arm.com fpr = cpt.get(sec, 'floatRegs.i').split() 1811077SCurtis.Dunham@arm.com # v8 has 128 normal fp and 32 special fp regs compared 1911077SCurtis.Dunham@arm.com # to v7's 64 normal fp and 8 special fp regs. 2011077SCurtis.Dunham@arm.com # Insert the extra normal fp registers at end of v7 normal fp regs 2111077SCurtis.Dunham@arm.com for x in xrange(64): 2211077SCurtis.Dunham@arm.com fpr.insert(64, "0") 2311077SCurtis.Dunham@arm.com # Append the extra special registers 2411077SCurtis.Dunham@arm.com for x in xrange(24): 2511077SCurtis.Dunham@arm.com fpr.append("0") 2611077SCurtis.Dunham@arm.com cpt.set(sec, 'floatRegs.i', ' '.join(str(x) for x in fpr)) 2711077SCurtis.Dunham@arm.com 2811077SCurtis.Dunham@arm.com ir = cpt.get(sec, 'intRegs').split() 2911077SCurtis.Dunham@arm.com # Add in v8 int reg state 3011077SCurtis.Dunham@arm.com # Splice in R13_HYP 3111077SCurtis.Dunham@arm.com ir.insert(20, "0") 3211077SCurtis.Dunham@arm.com # Splice in INTREG_DUMMY and SP0 - SP3 3311077SCurtis.Dunham@arm.com ir.extend(["0", "0", "0", "0", "0"]) 3411077SCurtis.Dunham@arm.com cpt.set(sec, 'intRegs', ' '.join(str(x) for x in ir)) 3511077SCurtis.Dunham@arm.com 3611077SCurtis.Dunham@arm.com # Update the cpu interrupt field 3711077SCurtis.Dunham@arm.com for sec in cpt.sections(): 3811077SCurtis.Dunham@arm.com re_int_match = re.match("^.*?sys.*?\.cpu(\d+)*$", sec) 3911077SCurtis.Dunham@arm.com if not re_int_match: 4011077SCurtis.Dunham@arm.com continue 4111077SCurtis.Dunham@arm.com 4211077SCurtis.Dunham@arm.com irqs = cpt.get(sec, "interrupts").split() 4311077SCurtis.Dunham@arm.com irqs.append("false") 4411077SCurtis.Dunham@arm.com irqs.append("false") 4511077SCurtis.Dunham@arm.com cpt.set(sec, "interrupts", ' '.join(str(x) for x in irqs)) 4611077SCurtis.Dunham@arm.com 4711077SCurtis.Dunham@arm.com # Update the per cpu interrupt structure 4811077SCurtis.Dunham@arm.com for sec in cpt.sections(): 4911077SCurtis.Dunham@arm.com re_int_match = re.match("^.*?sys.*?\.cpu(\d+)*\.interrupts$", sec) 5011077SCurtis.Dunham@arm.com if not re_int_match: 5111077SCurtis.Dunham@arm.com continue 5211077SCurtis.Dunham@arm.com 5311077SCurtis.Dunham@arm.com irqs = cpt.get(sec, "interrupts").split() 5411077SCurtis.Dunham@arm.com irqs.append("false") 5511077SCurtis.Dunham@arm.com irqs.append("false") 5611077SCurtis.Dunham@arm.com cpt.set(sec, "interrupts", ' '.join(str(x) for x in irqs)) 5711077SCurtis.Dunham@arm.com 5811077SCurtis.Dunham@arm.com # Update the misc regs and add in new isa specific fields 5911077SCurtis.Dunham@arm.com for sec in cpt.sections(): 6011077SCurtis.Dunham@arm.com re_isa_match = re.match("^.*?sys.*?\.cpu(\d+)*\.isa$", sec) 6111077SCurtis.Dunham@arm.com if not re_isa_match: 6211077SCurtis.Dunham@arm.com continue 6311077SCurtis.Dunham@arm.com 6411077SCurtis.Dunham@arm.com cpt.set(sec, 'haveSecurity', 'false') 6511077SCurtis.Dunham@arm.com cpt.set(sec, 'haveLPAE', 'false') 6611077SCurtis.Dunham@arm.com cpt.set(sec, 'haveVirtualization', 'false') 6711077SCurtis.Dunham@arm.com cpt.set(sec, 'haveLargeAsid64', 'false') 6811077SCurtis.Dunham@arm.com cpt.set(sec, 'physAddrRange64', '40') 6911077SCurtis.Dunham@arm.com 7011077SCurtis.Dunham@arm.com # splice in the new misc registers, ~200 -> 605 registers, 7111077SCurtis.Dunham@arm.com # ordering does not remain consistent 7211077SCurtis.Dunham@arm.com mr_old = cpt.get(sec, 'miscRegs').split() 7311077SCurtis.Dunham@arm.com mr_new = [ '0' for x in xrange(605) ] 7411077SCurtis.Dunham@arm.com 7511077SCurtis.Dunham@arm.com # map old v7 miscRegs to new v8 miscRegs 7611077SCurtis.Dunham@arm.com mr_new[0] = mr_old[0] # CPSR 7711077SCurtis.Dunham@arm.com mr_new[16] = mr_old[1] # CPSR_Q 7811077SCurtis.Dunham@arm.com mr_new[1] = mr_old[2] # SPSR 7911077SCurtis.Dunham@arm.com mr_new[2] = mr_old[3] # SPSR_FIQ 8011077SCurtis.Dunham@arm.com mr_new[3] = mr_old[4] # SPSR_IRQ 8111077SCurtis.Dunham@arm.com mr_new[4] = mr_old[5] # SPSR_SVC 8211077SCurtis.Dunham@arm.com mr_new[5] = mr_old[6] # SPSR_MON 8311077SCurtis.Dunham@arm.com mr_new[8] = mr_old[7] # SPSR_UND 8411077SCurtis.Dunham@arm.com mr_new[6] = mr_old[8] # SPSR_ABT 8511077SCurtis.Dunham@arm.com mr_new[432] = mr_old[9] # FPSR 8611077SCurtis.Dunham@arm.com mr_new[10] = mr_old[10] # FPSID 8711077SCurtis.Dunham@arm.com mr_new[11] = mr_old[11] # FPSCR 8811077SCurtis.Dunham@arm.com mr_new[18] = mr_old[12] # FPSCR_QC 8911077SCurtis.Dunham@arm.com mr_new[17] = mr_old[13] # FPSCR_EXC 9011077SCurtis.Dunham@arm.com mr_new[14] = mr_old[14] # FPEXC 9111077SCurtis.Dunham@arm.com mr_new[13] = mr_old[15] # MVFR0 9211077SCurtis.Dunham@arm.com mr_new[12] = mr_old[16] # MVFR1 9311077SCurtis.Dunham@arm.com mr_new[28] = mr_old[17] # SCTLR_RST, 9411077SCurtis.Dunham@arm.com mr_new[29] = mr_old[18] # SEV_MAILBOX, 9511077SCurtis.Dunham@arm.com mr_new[30] = mr_old[19] # DBGDIDR 9611077SCurtis.Dunham@arm.com mr_new[31] = mr_old[20] # DBGDSCR_INT, 9711077SCurtis.Dunham@arm.com mr_new[33] = mr_old[21] # DBGDTRRX_INT, 9811077SCurtis.Dunham@arm.com mr_new[34] = mr_old[22] # DBGTRTX_INT, 9911077SCurtis.Dunham@arm.com mr_new[35] = mr_old[23] # DBGWFAR, 10011077SCurtis.Dunham@arm.com mr_new[36] = mr_old[24] # DBGVCR, 10111077SCurtis.Dunham@arm.com #mr_new[] = mr_old[25] # DBGECR -> UNUSED, 10211077SCurtis.Dunham@arm.com #mr_new[] = mr_old[26] # DBGDSCCR -> UNUSED, 10311077SCurtis.Dunham@arm.com #mr_new[] = mr_old[27] # DBGSMCR -> UNUSED, 10411077SCurtis.Dunham@arm.com mr_new[37] = mr_old[28] # DBGDTRRX_EXT, 10511077SCurtis.Dunham@arm.com mr_new[38] = mr_old[29] # DBGDSCR_EXT, 10611077SCurtis.Dunham@arm.com mr_new[39] = mr_old[30] # DBGDTRTX_EXT, 10711077SCurtis.Dunham@arm.com #mr_new[] = mr_old[31] # DBGDRCR -> UNUSED, 10811077SCurtis.Dunham@arm.com mr_new[41] = mr_old[32] # DBGBVR, 10911077SCurtis.Dunham@arm.com mr_new[47] = mr_old[33] # DBGBCR, 11011077SCurtis.Dunham@arm.com #mr_new[] = mr_old[34] # DBGBVR_M -> UNUSED, 11111077SCurtis.Dunham@arm.com #mr_new[] = mr_old[35] # DBGBCR_M -> UNUSED, 11211077SCurtis.Dunham@arm.com mr_new[61] = mr_old[36] # DBGDRAR, 11311077SCurtis.Dunham@arm.com #mr_new[] = mr_old[37] # DBGBXVR_M -> UNUSED, 11411077SCurtis.Dunham@arm.com mr_new[64] = mr_old[38] # DBGOSLAR, 11511077SCurtis.Dunham@arm.com #mr_new[] = mr_old[39] # DBGOSSRR -> UNUSED, 11611077SCurtis.Dunham@arm.com mr_new[66] = mr_old[40] # DBGOSDLR, 11711077SCurtis.Dunham@arm.com mr_new[67] = mr_old[41] # DBGPRCR, 11811077SCurtis.Dunham@arm.com #mr_new[] = mr_old[42] # DBGPRSR -> UNUSED, 11911077SCurtis.Dunham@arm.com mr_new[68] = mr_old[43] # DBGDSAR, 12011077SCurtis.Dunham@arm.com #mr_new[] = mr_old[44] # DBGITCTRL -> UNUSED, 12111077SCurtis.Dunham@arm.com mr_new[69] = mr_old[45] # DBGCLAIMSET, 12211077SCurtis.Dunham@arm.com mr_new[70] = mr_old[46] # DBGCLAIMCLR, 12311077SCurtis.Dunham@arm.com mr_new[71] = mr_old[47] # DBGAUTHSTATUS, 12411077SCurtis.Dunham@arm.com mr_new[72] = mr_old[48] # DBGDEVID2, 12511077SCurtis.Dunham@arm.com mr_new[73] = mr_old[49] # DBGDEVID1, 12611077SCurtis.Dunham@arm.com mr_new[74] = mr_old[50] # DBGDEVID, 12711077SCurtis.Dunham@arm.com mr_new[77] = mr_old[51] # TEEHBR, 12811077SCurtis.Dunham@arm.com mr_new[109] = mr_old[52] # v7 SCTLR -> aarc32 SCTLR_NS 12911077SCurtis.Dunham@arm.com mr_new[189] = mr_old[53] # DCCISW, 13011077SCurtis.Dunham@arm.com mr_new[188] = mr_old[54] # DCCIMVAC, 13111077SCurtis.Dunham@arm.com mr_new[183] = mr_old[55] # DCCMVAC, 13211077SCurtis.Dunham@arm.com mr_new[271] = mr_old[56] # v7 CONTEXTIDR -> aarch32 CONTEXTIDR_NS, 13311077SCurtis.Dunham@arm.com mr_new[274] = mr_old[57] # v7 TPIDRURW -> aarch32 TPIDRURW_NS, 13411077SCurtis.Dunham@arm.com mr_new[277] = mr_old[58] # v7 TPIDRURO -> aarch32 TPIDRURO_NS, 13511077SCurtis.Dunham@arm.com mr_new[280] = mr_old[59] # v7 TPIDRPRW -> aarch32 TPIDRPRW_NS, 13611077SCurtis.Dunham@arm.com mr_new[170] = mr_old[60] # CP15ISB, 13711077SCurtis.Dunham@arm.com mr_new[185] = mr_old[61] # CP15DSB, 13811077SCurtis.Dunham@arm.com mr_new[186] = mr_old[62] # CP15DMB, 13911077SCurtis.Dunham@arm.com mr_new[114] = mr_old[63] # CPACR, 14011077SCurtis.Dunham@arm.com mr_new[101] = mr_old[64] # CLIDR, 14111077SCurtis.Dunham@arm.com mr_new[100] = mr_old[65] # CCSIDR, 14211077SCurtis.Dunham@arm.com mr_new[104] = mr_old[66] # v7 CSSELR -> aarch32 CSSELR_NS, 14311077SCurtis.Dunham@arm.com mr_new[163] = mr_old[67] # ICIALLUIS, 14411077SCurtis.Dunham@arm.com mr_new[168] = mr_old[68] # ICIALLU, 14511077SCurtis.Dunham@arm.com mr_new[169] = mr_old[69] # ICIMVAU, 14611077SCurtis.Dunham@arm.com mr_new[172] = mr_old[70] # BPIMVA, 14711077SCurtis.Dunham@arm.com mr_new[164] = mr_old[71] # BPIALLIS, 14811077SCurtis.Dunham@arm.com mr_new[171] = mr_old[72] # BPIALL, 14911077SCurtis.Dunham@arm.com mr_new[80] = mr_old[73] # MIDR, 15011077SCurtis.Dunham@arm.com mr_new[126] = mr_old[74] # v7 TTBR0 -> aarch32 TTBR0_NS, 15111077SCurtis.Dunham@arm.com mr_new[129] = mr_old[75] # v7 TTBR1 -> aarch32 TTBR1_NS, 15211077SCurtis.Dunham@arm.com mr_new[83] = mr_old[76] # TLBTR, 15311077SCurtis.Dunham@arm.com mr_new[137] = mr_old[77] # v7 DACR -> aarch32 DACR_NS, 15411077SCurtis.Dunham@arm.com mr_new[192] = mr_old[78] # TLBIALLIS, 15511077SCurtis.Dunham@arm.com mr_new[193] = mr_old[79] # TLBIMVAIS, 15611077SCurtis.Dunham@arm.com mr_new[194] = mr_old[80] # TLBIASIDIS, 15711077SCurtis.Dunham@arm.com mr_new[195] = mr_old[81] # TLBIMVAAIS, 15811077SCurtis.Dunham@arm.com mr_new[198] = mr_old[82] # ITLBIALL, 15911077SCurtis.Dunham@arm.com mr_new[199] = mr_old[83] # ITLBIMVA, 16011077SCurtis.Dunham@arm.com mr_new[200] = mr_old[84] # ITLBIASID, 16111077SCurtis.Dunham@arm.com mr_new[201] = mr_old[85] # DTLBIALL, 16211077SCurtis.Dunham@arm.com mr_new[202] = mr_old[86] # DTLBIMVA, 16311077SCurtis.Dunham@arm.com mr_new[203] = mr_old[87] # DTLBIASID, 16411077SCurtis.Dunham@arm.com mr_new[204] = mr_old[88] # TLBIALL, 16511077SCurtis.Dunham@arm.com mr_new[205] = mr_old[89] # TLBIMVA, 16611077SCurtis.Dunham@arm.com mr_new[206] = mr_old[90] # TLBIASID, 16711077SCurtis.Dunham@arm.com mr_new[207] = mr_old[91] # TLBIMVAA, 16811077SCurtis.Dunham@arm.com mr_new[140] = mr_old[92] # v7 DFSR -> aarch32 DFSR_NS, 16911077SCurtis.Dunham@arm.com mr_new[143] = mr_old[93] # v7 IFSR -> aarch32 IFSR_NS, 17011077SCurtis.Dunham@arm.com mr_new[155] = mr_old[94] # v7 DFAR -> aarch32 DFAR_NS, 17111077SCurtis.Dunham@arm.com mr_new[158] = mr_old[95] # v7 IFAR -> aarch32 IFAR_NS, 17211077SCurtis.Dunham@arm.com mr_new[84] = mr_old[96] # MPIDR, 17311077SCurtis.Dunham@arm.com mr_new[241] = mr_old[97] # v7 PRRR -> aarch32 PRRR_NS, 17411077SCurtis.Dunham@arm.com mr_new[247] = mr_old[98] # v7 NMRR -> aarch32 NMRR_NS, 17511077SCurtis.Dunham@arm.com mr_new[131] = mr_old[99] # TTBCR, 17611077SCurtis.Dunham@arm.com mr_new[86] = mr_old[100] # ID_PFR0, 17711077SCurtis.Dunham@arm.com mr_new[81] = mr_old[101] # CTR, 17811077SCurtis.Dunham@arm.com mr_new[115] = mr_old[102] # SCR, 17911077SCurtis.Dunham@arm.com # Set the non-secure bit 18011077SCurtis.Dunham@arm.com scr = int(mr_new[115]) 18111077SCurtis.Dunham@arm.com scr = scr | 0x1 18211077SCurtis.Dunham@arm.com mr_new[115] = str(scr) 18311077SCurtis.Dunham@arm.com ### 18411077SCurtis.Dunham@arm.com mr_new[116] = mr_old[103] # SDER, 18511077SCurtis.Dunham@arm.com mr_new[165] = mr_old[104] # PAR, 18611077SCurtis.Dunham@arm.com mr_new[175] = mr_old[105] # V2PCWPR -> ATS1CPR, 18711077SCurtis.Dunham@arm.com mr_new[176] = mr_old[106] # V2PCWPW -> ATS1CPW, 18811077SCurtis.Dunham@arm.com mr_new[177] = mr_old[107] # V2PCWUR -> ATS1CUR, 18911077SCurtis.Dunham@arm.com mr_new[178] = mr_old[108] # V2PCWUW -> ATS1CUW, 19011077SCurtis.Dunham@arm.com mr_new[179] = mr_old[109] # V2POWPR -> ATS12NSOPR, 19111077SCurtis.Dunham@arm.com mr_new[180] = mr_old[110] # V2POWPW -> ATS12NSOPW, 19211077SCurtis.Dunham@arm.com mr_new[181] = mr_old[111] # V2POWUR -> ATS12NSOUR, 19311077SCurtis.Dunham@arm.com mr_new[182] = mr_old[112] # V2POWUW -> ATS12NWOUW, 19411077SCurtis.Dunham@arm.com mr_new[90] = mr_old[113] # ID_MMFR0, 19511077SCurtis.Dunham@arm.com mr_new[92] = mr_old[114] # ID_MMFR2, 19611077SCurtis.Dunham@arm.com mr_new[93] = mr_old[115] # ID_MMFR3, 19711077SCurtis.Dunham@arm.com mr_new[112] = mr_old[116] # v7 ACTLR -> aarch32 ACTLR_NS 19811077SCurtis.Dunham@arm.com mr_new[222] = mr_old[117] # PMCR, 19911077SCurtis.Dunham@arm.com mr_new[230] = mr_old[118] # PMCCNTR, 20011077SCurtis.Dunham@arm.com mr_new[223] = mr_old[119] # PMCNTENSET, 20111077SCurtis.Dunham@arm.com mr_new[224] = mr_old[120] # PMCNTENCLR, 20211077SCurtis.Dunham@arm.com mr_new[225] = mr_old[121] # PMOVSR, 20311077SCurtis.Dunham@arm.com mr_new[226] = mr_old[122] # PMSWINC, 20411077SCurtis.Dunham@arm.com mr_new[227] = mr_old[123] # PMSELR, 20511077SCurtis.Dunham@arm.com mr_new[228] = mr_old[124] # PMCEID0, 20611077SCurtis.Dunham@arm.com mr_new[229] = mr_old[125] # PMCEID1, 20711077SCurtis.Dunham@arm.com mr_new[231] = mr_old[126] # PMXEVTYPER, 20811077SCurtis.Dunham@arm.com mr_new[233] = mr_old[127] # PMXEVCNTR, 20911077SCurtis.Dunham@arm.com mr_new[234] = mr_old[128] # PMUSERENR, 21011077SCurtis.Dunham@arm.com mr_new[235] = mr_old[129] # PMINTENSET, 21111077SCurtis.Dunham@arm.com mr_new[236] = mr_old[130] # PMINTENCLR, 21211077SCurtis.Dunham@arm.com mr_new[94] = mr_old[131] # ID_ISAR0, 21311077SCurtis.Dunham@arm.com mr_new[95] = mr_old[132] # ID_ISAR1, 21411077SCurtis.Dunham@arm.com mr_new[96] = mr_old[133] # ID_ISAR2, 21511077SCurtis.Dunham@arm.com mr_new[97] = mr_old[134] # ID_ISAR3, 21611077SCurtis.Dunham@arm.com mr_new[98] = mr_old[135] # ID_ISAR4, 21711077SCurtis.Dunham@arm.com mr_new[99] = mr_old[136] # ID_ISAR5, 21811077SCurtis.Dunham@arm.com mr_new[20] = mr_old[137] # LOCKFLAG, 21911077SCurtis.Dunham@arm.com mr_new[19] = mr_old[138] # LOCKADDR, 22011077SCurtis.Dunham@arm.com mr_new[87] = mr_old[139] # ID_PFR1, 22111077SCurtis.Dunham@arm.com # Set up the processor features register 22211077SCurtis.Dunham@arm.com pfr = int(mr_new[87]) 22311077SCurtis.Dunham@arm.com pfr = pfr | 0x1011 22411077SCurtis.Dunham@arm.com mr_new[87] = str(pfr) 22511077SCurtis.Dunham@arm.com ### 22611077SCurtis.Dunham@arm.com mr_new[238] = mr_old[140] # L2CTLR, 22711077SCurtis.Dunham@arm.com mr_new[82] = mr_old[141] # TCMTR 22811077SCurtis.Dunham@arm.com mr_new[88] = mr_old[142] # ID_DFR0, 22911077SCurtis.Dunham@arm.com mr_new[89] = mr_old[143] # ID_AFR0, 23011077SCurtis.Dunham@arm.com mr_new[91] = mr_old[144] # ID_MMFR1, 23111077SCurtis.Dunham@arm.com mr_new[102] = mr_old[145] # AIDR, 23211077SCurtis.Dunham@arm.com mr_new[146] = mr_old[146] # v7 ADFSR -> aarch32 ADFSR_NS, 23311077SCurtis.Dunham@arm.com mr_new[148] = mr_old[147] # AIFSR, 23411077SCurtis.Dunham@arm.com mr_new[173] = mr_old[148] # DCIMVAC, 23511077SCurtis.Dunham@arm.com mr_new[174] = mr_old[149] # DCISW, 23611077SCurtis.Dunham@arm.com mr_new[184] = mr_old[150] # MCCSW -> DCCSW, 23711077SCurtis.Dunham@arm.com mr_new[187] = mr_old[151] # DCCMVAU, 23811077SCurtis.Dunham@arm.com mr_new[117] = mr_old[152] # NSACR, 23911077SCurtis.Dunham@arm.com mr_new[262] = mr_old[153] # VBAR, 24011077SCurtis.Dunham@arm.com mr_new[265] = mr_old[154] # MVBAR, 24111077SCurtis.Dunham@arm.com mr_new[267] = mr_old[155] # ISR, 24211077SCurtis.Dunham@arm.com mr_new[269] = mr_old[156] # FCEIDR -> FCSEIDR, 24311077SCurtis.Dunham@arm.com #mr_new[] = mr_old[157] # L2LATENCY -> UNUSED, 24411077SCurtis.Dunham@arm.com #mr_new[] = mr_old[158] # CRN15 -> UNUSED, 24511077SCurtis.Dunham@arm.com mr_new[599] = mr_old[159] # NOP 24611077SCurtis.Dunham@arm.com mr_new[600] = mr_old[160] # RAZ, 24711077SCurtis.Dunham@arm.com 24811077SCurtis.Dunham@arm.com # Set the new miscRegs structure 24911077SCurtis.Dunham@arm.com cpt.set(sec, 'miscRegs', ' '.join(str(x) for x in mr_new)) 25011077SCurtis.Dunham@arm.com 25111077SCurtis.Dunham@arm.com cpu_prefix = {} 25211077SCurtis.Dunham@arm.com # Add in state for ITB/DTB 25311077SCurtis.Dunham@arm.com for sec in cpt.sections(): 25411077SCurtis.Dunham@arm.com re_tlb_match = re.match('(^.*?sys.*?\.cpu(\d+)*)\.(dtb|itb)$', sec) 25511077SCurtis.Dunham@arm.com if not re_tlb_match: 25611077SCurtis.Dunham@arm.com continue 25711077SCurtis.Dunham@arm.com 25811077SCurtis.Dunham@arm.com cpu_prefix[re_tlb_match.group(1)] = True # Save off prefix to add 25911077SCurtis.Dunham@arm.com # Set the non-secure bit (bit 9) to 1 for attributes 26011077SCurtis.Dunham@arm.com attr = int(cpt.get(sec, '_attr')) 26111077SCurtis.Dunham@arm.com attr = attr | 0x200 26211077SCurtis.Dunham@arm.com cpt.set(sec, '_attr', str(attr)) 26311077SCurtis.Dunham@arm.com cpt.set(sec, 'haveLPAE', 'false') 26411077SCurtis.Dunham@arm.com cpt.set(sec, 'directToStage2', 'false') 26511077SCurtis.Dunham@arm.com cpt.set(sec, 'stage2Req', 'false') 26611077SCurtis.Dunham@arm.com cpt.set(sec, 'bootUncacheability', 'true') 26711077SCurtis.Dunham@arm.com 26811077SCurtis.Dunham@arm.com # Add in extra state for the new TLB Entries 26911077SCurtis.Dunham@arm.com for sec in cpt.sections(): 27011077SCurtis.Dunham@arm.com re_tlbentry_match = re.match('(^.*?sys.*?\.cpu(\d+)*)\.(dtb|itb).TlbEntry\d+$', sec) 27111077SCurtis.Dunham@arm.com if not re_tlbentry_match: 27211077SCurtis.Dunham@arm.com continue 27311077SCurtis.Dunham@arm.com 27411077SCurtis.Dunham@arm.com # Add in the new entries 27511077SCurtis.Dunham@arm.com cpt.set(sec, 'longDescFormat', 'false') 27611077SCurtis.Dunham@arm.com cpt.set(sec, 'vmid', '0') 27711077SCurtis.Dunham@arm.com cpt.set(sec, 'isHyp', 'false') 27811077SCurtis.Dunham@arm.com valid = cpt.get(sec, 'valid') 27911077SCurtis.Dunham@arm.com if valid == 'true': 28011077SCurtis.Dunham@arm.com cpt.set(sec, 'ns', 'true') 28111077SCurtis.Dunham@arm.com cpt.set(sec, 'nstid', 'true') 28211077SCurtis.Dunham@arm.com cpt.set(sec, 'pxn', 'true') 28311077SCurtis.Dunham@arm.com cpt.set(sec, 'hap', '3') 28411077SCurtis.Dunham@arm.com # All v7 code used 2 level page tables 28511077SCurtis.Dunham@arm.com cpt.set(sec, 'lookupLevel', '2') 28611077SCurtis.Dunham@arm.com attr = int(cpt.get(sec, 'attributes')) 28711077SCurtis.Dunham@arm.com # set the non-secure bit (bit 9) to 1 28811077SCurtis.Dunham@arm.com # as no previous v7 code used secure code 28911077SCurtis.Dunham@arm.com attr = attr | 0x200 29011077SCurtis.Dunham@arm.com cpt.set(sec, 'attributes', str(attr)) 29111077SCurtis.Dunham@arm.com else: 29211077SCurtis.Dunham@arm.com cpt.set(sec, 'ns', 'false') 29311077SCurtis.Dunham@arm.com cpt.set(sec, 'nstid', 'false') 29411077SCurtis.Dunham@arm.com cpt.set(sec, 'pxn', 'false') 29511077SCurtis.Dunham@arm.com cpt.set(sec, 'hap', '0') 29611077SCurtis.Dunham@arm.com cpt.set(sec, 'lookupLevel', '0') 29711077SCurtis.Dunham@arm.com cpt.set(sec, 'outerShareable', 'false') 29811077SCurtis.Dunham@arm.com 29911077SCurtis.Dunham@arm.com # Add d/istage2_mmu and d/istage2_mmu.stage2_tlb 30011077SCurtis.Dunham@arm.com for key in cpu_prefix: 30111077SCurtis.Dunham@arm.com for suffix in ['.istage2_mmu', '.dstage2_mmu']: 30211077SCurtis.Dunham@arm.com new_sec = key + suffix 30311077SCurtis.Dunham@arm.com cpt.add_section(new_sec) 30411077SCurtis.Dunham@arm.com new_sec = key + suffix + ".stage2_tlb" 30511077SCurtis.Dunham@arm.com cpt.add_section(new_sec) 30611077SCurtis.Dunham@arm.com # Fill in tlb info with some defaults 30711077SCurtis.Dunham@arm.com cpt.set(new_sec, '_attr', '0') 30811077SCurtis.Dunham@arm.com cpt.set(new_sec, 'haveLPAE', 'false') 30911077SCurtis.Dunham@arm.com cpt.set(new_sec, 'directToStage2', 'false') 31011077SCurtis.Dunham@arm.com cpt.set(new_sec, 'stage2Req', 'false') 31111077SCurtis.Dunham@arm.com cpt.set(new_sec, 'bootUncacheability', 'false') 31211077SCurtis.Dunham@arm.com cpt.set(new_sec, 'num_entries', '0') 31311077SCurtis.Dunham@arm.com 31411077SCurtis.Dunham@arm.comlegacy_version = 9 315