Merge branch 'jtag' - just catching up

eclipse_project_setup/.cproject

@@ -122,4 +122,9 @@
 			<resource resourceType="PROJECT" workspacePath="/linux-elphel"/>
 		</configuration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings">
+		<doc-comment-owner id="org.eclipse.cdt.ui.doxygen">
+			<path value=""/>
+		</doc-comment-owner>
+	</storageModule>
 </cproject>

eclipse_project_setup/.settings/language.settings.xml

@@ -2,7 +2,7 @@
 <project>
 	<configuration id="cdt.managedbuild.toolchain.gnu.base.1636449201" name="Default">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" name="CDT User Setting Entries" prefer-non-shared="true"/>
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 		</extension>
 	</configuration>

src/drivers/elphel/Makefile

@@ -9,5 +9,6 @@ obj-$(CONFIG_ELPHEL393_INIT)      += elphel393-init.o
 obj-$(CONFIG_ELPHEL393)           += x393.o
 obj-$(CONFIG_ELPHEL393)           += sensor_i2c.o
 obj-$(CONFIG_ELPHEL393)           += fpgajtag353.o
+obj-$(CONFIG_ELPHEL393)           += clock10359.o
 #fpgajtag-y := fpgajtag353.o x393.o 
 #obj-$(CONFIG_ELPHEL393_EXTERNAL)  += fpgajtag.o
\ No newline at end of file

src/drivers/elphel/clock10359.h

+/*******************************************************************************
+* FILE NAME  : clock10359.h
+* DESCRIPTION: Control of the CY22393 clock on the 10359 multiplexer connected
+* to the sensor port
+* Copyright 2002-2016 (C) Elphel, Inc.
+* -----------------------------------------------------------------------------*
+*
+*  This program 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 2 of the License, or
+*  (at your option) any later version.
+*
+*  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+ 
+int x393_setClockFreq(int sensor_port, int nclock, int freq);
+int x393_getClockFreq(int sensor_port, int nclock);

src/drivers/elphel/elphel393-init.c

@@ -11,7 +11,7 @@
  *!
  *!  This program 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
+ *!  the Free Software Foundation, either version 2 of the License, or
  *!  (at your option) any later version.
  *!
  *!  This program is distributed in the hope that it will be useful,

src/drivers/elphel/elphel393-mem.c

@@ -7,7 +7,7 @@
  *!
  *!  This program 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
+ *!  the Free Software Foundation, either version 2 of the License, or
  *!  (at your option) any later version.
  *!
  *!  This program is distributed in the hope that it will be useful,

src/drivers/elphel/elphel393-pwr.c

 /*!***************************************************************************
  *! FILE NAME  : elphel393-pwr.c
  *! DESCRIPTION: power supplies control on Elphel 10393 board 
- *! Copyright (C) 2013 Elphel, Inc.
+ *! Copyright (C) 2013-2016 Elphel, Inc.
  *! -----------------------------------------------------------------------------**
  *!
  *!  This program 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
+ *!  the Free Software Foundation, either version 2 of the License, or
  *!  (at your option) any later version.
  *!
  *!  This program is distributed in the hope that it will be useful,

src/drivers/elphel/fpgajtag353.c

 /*!***************************************************************************
 *! FILE NAME  : fpgajtag353.c
 *! DESCRIPTION: TBD
-*! Copyright 2002-2007 (C) Elphel, Inc.
+*! Copyright 2002-20016 (C) Elphel, Inc.
 *! -----------------------------------------------------------------------------**
 *!
 *!  This program 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
+*!  the Free Software Foundation, either version 2 of the License, or
 *!  (at your option) any later version.
 *!
 *!  This program is distributed in the hope that it will be useful,
@@ -17,58 +17,6 @@
 *!  You should have received a copy of the GNU General Public License
 *!  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *! -----------------------------------------------------------------------------**
-*!  $Log: fpgajtag353.c,v $
-*!  Revision 1.2  2011/05/20 21:36:52  elphel
-*!  typo fix
-*!
-*!  Revision 1.1.1.1  2008/11/27 20:04:01  elphel
-*!
-*!
-*!  Revision 1.4  2008/09/22 22:55:48  elphel
-*!  snapshot
-*!
-*!  Revision 1.3  2008/09/20 00:29:50  elphel
-*!  moved driver major/minor numbers to a single file - include/asm-cris/elphel/driver_numbers.h
-*!
-*!  Revision 1.2  2008/09/16 00:49:31  elphel
-*!  snapshot
-*!
-*!  Revision 1.2  2008/04/11 23:16:51  elphel
-*!  removed unneeded local_irq_disable() after local_irq_save_flags()
-*!
-*!  Revision 1.1.1.1  2007/08/17 10:23:18  elphel
-*!  This is a fresh tree based on elphel353-2.10
-*!
-*!  Revision 1.7  2007/08/17 10:23:18  spectr_rain
-*!  switch to GPL3 license
-*!
-*!  Revision 1.6  2007/07/20 10:17:46  spectr_rain
-*!  *** empty log message ***
-*!
-*!  Revision 1.5  2007/06/28 02:20:39  elphel
-*!  Slowed down sensor FPGA programming while working with long cables. Problem was different, so maybe that change may be undone.
-*!
-*!  Revision 1.4  2007/05/21 21:23:50  elphel
-*!  remove compile-time warning
-*!
-*!  Revision 1.3  2007/05/21 17:45:11  elphel
-*!  boundary scan support, added 359/347 detection
-*!
-*!  Revision 1.2  2007/03/25 10:14:23  elphel
-*!  Accommodating 10359 board
-*!
-*!  Revision 1.1.1.1  2007/02/23 10:11:48  elphel
-*!  initial import into CVS
-*!
-*!  Revision 1.2  2005/05/10 21:08:49  elphel
-*!  *** empty log message ***
-*!
-
-TODO: replace static buffer (what a waste!)
-I suspect "somebody" is is playing with portA during JTAG configuration.
-To test that I'll use 256K static buffer, copy all the bitstream there,
-disable interrupts and do the programming.
-No debug with printk ... 
 */
 #undef DEBUG
 /****************** INCLUDE FILES SECTION ***********************************/
