N2XX: firmware stops device streaming on fw update, and updater script checks hw rev before proceeding

3 files changed, 54 insertions, 5 deletions

diff --git a/firmware/zpu/lib/udp_fw_update.h b/firmware/zpu/lib/udp_fw_update.h
index d25525bd2..d98447aef 100644
--- a/firmware/zpu/lib/udp_fw_update.h
+++ b/firmware/zpu/lib/udp_fw_update.h
@@ -45,6 +45,9 @@ typedef enum {
   USRP2_FW_UPDATE_ID_RESET_MAH_COMPUTORZ_LOL = 's',
   USRP2_FW_UPDATE_ID_RESETTIN_TEH_COMPUTORZ_OMG = 'S',
 
+  USRP2_FW_UPDATE_ID_I_CAN_HAS_HW_REV_LOL = 'v',
+  USRP2_FW_UPDATE_ID_HERES_TEH_HW_REV_OMG = 'V',
+
   USRP2_FW_UPDATE_ID_KTHXBAI = '~'
 
 } usrp2_fw_update_id_t;
@@ -54,7 +57,8 @@ typedef struct {
   uint32_t id;
   uint32_t seq;
   union {
-      uint32_t ip_addr;
+    uint32_t ip_addr;
+    uint32_t hw_rev;
     struct {
       uint32_t flash_addr;
       uint32_t length;
diff --git a/firmware/zpu/usrp2p/udp_fw_update.c b/firmware/zpu/usrp2p/udp_fw_update.c
index ead08ad2c..f64e7653c 100644
--- a/firmware/zpu/usrp2p/udp_fw_update.c
+++ b/firmware/zpu/usrp2p/udp_fw_update.c
@@ -27,6 +27,13 @@
 #include "ethernet.h"
 #include "udp_fw_update.h"
 #include "xilinx_s3_icap.h"
+#include "i2c.h"
+
+uint16_t get_hw_rev(void) {
+    uint16_t tmp;
+    eeprom_read(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV, &tmp, sizeof(tmp));
+    return tmp;
+}
 
 //Firmware update packet handler
 void handle_udp_fw_update_packet(struct socket_address src, struct socket_address dst,
@@ -59,6 +66,13 @@ void handle_udp_fw_update_packet(struct socket_address src, struct socket_addres
   case USRP2_FW_UPDATE_ID_OHAI_LOL: //why hello there you handsome devil
     update_data_out.id = USRP2_FW_UPDATE_ID_OHAI_OMG;
     memcpy(&update_data_out.data.ip_addr, (void *)get_ip_addr(), sizeof(struct ip_addr));
+    //this is to stop streaming for the folks who think updating while streaming is a good idea
+    sr_rx_ctrl0->cmd = 1 << 31; //no samples now
+    sr_rx_ctrl0->time_secs = 0;
+    sr_rx_ctrl0->time_ticks = 0; //latch the command
+    sr_rx_ctrl1->cmd = 1 << 31; //no samples now
+    sr_rx_ctrl1->time_secs = 0;
+    sr_rx_ctrl1->time_ticks = 0; //latch the command
     break;
 
   case USRP2_FW_UPDATE_ID_WATS_TEH_FLASH_INFO_LOL: //query sector size, memory size so the host can mind the boundaries
@@ -67,6 +81,11 @@ void handle_udp_fw_update_packet(struct socket_address src, struct socket_addres
     update_data_out.id = USRP2_FW_UPDATE_ID_HERES_TEH_FLASH_INFO_OMG;
     break;
 
+  case USRP2_FW_UPDATE_ID_I_CAN_HAS_HW_REV_LOL: //get the hardware revision of the platform for validation checking
+    update_data_out.data.hw_rev = (uint32_t) get_hw_rev();
+    update_data_out.id = USRP2_FW_UPDATE_ID_HERES_TEH_HW_REV_OMG;
+    break;
+
   case USRP2_FW_UPDATE_ID_ERASE_TEH_FLASHES_LOL: //out with the old
     spi_flash_async_erase_start(&spi_flash_async_state, update_data_in->data.flash_args.flash_addr, update_data_in->data.flash_args.length);
     update_data_out.id = USRP2_FW_UPDATE_ID_ERASING_TEH_FLASHES_OMG;
diff --git a/host/utils/usrp_n2xx_net_burner.py b/host/utils/usrp_n2xx_net_burner.py
index 06af8c860..6be632735 100755
--- a/host/utils/usrp_n2xx_net_burner.py
+++ b/host/utils/usrp_n2xx_net_burner.py
@@ -17,8 +17,6 @@
 #
 
 # TODO: make it autodetect UHD devices
-# TODO: you should probably watch sequence numbers
-# TODO: validate images in 1) size and 2) header content so you can't write a Justin Bieber MP3 to Flash
 
 import optparse
 import math
@@ -54,6 +52,14 @@ FLASH_DATA_PACKET_SIZE = 256
 FLASH_ARGS_FMT = '!LLLLL256s'
 FLASH_INFO_FMT = '!LLLLL256x'
 FLASH_IP_FMT =   '!LLLL260x'
+FLASH_HW_REV_FMT = '!LLLL260x'
+
+n2xx_revs = {
+             0x0a00: "n200_r3",
+             0x0a01: "n200_r4",
+             0x0a01: "n210_r3",
+             0x0a11: "n210_r4"
+            }
 
 class update_id_t:
   USRP2_FW_UPDATE_ID_WAT = ord(' ')
@@ -72,6 +78,8 @@ class update_id_t:
   USRP2_FW_UPDATE_ID_KK_READ_TEH_FLASHES_OMG = ord('R')
   USRP2_FW_UPDATE_ID_RESET_MAH_COMPUTORZ_LOL = ord('s')
   USRP2_FW_UPDATE_ID_RESETTIN_TEH_COMPUTORZ_OMG = ord('S')
+  USRP2_FW_UPDATE_ID_I_CAN_HAS_HW_REV_LOL = ord('v')
+  USRP2_FW_UPDATE_ID_HERES_TEH_HW_REV_OMG = ord('V')
   USRP2_FW_UPDATE_ID_KTHXBAI = ord('~')
 
 _seq = -1
@@ -92,12 +100,18 @@ def unpack_flash_info_fmt(s):
 def unpack_flash_ip_fmt(s):
     return struct.unpack(FLASH_IP_FMT, s) #(proto_ver, pktid, seq, ip_addr)
 
+def unpack_flash_hw_rev_fmt(s):
+    return struct.unpack(FLASH_HW_REV_FMT, s) #proto_ver, pktid, seq, hw_rev
+
 def pack_flash_args_fmt(proto_ver, pktid, seq, flash_addr, length, data=bytes()):
     return struct.pack(FLASH_ARGS_FMT, proto_ver, pktid, seq, flash_addr, length, data)
 
 def pack_flash_info_fmt(proto_ver, pktid, seq, sector_size_bytes, memory_size_bytes):
     return struct.pack(FLASH_INFO_FMT, proto_ver, pktid, seq, sector_size_bytes, memory_size_bytes)
 
+def pack_flash_hw_rev_fmt(proto_ver, pktid, seq, hw_rev):
+    return struct.pack(FLASH_HW_REV_FMT, proto_ver, pktid, seq, hw_rev)
+
 def is_valid_fpga_image(fpga_image):
     for i in range(0,63):
         if fpga_image[i:i+1] == bytes(b'\xFF'): continue
@@ -117,6 +131,7 @@ class burner_socket(object):
         self._sock.connect((addr, UDP_FW_UPDATE_PORT))
         self.set_callbacks(lambda *a: None, lambda *a: None)
         self.init_update() #check that the device is there
+        self.get_hw_rev()
 
     def set_callbacks(self, progress_cb, status_cb):
         self._progress_cb = progress_cb
@@ -137,7 +152,12 @@ class burner_socket(object):
         else:
             raise Exception("Invalid reply received from device.")
 
-        #  print "Incoming:\n\tVer: %i\n\tID: %c\n\tSeq: %i\n\tIP: %i\n" % (proto_ver, chr(pktid), rxseq, ip_addr)
+    def get_hw_rev(self):
+        out_pkt = pack_flash_hw_rev_fmt(USRP2_FW_PROTO_VERSION, update_id_t.USRP2_FW_UPDATE_ID_I_CAN_HAS_HW_REV_LOL, seq(), 0)
+        in_pkt = self.send_and_recv(out_pkt)
+        (proto_ver, pktid, rxseq, hw_rev) = unpack_flash_hw_rev_fmt(in_pkt)
+        if(pktid != update_id_t.USRP2_FW_UPDATE_ID_HERES_TEH_HW_REV_OMG): hw_rev = 0
+        return socket.ntohs(hw_rev)
 
     memory_size_bytes = 0
     sector_size_bytes = 0
@@ -157,10 +177,16 @@ class burner_socket(object):
 
     def burn_fw(self, fw, fpga, reset, safe):
         (flash_size, sector_size) = self.get_flash_info()
+        hw_rev = self.get_hw_rev()
 
-        print("Flash size: %i\nSector size: %i\n\n" % (flash_size, sector_size))
+        if(hw_rev != 0): print "Hardware type: %s" % n2xx_revs[hw_rev]
+        print "Flash size: %i\nSector size: %i\n" % (flash_size, sector_size)
 
         if fpga:
+            #validate fpga image name against hardware rev
+            if(n2xx_revs[hw_rev] not in fpga and hw_rev != 0):
+                raise Exception("Error: incorrect FPGA image version. Please use the correct image for device %s" % n2xx_revs[hw_rev])
+                
             if safe: image_location = SAFE_FPGA_IMAGE_LOCATION_ADDR
             else:    image_location = PROD_FPGA_IMAGE_LOCATION_ADDR