diff --git a/src/main/resources/FPGATop_MP.v b/src/main/resources/FPGATop_MP.v index 293d0f4..c6cb505 100644 --- a/src/main/resources/FPGATop_MP.v +++ b/src/main/resources/FPGATop_MP.v @@ -36,6 +36,8 @@ module FPGATop( output uDatOut_p, output uDatOut_n, + output sync_out, + input sck, input mosi, output miso, @@ -165,7 +167,7 @@ ShinTop i_ShinTop( .io_iSync_1(), .io_iSync_2(), .io_iSync_3(), - .io_oSync_0(), + .io_oSync_0(sync_out), .io_oSync_1(), .io_oSync_2(), .io_oSync_3(), diff --git a/src/main/resources/constr.xdc b/src/main/resources/constr.xdc index 3914ce3..9943be3 100644 --- a/src/main/resources/constr.xdc +++ b/src/main/resources/constr.xdc @@ -16,7 +16,7 @@ set_property -dict {PACKAGE_PIN F13 IOSTANDARD TMDS_33} [get_ports uDatIn_p] #CPU PC7 set_property -dict {PACKAGE_PIN P5 IOSTANDARD LVCMOS33} [get_ports interrupt] - +set_property -dict {PACKAGE_PIN P4 IOSTANDARD LVCMOS33} [get_ports sync_out] set_property -dict {PACKAGE_PIN V22 IOSTANDARD LVCMOS33} [get_ports io_iqspi_sck] set_property -dict {PACKAGE_PIN T21 IOSTANDARD LVCMOS33} [get_ports io_iqspi_data[0]] diff --git a/tb/shinTest/gen_pkt.py b/tb/shinTest/gen_pkt.py index 6db47e9..1969b23 100755 --- a/tb/shinTest/gen_pkt.py +++ b/tb/shinTest/gen_pkt.py @@ -11,12 +11,11 @@ if __name__ == '__main__': #add_tc_2_runlist(errorPkt.tc3()) #add_tc_2_runlist(errorPkt.tc4()) - add_tc_2_runlist(base.tc1()) add_tc_2_runlist(base.tc2()) add_tc_2_runlist(base.tc3()) add_tc_2_runlist(base.tc4()) - add_tc_2_runlist(base.tc5()) + #add_tc_2_runlist(base.tc5()) #add_tc_2_runlist(base.tc6()) #add_tc_2_runlist(base.tc7()) #add_tc_2_runlist(base.tc8()) @@ -36,8 +35,6 @@ if __name__ == '__main__': #add_tc_2_runlist(base.tc22()) #add_tc_2_runlist(base.tc23()) - - #add_tc_2_runlist(broadcast.tc1()) #add_tc_2_runlist(broadcast.tc2()) #add_tc_2_runlist(broadcast.tc3()) @@ -46,8 +43,6 @@ if __name__ == '__main__': #add_tc_2_runlist(sync.tc2()) #add_tc_2_runlist(sync.tc3()) #add_tc_2_runlist(sync.tc4()) - - #add_tc_2_runlist(ebmmu.tc1()) #add_tc_2_runlist(ebmmu.tc2()) @@ -71,6 +66,7 @@ if __name__ == '__main__': add_tc_2_runlist(watchdog.tc1()) + #add_tc_2_runlist(watchdog.tc2()) environment.teardown() diff --git a/tb/shinTest/testcase/watchdog.py b/tb/shinTest/testcase/watchdog.py index 030bcd1..2fda012 100644 --- a/tb/shinTest/testcase/watchdog.py +++ b/tb/shinTest/testcase/watchdog.py @@ -1,23 +1,25 @@ from pyutils import * -def tc1(): +def watchdog_test_sm_wr_timeout(tc_id, wd_id): genPkt = GenPkt() - - gen_file_def = "watchdog_tc01" + gen_file_def = "watchdog_tc%02d"%(tc_id, ) sm_idx = 0 - tc_des = "发送错误的数据包，导致设备出问题，出问题的设备在没有恢复的情况下，采取直通状态。\\n" \ - + "清除中断后，错误消失，出问题的设备恢复正常。" + + slave_sm_id = int((wd_id - 1) / 2) + tc_des = (f"使能看门狗{wd_id}，监视SM{slave_sm_id}，写数据到SM中，只写一半，看Watchdog是否超时。\\n" + "清除中断后，错误消失，出问题的设备恢复正常。" + ) #-------------------------------------------------------------------------- #>>>>>> 测试用例1 看门狗测试 genPkt.clean() genPkt.setPktType(0) - data = 1<<1 ##使能看门狗1 + data = 1 << wd_id ##使能看门狗 data0 = [data&0xff, (data>>8)&0xff, (data>>16)&0xff, (data>>24)&0xff] - data = 0x0010 ##看门狗的超时值 + data = 0x002000 ##看门狗的超时值 data1 = [data&0xff, (data>>8)&0xff, (data>>16)&0xff, (data>>24)&0xff] data = 0xffffffff ##清除中断 @@ -42,12 +44,13 @@ def tc1(): data = [0,] * 2 data[0] = 0x80 data[1] = 0x00 - genPkt.addSubPkt(0x0, 0, 0x302, 0xe, 2, data) + genPkt.addSubPkt(0x0, 0, 0x302 + slave_sm_id * 4, 0xe, 2, data) data = [0,] * 0x50 - #subPkt参数：索引、索引类型、地址、命令、长度、数据 - genPkt.addSubPkt(1, 0, 0x800, 0x1, 0x50, data) + #subPkt参数：索引、索引类型、地址、命令、长度、数据 + sm_addr = slave_sm_id * 0x1000 + 0x800 + genPkt.addSubPkt(1, 0, sm_addr, 0x1, 0x50, data) sm_idx = 0 @@ -55,15 +58,101 @@ def tc1(): +genWriteTransPktCode(gen_file_def, sm_idx) +genTrgTransPktCode(gen_file_def, sm_idx) +genReadAckPktCode(gen_file_def, sm_idx) - +genSlvSMReadData(1, 0, 0x80) +genMessageCode("--检查中断寄存器") +genIFRwDataCode(0, 0x074, False, 0x04) +genIFRwDataCode(1, 0x074, False, 0x04) +genIFRwDataCode(2, 0x074, False, 0x04) +genIFRwDataCode(3, 0x074, False, 0x04) +genIFRwDataCode(4, 0x074, False, 0x04) + +"#560000\n" +genIFRwDataCode(1, 0x400, False, 0x04) + +genIFRwDataCode(1, 0x400, True, 4, [0xff, 0xff, 0xff, 0xff]) + +genIFRwDataCode(1, 0x400, False, 0x04) + +genIFRwDataCode(1, 0x300 + slave_sm_id * 4, True, 1, [0, ]) +genTcEndFrameCode(gen_file_def)) genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1) + return gen_file_def + +def watchdog_test_sm_rd_timeout(tc_id, wd_id): + genPkt = GenPkt() + + gen_file_def = "watchdog_tc%02d"%(tc_id, ) + sm_idx = 0 + + slave_sm_id = int((wd_id - 1) / 2) + tc_des = (f"使能看门狗{wd_id}，监视SM{slave_sm_id}，写数据到SM中，只读一半，看Watchdog是否超时。\\n" + "清除中断后，错误消失，出问题的设备恢复正常。" + ) + + #-------------------------------------------------------------------------- + #>>>>>> 测试用例1 看门狗测试 + genPkt.clean() + genPkt.setPktType(0) + + data = 1 << wd_id ##使能看门狗 + data0 = [data&0xff, (data>>8)&0xff, (data>>16)&0xff, (data>>24)&0xff] + + data = 0x002000 ##看门狗的超时值 + data1 = [data&0xff, (data>>8)&0xff, (data>>16)&0xff, (data>>24)&0xff] + + genPkt.addBeforeExc(genTcStartFrameCode(gen_file_def, tc_des) + + genIFRwDataCode(1, 0x404, True, 4, data0) + + genIFRwDataCode(1, 0x40C, True, 4, data1) + + genIFRwDataCode(1, 0x078, True, 4, [0xff, 0xff, 0xff, 0xff]) + + genIFRwDataCode(2, 0x078, True, 4, [0xff, 0xff, 0xff, 0xff]) + + genIFRwDataCode(3, 0x078, True, 4, [0xff, 0xff, 0xff, 0xff]) + + genIFRwDataCode(4, 0x078, True, 4, [0xff, 0xff, 0xff, 0xff]) + + genIFRwDataCode(1, 0x400, True, 4, [0xff, 0xff, 0xff, 0xff]) + + genIFRwDataCode(0, 0x074, False, 0x04) + + genIFRwDataCode(1, 0x074, False, 0x04) + + genIFRwDataCode(2, 0x074, False, 0x04) + + genIFRwDataCode(3, 0x074, False, 0x04) + + genIFRwDataCode(4, 0x074, False, 0x04) + + genIFRwDataCode(1, 0x400, False, 0x04) + ) + #genPkt.addBeforeExc( genIFRwDataCode(1, 0x078, True, 4, [0xff, 0xff, 0xff, 0xff])) + + data = [0,] * 2 + data[0] = 0x10 + data[1] = 0x00 + genPkt.addSubPkt(0x0, 0, 0x302 + slave_sm_id * 4, 0xe, 2, data) + + data = [0,] * 0x10 + + #subPkt参数：索引、索引类型、地址、命令、长度、数据 + sm_addr = slave_sm_id * 0x1000 + 0x800 + genPkt.addSubPkt(1, 0, sm_addr, 0x1, 0x10, data) + + sm_idx = 0 + + genPkt.addAfterExc(genWriteTransLenCode(gen_file_def, sm_idx) + +genWriteTransPktCode(gen_file_def, sm_idx) + +genTrgTransPktCode(gen_file_def, sm_idx) + +genReadAckPktCode(gen_file_def, sm_idx) + +genMessageCode("--检查中断寄存器") + +genIFRwDataCode(0, 0x074, False, 0x04) + +genIFRwDataCode(1, 0x074, False, 0x04) + +genIFRwDataCode(2, 0x074, False, 0x04) + +genIFRwDataCode(3, 0x074, False, 0x04) + +genIFRwDataCode(4, 0x074, False, 0x04) + +genIFRwDataCode(1, slave_sm_id * 0x1000 + 0x800, False, 4) + +"#500000\n" + +genIFRwDataCode(1, 0x400, False, 0x04) + +genIFRwDataCode(1, 0x400, True, 4, [0xff, 0xff, 0xff, 0xff]) + +genIFRwDataCode(1, 0x400, False, 0x04) + +genIFRwDataCode(1, 0x300 + slave_sm_id * 4, True, 1, [0, ]) + +genTcEndFrameCode(gen_file_def)) + + genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1) + + return gen_file_def + + +def tc1(): + return watchdog_test_sm_wr_timeout(1, 1) + + +def tc2(): + return watchdog_test_sm_rd_timeout(2, 2) \ No newline at end of file