Added JtagProgramSpiProxyStep

Author: macaba

source/TS.NET.JTAG/Jtag.cs

@@ -216,7 +216,8 @@ public void EraseSpiFlash(int chainIndex, CancellationToken cancellationToken)
             ThrowIfDisposed();
             cancellationToken.ThrowIfCancellationRequested();
 
-            var spiProxy = ProgramSpiProxy(chainIndex, cancellationToken);
+            var spiProxy = OpenSpiProxy(chainIndex);
+
             var flashCapacityBytes = ReadFlashCapacityBytes(spiProxy, cancellationToken);
             logger.LogInformation($"Detected SPI flash with capacity of {(flashCapacityBytes * 8) / 1024 / 1024}Mb");
             if (flashCapacityBytes > 0x01_00_00_00)
@@ -283,7 +284,8 @@ List<int> BuildPageProgramList(byte[] image, int usedLength, int pageSize)
             ThrowIfDisposed();
             cancellationToken.ThrowIfCancellationRequested();
 
-            var spiProxy = ProgramSpiProxy(chainIndex, cancellationToken);
+            var spiProxy = OpenSpiProxy(chainIndex);
+
             var flashCapacityBytes = ReadFlashCapacityBytes(spiProxy, cancellationToken);
             logger.LogInformation($"Detected SPI flash with capacity of {(flashCapacityBytes * 8) / 1024 / 1024}Mb");
             if (image.Length > flashCapacityBytes)
