Преглед на файлове

Add missing SWV trace functions.

Michael McMaster преди 10 години
родител
ревизия
e7e69c02b3

+ 73 - 0
lib/SCSI2SD/software/SCSI2SD/src/trace.c

@@ -0,0 +1,73 @@
+//	Copyright (C) 2015 James Laird-Wah <james@laird-wah.net>
+//
+//	This file is part of SCSI2SD.
+//
+//	SCSI2SD is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation, either version 3 of the License, or
+//	(at your option) any later version.
+//
+//	SCSI2SD is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU General Public License for more details.
+//
+//	You should have received a copy of the GNU General Public License
+//	along with SCSI2SD.  If not, see <http://www.gnu.org/licenses/>.
+
+#include <core_cm3_psoc5.h>
+#include <stdint.h>
+#include <cyfitter.h>
+#include <cytypes.h>
+#include <device.h>
+#include "trace.h"
+
+// configure desired baud rate on the SWV pin.
+// up to the lower of CPU_clk/2 or 33MHz
+#define BAUD_RATE 921600
+
+// Cortex-M3 Trace Port Interface Unit (TPIU)
+#define TPIU_BASE	0xe0040000
+#define MMIO32(addr) *((volatile uint32_t*)(addr))
+#define TPIU_SSPSR	MMIO32(TPIU_BASE + 0x000)
+#define TPIU_CSPSR	MMIO32(TPIU_BASE + 0x004)
+#define TPIU_ACPR	MMIO32(TPIU_BASE + 0x010)
+#define TPIU_SPPR	MMIO32(TPIU_BASE + 0x0F0)
+#define TPIU_FFSR	MMIO32(TPIU_BASE + 0x300)
+#define TPIU_FFCR	MMIO32(TPIU_BASE + 0x304)
+
+#define TPIU_CSPSR_BYTE (1 << 0)
+#define TPIU_CSPSR_HALFWORD	(1 << 1)
+#define TPIU_CSPSR_WORD	(1 << 3)
+
+#define TPIU_SPPR_SYNC	(0x0)
+#define TPIU_SPPR_ASYNC_MANCHESTER	(0x1)
+#define TPIU_SPPR_ASYNC_NRZ	(0x2)
+
+#define TPIU_FFCR_ENFCONT	(1 << 1)
+
+void traceInit(void) {
+	// enable the trace module clocks
+	CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+	
+	// set SWV clock = CPU clock / 2, and enable
+	CY_SET_REG8(CYDEV_MFGCFG_MLOGIC_DEBUG, 0xc); // swv_clk_sel = CPU_clk / 2, swv_clk enable
+	
+	// unlock the ETM/TPIU registers
+	*((volatile uint32_t*)0xE0000FB0) = 0xC5ACCE55;
+	
+	// NRZ is "UART mode"
+	TPIU_SPPR = TPIU_SPPR_ASYNC_NRZ;
+	// prescaler, 0 = divide by 1
+	TPIU_ACPR = (BCLK__BUS_CLK__HZ/2/BAUD_RATE) - 1;
+	// can write 1, 2 or 4 byte ports
+	TPIU_CSPSR = TPIU_CSPSR_BYTE;
+
+	// bypass formatter (puts sync & stuff in otherwise)
+	TPIU_FFCR &= ~TPIU_FFCR_ENFCONT;
+	// enable ITM, enable the first 2 stimulus ports
+	ITM->TCR = ITM_TCR_ITMENA_Msk;
+	ITM->TER = 0x3;
+	
+	trace(trace_begin);
+}

+ 58 - 6
lib/SCSI2SD/software/SCSI2SD/src/trace.h

@@ -1,4 +1,4 @@
-//	Copyright (C) 2015 Michael McMaster <michael@codesrc.com>
+//	Copyright (C) 2015 James Laird-Wah <james@laird-wah.net>
 //
 //	This file is part of SCSI2SD.
 //
@@ -14,11 +14,63 @@
 //
 //	You should have received a copy of the GNU General Public License
 //	along with SCSI2SD.  If not, see <http://www.gnu.org/licenses/>.
-#ifndef TRACE_H
-#define TRACE_H
 
-#define traceInit()
-#define trace(x)
-#define traceIrq(x)
+// Trace event IDs to be output. 1 and 9 are generated as headers on ports 0
+// and 1 respectively, and should not be used.
+enum trace_event {
+	trace_begin = 0,
 
+	// function entries - SCSI
+	trace_scsiRxCompleteISR = 0x50,
+	trace_scsiTxCompleteISR,
+	trace_scsiResetISR,
+	trace_doRxSingleDMA,
+	trace_doTxSingleDMA,
+	trace_scsiPhyReset,
+
+	// spin loops - SCSI
+	trace_spinTxComplete = 0x20,
+	trace_spinReadDMAPoll,
+	trace_spinWriteDMAPoll,
+	trace_spinPhyTxFifo,
+	trace_spinPhyRxFifo,
+	trace_spinDMAReset,
+
+	// SD
+	trace_spinSpiByte = 0x30,
+	trace_spinSDRxFIFO,
+	trace_spinSDBusy,
+	trace_spinSDDMA,
+	trace_spinSDCompleteWrite,
+	trace_spinSDCompleteRead,
+
+	// completion
+	trace_sdSpiByte = 0x40,
+};
+
+void traceInit(void);
+
+#ifdef TRACE
+// normally the code spins waiting for the trace FIFO to be ready for each event
+// if you are debugging a timing-sensitive problem, define TRACE_IMPATIENT and
+// expect some dropped packets
+#ifdef TRACE_IMPATIENT
+    #define wait_fifo(port)  ;
+#else
+    #define wait_fifo(port)  while (!(ITM->PORT[port].u32));
+#endif
+
+	#include <core_cm3_psoc5.h>
+	static inline void trace(enum trace_event ch) {
+		wait_fifo(0);
+		ITM->PORT[0].u8 = ch;
+	}
+	// use a different stimulus port for ISRs to avoid a race
+	static inline void traceIrq(enum trace_event ch) {
+		wait_fifo(1);
+		ITM->PORT[1].u8 = ch;
+	}
+#else
+	#define trace(ev)
+	#define traceIrq(ev)
 #endif

+ 14 - 0
lib/SCSI2SD/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj

@@ -123,6 +123,13 @@
 <build_action v="C_FILE" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="trace.c" persistent="..\..\src\trace.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="C_FILE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
@@ -266,6 +273,13 @@
 <build_action v="NONE" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="trace.h" persistent="..\..\src\trace.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="NONE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>

+ 14 - 0
lib/SCSI2SD/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj

@@ -123,6 +123,13 @@
 <build_action v="C_FILE" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="trace.c" persistent="..\..\src\trace.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="C_FILE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
@@ -266,6 +273,13 @@
 <build_action v="NONE" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="trace.h" persistent="..\..\src\trace.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="NONE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>