@@ -111,9 +59,9 @@ No debug with printk ...
 
 //#define JTAG_DISABLE_IRQ y
 
-//#define D(x)
-#define D(x) printk("%s:%d:",__FILE__,__LINE__);x
-
+#define D(x)
+//#define D(x) printk("%s:%d:",__FILE__,__LINE__);x
+#define PARALLEL_JTAG
 /*
 port C 353:
  0 - TDO  (in)
@@ -495,6 +443,7 @@ static int fpga_jtag_release(struct inode *inode, struct file *filp) {
    JTAG_channels[chn].mode=JTAG_MODE_CLOSED;
    //D(printk("fpga_jtag_release:  done\r\n"));
    dev_dbg(NULL, "fpga_jtag_release:  done\r\n");
+   dev_info(NULL, "fpga_jtag_release:  done, res= %d\n",res);
    return (res<0)?res:0;
 }
 
@@ -776,6 +725,26 @@ inline u32 read_tdo(int sens_num)
 	return stat.xfpgatdo;
 }
 
+// read last 8 TDO bits, shifted at rising edge of TCL
+inline u32 read_tdo_byte(int sens_num)
+{
+	x393_status_sens_io_t stat;
+	x393_status_ctrl_t stat_ctrl;
+    int i;
+	stat_ctrl.d32 = 0;
+	stat = x393_sensio_status(sens_num);
+	stat_ctrl.seq_num = stat.seq_num + 1;
+	stat_ctrl.mode = 1;
+	set_x393_sensio_status_cntrl(stat_ctrl, sens_num);
+	for (i = 0; i < 10; i++) {
+		stat = x393_sensio_status(sens_num & 3); // sens_num);
+		if (likely(stat.seq_num == stat_ctrl.seq_num)) {
+			return stat.xfpgatdo_byte;
+		}
+	}
+	dev_err(NULL,"read_tdo_byte(%d): failed to  get expected seq_num in 10 cycles, expected = 0x%x, got 0x%x\n",sens_num,stat_ctrl.seq_num, stat.seq_num);
+	return stat.xfpgatdo_byte;
+}
 
 
 
@@ -858,8 +827,8 @@ int jtag_send (int chn, int tms, int len, int d) {
 	int sens_num = chn & 3;
 	x393_sensio_jtag_t data;
 	x393_status_sens_io_t stat;
-	u32 seq_num;
-	int i; //,m;
+//	u32 seq_num;
+	int i, bm = 0; //,m;
 	int r=0;
 	int d0;
 	i = len & 7;
@@ -919,8 +888,11 @@ int jtag_send (int chn, int tms, int len, int d) {
 //			x393_sensio_jtag(data, sens_num);
 
 			/* read TDO before TCK pulse */