@@ -349,7 +351,8 @@ public void ProgramSpiFlashSector(int chainIndex, int address, ReadOnlySpan<byte
             ThrowIfDisposed();
             cancellationToken.ThrowIfCancellationRequested();
 
-            var spiProxy = ProgramSpiProxy(chainIndex, cancellationToken);
+            var spiProxy = OpenSpiProxy(chainIndex);
+
             var flashCapacityBytes = ReadFlashCapacityBytes(spiProxy, cancellationToken);
 
             if ((long)address + data.Length > flashCapacityBytes)
@@ -407,7 +410,8 @@ public void VerifySpiFlash(int chainIndex, string imagePath, CancellationToken c
             ThrowIfDisposed();
             cancellationToken.ThrowIfCancellationRequested();
 
-            var spiProxy = ProgramSpiProxy(chainIndex, cancellationToken);
+            var spiProxy = OpenSpiProxy(chainIndex);
+
             var flashCapacityBytes = ReadFlashCapacityBytes(spiProxy, cancellationToken);
             logger.LogInformation($"Detected SPI flash with capacity of {(flashCapacityBytes * 8) / 1024 / 1024}Mb");
             if (image.Length > flashCapacityBytes)
@@ -493,7 +497,7 @@ private static ulong ReverseBits64(ulong value)
         return reversed;
     }
 
-    private JtagSpiProxy ProgramSpiProxy(int chainIndex, CancellationToken cancellationToken)
+    public void ProgramSpiProxy(int chainIndex, CancellationToken cancellationToken)
     {
         static string ResolveProxyBitfilePath(string model)
         {
@@ -522,36 +526,20 @@ static string ResolveProxyBitfilePath(string model)
         var devices = Scan();
         ValidateChainIndex(chainIndex, devices.Count);
 
-        tap.ShiftIrWriteTarget(devices.Count, chainIndex, instructionSet.IrLength, instructionSet.JShutdownInstruction, Xc7BypassInstruction);
-        tap.RunIdleCycles(instructionSet.ProgramShutdownIdleClocks);
-
-        var existingProxy = OpenSpiProxy(chainIndex);
-        if (TryReadFlashCapacityBytes(existingProxy, cancellationToken, out _))
-        {
-            logger.LogInformation("SPI proxy detected; SPI proxy programming skipped");
-            return existingProxy;
-        }
-
-        logger.LogInformation("SPI proxy not detected; programming SPI proxy");
-
         var target = devices[chainIndex];
         var proxyPath = ResolveProxyBitfilePath(target.Model);
         Program(chainIndex, proxyPath, cancellationToken);
 
         var spiProxy = OpenSpiProxy(chainIndex);
         ReadFlashCapacityBytes(spiProxy, cancellationToken);
         logger.LogInformation("SPI proxy programmed and verified");
-
-        return spiProxy;
     }
 
     private JtagSpiProxy OpenSpiProxy(int chainIndex)
     {
         var idCodes = tap.ReadChainIdCodes(instructionSet.IrLength, instructionSet.IdCodeInstruction, MaxScanDevices);
         ValidateChainIndex(chainIndex, idCodes.Count);
-
         tap.ShiftIrWriteTarget(idCodes.Count, chainIndex, instructionSet.IrLength, instructionSet.User1Instruction, Xc7BypassInstruction);
-
         return new JtagSpiProxy(tap, idCodes.Count, chainIndex);
     }
 
@@ -571,7 +559,7 @@ private static void ResetSpiFlash(JtagSpiProxy jtagSpiProxy, CancellationToken c
 
     private static void DelayWithCancellation(int milliseconds, CancellationToken cancellationToken)
     {
-        if (cancellationToken.WaitHandle.WaitOne(milliseconds))
+        if (cancellationToken.WaitHandle.WaitOne(milliseconds * 10))
         {
             cancellationToken.ThrowIfCancellationRequested();
         }
@@ -605,37 +593,6 @@ private int ReadFlashCapacityBytes(JtagSpiProxy jtagSpiProxy, CancellationToken
         return capacityBytes;
     }
 
-    private bool TryReadFlashCapacityBytes(JtagSpiProxy jtagSpiProxy, CancellationToken cancellationToken, out int capacityBytes)
-    {
-        capacityBytes = 0;
-
-        ResetSpiFlash(jtagSpiProxy, cancellationToken);
-
-        var id = jtagSpiProxy.Read(SpiFlashOpcodes.ReadId, [], 3);
-        if (id.Length < 3)
-        {
-            return false;
-        }
-
-        if (id[0] != SupportedFlashManufacturerId)
-        {
-            return false;
-        }
-
-        if (id[1] != SupportedFlashMemoryTypeId)
-        {
-            return false;
-        }
-
-        if (!TryDecodeCapacityBytes(id[2], out capacityBytes) || capacityBytes < 64 * 1024)
-        {
-            capacityBytes = 0;
-            return false;
-        }
-
-        return true;
-    }
-
     private static bool TryDecodeCapacityBytes(byte capacityCode, out int capacityBytes)
     {
         capacityBytes = 0;

source/TS.NET.Sequences/Sequences/FactoryBringupSequence.cs

@@ -31,6 +31,7 @@ private void AddSteps(ModalUiContext modalUiContext)
 
             new FactoryHwidStep("HWID input", modalUiContext, Variables),
 
+            new JtagProgramSpiProxyStep("JTAG program SPI proxy", Variables),
             new JtagEraseSpiFlashStep("JTAG erase SPI flash", Variables),
             new JtagProgramSpiFlashStep("JTAG program SPI flash", Variables),
             new JtagVerifySpiFlashStep("JTAG verify SPI flash", Variables),

source/TS.NET.Sequences/Steps/JtagProgramSpiProxyStep.cs

@@ -0,0 +1,31 @@
+using TS.NET.JTAG;
+using TS.NET.Sequencer;
+
+namespace TS.NET.Sequences;
+
+public class JtagProgramSpiProxyStep : Step
+{
+    public JtagProgramSpiProxyStep(string name, FactoryBringUpVariables variables) : base(name)
+    {
+        Action = (CancellationToken cancellationToken) =>
+        {
+            using var jtag = new Jtag(new SequencerLoggerAdapter(Index));
+            var devices = jtag.Scan();
+
+            if (devices.Count == 0)
+            {
+                Logger.Instance.Log(LogLevel.Error, Index, Status.Error, $"No FPGA found");
+                return Status.Error;
+            }
+
+            if (devices.Count > 1)
+            {
+                Logger.Instance.Log(LogLevel.Error, Index, Status.Error, $"More than one FPGA found");
+                return Status.Error;
+            }
+
+            jtag.ProgramSpiProxy(0, cancellationToken);
+            return Status.Passed;
+        };
+    }
+}