-			r = (r << 1) +  read_tdo(sens_num); // may to need to read twice to increase delay?
-
+#ifndef PARALLEL_JTAG
+			r = (r << 1) +  read_tdo(sens_num); // may need to read twice to increase delay?
+#else
+			bm = (bm <<1 ) | 1;
+#endif
 			data.tck = 1;
 			x393_sensio_jtag(data, sens_num);  // keep other signals, set TCK == 1
 //			x393_sensio_jtag(data, sens_num);  // repeat if delay will be needed to increase length of the TCK signal
@@ -929,6 +901,10 @@ int jtag_send (int chn, int tms, int len, int d) {
 //			x393_sensio_jtag(data, sens_num);
 		}
 		x393_sensio_jtag(data, sens_num);
+#ifdef  PARALLEL_JTAG
+		r = read_tdo_byte(sens_num) & bm;
+#endif
+//		x393_sensio_jtag(data, sens_num);
 		dev_dbg(NULL, " ---> %02x\n", r);
 
 		break;
@@ -947,14 +923,15 @@ int jtag_send (int chn, int tms, int len, int d) {
 
 int jtag_write_bits (int chn,
                      unsigned char *buf, // data to write
-                     int len,            // number of bytes to write
+                     int len,            // number of bits to write
                      int check,          // compare readback data with previously written, abort on mismatch
                      int last,           // output last bit with TMS=1
                      int prev[2])      // if null - don't use
 {
 	int sens_num = chn & 3;
 	int i,j;
-	int r=0;
+	int r =  0;
+	int bm = 0;
 	int d,d0;
 //	u32 seq_num;
 	x393_status_sens_io_t stat;
@@ -1046,26 +1023,34 @@ int jtag_write_bits (int chn,
 		for (i = 0; len > 0; i++) {
 			d0 = (d = buf[i]);
 			dev_dbg(NULL,"jtag_write_bits(), i=0x%x ", i);
+			bm = 0;
 			for (j = 0; j < 8; j++) {
 				if (len > 0) {
 					data.tms = (len == 1 && last)? 1:0 ;
 					data.tdi = ((d <<= 1) >> 8) & 1;
 					data.tck = 0;
 					x393_sensio_jtag(data, sens_num);
-//					x393_sensio_jtag(data, sens_num); // repeat writel() if needed for delay
+#ifndef PARALLEL_JTAG
 					r = (r << 1) +  read_tdo(sens_num);
+#else
+					bm = (bm <<1 ) | 1;
+#endif
 					data.tck = 1;
 					x393_sensio_jtag(data, sens_num);
-//					x393_sensio_jtag(data, sens_num); // remove if no delay is needed
 
 					data.tck = 0;
 					x393_sensio_jtag(data, sens_num);
-//					x393_sensio_jtag(data, sens_num);
 				} else {
 					r <<= 1;
 				}
 				len--;
 			}
+#ifdef  PARALLEL_JTAG
+			r = read_tdo_byte(sens_num) & bm;
+			if (unlikely(len < 0)){
+				r <<= -len;
+			}
+#endif
 			buf[i] = r;
 			dev_dbg(NULL," ===> %02x\n", r);
 			if (check && ((r ^ (prev[1]>>24)) & 0xff)) {
@@ -1110,13 +1095,13 @@ int JTAG_configure (int chn, unsigned char * buf, int len) {
     }
   }
   if (datastart<0) {
-    printk("Bitstream not found - bad file\r\n");
+	  dev_err(NULL,"Bitstream not found - bad file\r\n");
 	  return -EFAULT;
   }
 // check for right bitstream length
   if ((len-datastart)!=(XC3S1200E_BITSIZE>>3)) {
-    printk("Wrong bitstream size - XC3S1200E has bitstream of %d bits (%d bytes)\n",XC3S1200E_BITSIZE,XC3S1200E_BITSIZE>>3);
-    printk ("header size - %d, data size - %d\r\n",datastart, len-datastart);
+	  dev_err(NULL,"Wrong bitstream size - XC3S1200E has bitstream of %d bits (%d bytes)\n",XC3S1200E_BITSIZE,XC3S1200E_BITSIZE>>3);
+	  dev_err(NULL,"header size - %d, data size - %d\r\n",datastart, len-datastart);
 	  return -EFAULT;
   }
 // enable programmimg mode (nop for the 10353 FPGA)
@@ -1169,8 +1154,8 @@ int JTAG_configure (int chn, unsigned char * buf, int len) {
      set_pgm (chn, 0);
 // disable programmimg mode (nop for the 10353 FPGA)
      set_pgm_mode(chn, 0);
-     printk ("**** Configuration failed at byte # %d (%x)****\n", (i-datastart),(i-datastart));
-     printk ("**** r= %x, prev64=%x prev32=%x****\n", r,prev[1], prev[0]);
+     dev_err(NULL,"**** Configuration failed at byte # %d (%x)****\n", (i-datastart),(i-datastart));
+     dev_err(NULL,"**** r= %x, prev64=%x prev32=%x****\n", r,prev[1], prev[0]);
      return -EFAULT; 
   }
   jtag_send(chn, 1, 1, 0   ); //step 11 - set UPDATE-DR state
@@ -1195,12 +1180,13 @@ int JTAG_configure (int chn, unsigned char * buf, int len) {
   set_pgm_mode(chn, 0);
 
   if (r==0) {
-    printk("*** FPGA did not start after configuration ***\r\n");
+	  dev_err(NULL,"*** FPGA did not start after configuration ***\r\n");
 	  return -EFAULT;
   }
 
   //D( udelay (100000);printk("\nJTAG_configure() OK!\r\n"));
   D( mdelay (100);printk("\nJTAG_configure() OK!\r\n"));
+  dev_info(NULL,"JTAG_configure() OK!\n");
   return 0;
 } //int JTAG_configure
 
@@ -1398,10 +1384,10 @@ static int __init fpga_jtag_init(void) {
    int i,res;
    res = register_chrdev(FPGA_JTAG_MAJOR, fpga_jtag_name, &fpga_jtag_fops);
    if(res < 0) {
-     printk(KERN_ERR "\nfpga_jtag_init: couldn't get a major number %d.\n",FPGA_JTAG_MAJOR);
+	   dev_err(NULL,"\nfpga_jtag_init: couldn't get a major number %d.\n",FPGA_JTAG_MAJOR);
      return res;
    }
-   printk(FPGA_JTAG_DRIVER_NAME" - %d\n",FPGA_JTAG_MAJOR);
+   dev_dbg(NULL,FPGA_JTAG_DRIVER_NAME" - %d\n",FPGA_JTAG_MAJOR);
    for (i=0;i<=FPGA_JTAG_MAXMINOR;i++) minors[i]=0;
    initPortC();
 

src/drivers/elphel/multi10359.c

+ 

src/drivers/elphel/multi10359.h

+ 

src/drivers/elphel/sensor_i2c.h

@@ -6,7 +6,7 @@
 *
 *  This program 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
+*  the Free Software Foundation, either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
@@ -19,16 +19,13 @@
 *******************************************************************************/
 
 // I2C device description to be used with i2c sequencer
-/*
-typedef struct x393_i2c_device_tag{
-	      char *                       name;
+typedef struct{
+	      char                         name[32];
 	      u8                           slave7; // slave address (7-bit)
 	      u8                           address_bytes;
 	      u8                           data_bytes;
 	      int                          scl_khz; // maximal SCL frequency in KHz (currently limited by 200KHz slowest)
-	      struct x393_i2c_device_tag * next;
 } x393_i2c_device_t;
-*/
 
 /* Reserve i2c page (1 of 256 for a sensor port)*/
 int i2c_page_alloc(int chn);
@@ -36,25 +33,37 @@ int i2c_page_alloc(int chn);
 /* Free i2c page */
 void i2c_page_free(int chn, int page);
 
-/* Set i2c table entry to raw data (will just overwrite tbl_mode = 2) */
-void set_sensor_i2c_raw(int chn,
+/* Set i2c table entry to raw data (will just overwrite tbl_mode = 2)*/
+void set_xi2c_raw(int chn,
 	             int page,   // index in lookup table
 				 u32 data);  // Bit delay - number of mclk periods in 1/4 of the SCL period
 
-/* Set i2c table entry for write operation */
-void set_sensor_i2c_wr(int chn,
+/*
+ *  Set i2c table entry for write operation using known devices
+ * Get device with xi2c_dev_get(), copy and modify, if needed to
+ * offset slave address or change number of bytes to write, SCL frequency
+ */
+void set_xi2c_wrc( x393_i2c_device_t * dc,   // device class
+		          int                  chn,  // sensor port
 		          int                  page, // index in lookup table
-					  int sa,          // slave address (7 bit)
-					  int rah,         // High byte of the i2c register address
-					  int num_bytes,   //Number of bytes to write (1..10)
-					  int bit_delay); // Bit delay - number of mclk periods in 1/4 of the SCL period
+				  int                  rah); // High byte of the i2c register address
+
+/*
+ * Set i2c table entry for read operation using known devices
+ * Get device with xi2c_dev_get(), copy and modify, if needed to
+ * offset slave address or change number of bytes to write, SCL frequency
+ */
+void set_xi2c_rdc(x393_i2c_device_t * dc,    // device class
+        		 int                 chn,    // sensor port
+				 int                 page);  // index in lookup table
 
 /* Set i2c table entry for read operation */
-void set_sensor_i2c_rd(int chn,
+void set_xi2c_rd(int chn,
 		         int page,          // index in lookup table
 				 int two_byte_addr, // Number of address bytes (0 - one byte, 1 - two bytes)
 				 int num_bytes,     // Number of bytes to read (1..8, 0 means 8)
-					  int bit_delay);// Bit delay - number of mclk periods in 1/4 of the SCL period
+				 int bit_delay);    // Bit delay - number of mclk periods in 1/4 of the SCL period
+
 /*
 // Write i2c command to the i2c command sequencer
 // I2C command sequencer, block of 16 DWORD slots for absolute frame numbers (modulo 16) and 15 slots for relative ones
@@ -75,27 +84,52 @@ void set_sensor_i2c_rd(int chn,
 
 /* Write one or multiple DWORDs to i2c relative (modulo16) address. Use offs = 0 for immediate (ASAP) command */
 /* Length of data is determined by the page data already preset */
-int write_sensor_i2c_rel (int chn,
+int write_xi2c_rel (int chn,
                     int offs,    // 4 bits
                     u32 * data);
 
-/* Same to absolute (modulo16) address */
-int write_sensor_i2c_abs (int chn,
+int write_xi2c_abs (int chn,
                     int offs, // 4 bits
                     u32 * data);
-
 /* Write sensor 16 bit (or 8 bit as programmed in the table) data in immediate mode */
-void  write_sensor_reg16  (int chn,
+void  write_xi2c_reg16  (int chn,
 	 	                 int page,  // page (8 bits)
                          int addr,  // low 8 bits
 	      				 u32 data); // 16 or 8-bit data (LSB aligned)
 
-/* Initiate sensor i2c read in immediate mode (data itself has to be read from FIFO with read_sensor_i2c_fifo)*/
-void  read_sensor_i2c  (int chn,
+/*
+ * Initiate sensor i2c read in immediate mode (data itself has to be read from FIFO with read_xi2c_fifo)
+ * Use slave address from provided class structure.
+ */
+void  read_xi2c (x393_i2c_device_t * dc,     // device class
+		         int chn,
+		         int page,  // page (8 bits)
+                 int addr); // 8/16 bit address
+
+/* Initiate sensor i2c read in immediate mode (data itself has to be read from FIFO with read_xi2c_fifo)*/
+void  read_xi2c_sa7 (int chn,
 		             int page,  // page (8 bits)
 					 int sa7,   // 7-bit i2c slave address
                      int addr); // 8/16 bit address
 
 /* Read next byte from the channel i2c FIFO. Return byte or -1 if no data available */
 /* Sensor channel status should be in auto update mode (3) */
-int read_sensor_i2c_fifo(int chn);
+int read_xi2c_fifo(int chn);
+
+/* Handling classes of i2c devices */
+x393_i2c_device_t * xi2c_dev_get(const char * name);
+
+/* Single-command i2c write/read register using pre-defined device classes */
+int x393_xi2c_write_reg(const char * cname,    // device class name
+						int          chn,      // sensor port number
+				        int          sa7_offs, // slave address (7-bit) offset from the class defined slave address
+				        int          reg_addr, // register address (width is defined by class)
+				        int          data);    // data to write (width is defined by class)
+
+int x393_xi2c_read_reg( const char * cname,    // device class name
+						int          chn,      // sensor port number
+				        int          sa7_offs, // slave address (7-bit) offset from the class defined slave address
+				        int          reg_addr, // register address (width is defined by class)
+				        int *        datap);   // pointer to a data receiver (read data width is defined by class)
+
+

src/drivers/misc/ltc3589.c

@@ -6,7 +6,7 @@
  *!
  *!  This program 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
+ *!  the Free Software Foundation, either version 2 of the License, or
  *!  (at your option) any later version.
  *!
  *!  This program is distributed in the hope that it will be useful,

src/drivers/misc/vsc330x.c

 /*!***************************************************************************
  *! FILE NAME  : vsc330x.c
  *! DESCRIPTION: control of the VSC3304 4x4 crosspoint switch
- *! Copyright (C) 2013 Elphel, Inc.
+ *! Copyright (C) 2013-2016 Elphel, Inc.
  *! -----------------------------------------------------------------------------**
  *!
  *!  This program 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
+ *!  the Free Software Foundation, either version 2 of the License, or
  *!  (at your option) any later version.
  *!
  *!  This program is distributed in the hope that it will be useful,