merged with master

README.md

@@ -19,6 +19,8 @@ Run Eclipse from its location directory and provide additional heap memory to it
 ```
 ./eclipse -vmargs -Xmx4G
 ```
+or just edit eclipse.ini (same directory as eclipse executable) and make sure -Xmx has at least 4G
+
  - File → Import... → General → Existing Project into Workspace
  - [Next] → Select root directory → Browse → specify project location (`poky/linux-elphel/`) → [OK] → [Finish]
 

src/drivers/elphel/Makefile

@@ -14,6 +14,8 @@ obj-$(CONFIG_ELPHEL393)           += clock10359.o
 #fpgajtag-y := fpgajtag353.o x393.o 
 #obj-$(CONFIG_ELPHEL393_EXTERNAL)  += fpgajtag.o
 
+obj-$(CONFIG_ELPHEL393)           += exif393.o
+obj-$(CONFIG_ELPHEL393)           += x393_helpers.o
 obj-$(CONFIG_ELPHEL393)           += framepars.o
 #obj-$(CONFIG_ELPHEL393)           += sensor_common.o x393.o
 #obj-$(CONFIG_ELPHEL393)           += quantization_tables.o

src/drivers/elphel/elphel393-mem.c

@@ -37,6 +37,8 @@
 #include <asm/outercache.h>
 #include <asm/cacheflush.h>
 #include <elphel/elphel393-mem.h>
+#include "x393_helpers.h"
+
 #define SYSFS_PERMISSIONS         0644 /* default permissions for sysfs files */
 #define SYSFS_READONLY            0444
 #define SYSFS_WRITEONLY           0222
@@ -311,6 +313,47 @@ static ssize_t sync_for_device_bidir(struct device *dev, struct device_attribute
     return count;
 }
 
+static ssize_t flush_cpu_cache(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	const int buff_size = 0x1000000;
+	const int buff_start_offset = 0x100000;
+	unsigned int chn;
+	int start_offset, end_offset;
+	int num_items;
+	dma_addr_t phys_addr_start, phys_addr_end;
+	u32 start_time, end_time;
+
+	num_items = sscanf(buf, "%u:%d:%d", &chn, &start_offset, &end_offset);
+	start_time = get_rtc_usec();
+	if (num_items == 3) {
+		// invalidate L2 caches
+		if (end_offset > start_offset) {
+			// handle single buffer case
+			phys_addr_start = _elphel_buf.paddr + buff_start_offset + chn * buff_size + start_offset;
+			phys_addr_end = _elphel_buf.paddr + buff_start_offset + chn * buff_size + end_offset - 1;
+			outer_inv_range(phys_addr_start, phys_addr_end);
+		} else {
+			// handle split buffer case when pointer rolls over the end
+			// first, process the peace at the end of the buffer
+			phys_addr_start = _elphel_buf.paddr + buff_start_offset + chn * buff_size + start_offset;
+			phys_addr_end = _elphel_buf.paddr + buff_start_offset + ++chn * buff_size - 1;
+			outer_inv_range(phys_addr_start, phys_addr_end);
+
+			// second, process the peace at the start of the buffer
+			phys_addr_start = _elphel_buf.paddr + buff_start_offset + chn * buff_size;
+			phys_addr_end = _elphel_buf.paddr + buff_start_offset + chn * buff_size + end_offset - 1;
+			outer_inv_range(phys_addr_start, phys_addr_end);
+		}
+	}
+	end_time = get_rtc_usec();
+	if (start_time == 0 && end_time == 0) {
+		pr_info("Unable to get usec values\n");
+	} else {
+		pr_info("Cache invalidate time: %lu\n", end_time - start_time);
+	}
+	return count;
+}
+
 static ssize_t get_sync_for_device_h2d(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	return sprintf(buf,"Write address/length pair into this file to hand this region of the host to device DMA buffer to device (after CPU writes).\n");
@@ -335,6 +378,11 @@ static ssize_t get_sync_for_cpu_bidir(struct device *dev, struct device_attribut
 {
 	return sprintf(buf,"Write address/length pair into this file to hand this region of the bidirectional DMA buffer to CPU (before CPU reads).\n");
 }
+static ssize_t get_flush_cpu_cache(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	return sprintf(buf, "Write command and address into this file to flush CPU caches. Format 'chn:start_offset:end_offset' where "
+			"'chn' is sensor channel, 'start_offset' and 'end_offset' are start and end data offsets in circbuf\n");
+}
 
 static DEVICE_ATTR(buffer_address,        SYSFS_PERMISSIONS & SYSFS_READONLY,     get_paddr,                 NULL);
 static DEVICE_ATTR(buffer_pages,          SYSFS_PERMISSIONS & SYSFS_READONLY,     get_size,                  NULL);
@@ -351,6 +399,7 @@ static DEVICE_ATTR(sync_for_cpu_d2h,      SYSFS_PERMISSIONS,
 static DEVICE_ATTR(sync_for_device_d2h,   SYSFS_PERMISSIONS,                      get_sync_for_device_d2h,   sync_for_device_d2h);
 static DEVICE_ATTR(sync_for_cpu_bidir,    SYSFS_PERMISSIONS,                      get_sync_for_cpu_bidir,    sync_for_cpu_bidir);
 static DEVICE_ATTR(sync_for_device_bidir, SYSFS_PERMISSIONS,                      get_sync_for_device_bidir, sync_for_device_bidir);
+static DEVICE_ATTR(flush_cpu_cache,       SYSFS_PERMISSIONS,                      get_flush_cpu_cache,       flush_cpu_cache);
 
 static struct attribute *root_dev_attrs[] = {
 		&dev_attr_buffer_address.attr,
@@ -368,6 +417,7 @@ static struct attribute *root_dev_attrs[] = {
 		&dev_attr_sync_for_device_d2h.attr,
 		&dev_attr_sync_for_cpu_bidir.attr,
 		&dev_attr_sync_for_device_bidir.attr,
+		&dev_attr_flush_cpu_cache.attr,
 		NULL
 };
 

src/drivers/elphel/framepars.c

@@ -19,7 +19,7 @@
  */
 
 //copied from cxi2c.c - TODO:remove unneeded
-#undef JTAG_BRANCH
+
 
 #include <linux/types.h>        /// div for 64
 #include <asm/div64.h>          /// div for 64
@@ -147,9 +147,7 @@ wait_queue_head_t       aframepars_wait_queue[SENSOR_PORTS];/// used to wait for
 
 /* Remove after compilation OK */
 struct sensorproc_t * sensorproc = NULL;
-#ifdef JTAG_BRANCH
-void camera_interrupts (int on) {}
-#endif
+//void camera_interrupts (int on) {}
 #if 0
 #define wait_event_interruptible(wq, condition)				\
 ({									\
@@ -1342,25 +1340,24 @@ int framepars_remove(struct platform_device *pdev)
 
 	return 0;
 }
-#ifdef JTAG_BRANCH
-static const struct of_device_id elphel393_framepars_of_match[] = {
-	{ .compatible = "elphel,elphel393-framepars-1.00" },
-	{ /* end of list */ }
-};
-MODULE_DEVICE_TABLE(of, elphel393_framepars_of_match);
-
-static struct platform_driver elphel393_framepars = {
-	.probe			= framepars_init,
-	.remove			= framepars_remove,
-	.driver			= {
-		.name		= FRAMEPARS_DRIVER_NAME,
-		.of_match_table = elphel393_framepars_of_match,
-	},
-};
-
-module_platform_driver(elphel393_framepars);
 
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andrey Filippov <andrey@elphel.com>.");
-MODULE_DESCRIPTION(X3X3_FRAMEPARS_DRIVER_NAME);
-#endif
\ No newline at end of file
+//static const struct of_device_id elphel393_framepars_of_match[] = {
+//	{ .compatible = "elphel,elphel393-framepars-1.00" },
+//	{ /* end of list */ }
+//};
+//MODULE_DEVICE_TABLE(of, elphel393_framepars_of_match);
+//
+//static struct platform_driver elphel393_framepars = {
+//	.probe			= framepars_init,
+//	.remove			= framepars_remove,
+//	.driver			= {
+//		.name		= FRAMEPARS_DRIVER_NAME,
+//		.of_match_table = elphel393_framepars_of_match,
+//	},
+//};
+//
+//module_platform_driver(elphel393_framepars);
+//
+//MODULE_LICENSE("GPL");
+//MODULE_AUTHOR("Andrey Filippov <andrey@elphel.com>.");
+//MODULE_DESCRIPTION(X3X3_FRAMEPARS_DRIVER_NAME);

src/drivers/elphel/jpeghead.c

@@ -90,7 +90,7 @@ static struct jpeghead_priv_t {
 	unsigned int             fpga_programmed;
 	unsigned long            jpeg_h_sz;  /// JPEG header size (no Exif)
 	unsigned char            header[JPEG_HEADER_MAXSIZE];
-} jpeghead_priv[IMAGE_CHN_NUM];
+} jpeghead_priv[SENSOR_PORTS];
 
 #define HEADER_COPY_SOF(x) {buf[bpl] = sizeof( x ) + 8; \
                             buf[bp++] = sizeof( x ) / 3; \
@@ -683,7 +683,7 @@ void jpeg_htable_fpga_pgm(unsigned int chn)
 	table_addr.type = 3;
 	local_irq_save(flags);
 	x393_cmprs_tables_address(table_addr, chn);
-	for (i = 0; i < sizeof(huff_tables->fpga_huffman_table); i++) {
+	for (i = 0; i < sizeof(huff_tables->fpga_huffman_table) / sizeof(huff_tables->fpga_huffman_table[0]); i++) {
 		x393_cmprs_tables_data((u32)huff_tables->fpga_huffman_table[i], chn);
 	}
 	local_irq_restore(flags);
@@ -748,7 +748,7 @@ int jpeghead_init(struct platform_device *pdev)
 	int i;
 
 	g_dev_ptr = &pdev->dev;
-	for (i = 0; i < IMAGE_CHN_NUM; i++) {
+	for (i = 0; i < SENSOR_PORTS; i++) {
 		jpeghead_priv[i].fpga_programmed = 0;
 		jpeg_htable_init(i);
 	}
@@ -759,7 +759,7 @@ int jpeghead_init(struct platform_device *pdev)
 	if (get_cache_policy() == COMMON_CACHE) {
 		reset_qtables(0);
 	} else if (get_cache_policy() == PER_CHN_CACHE) {
-		for (i = 0; i < IMAGE_CHN_NUM; i++)
+		for (i = 0; i < SENSOR_PORTS; i++)
 			reset_qtables(i);
 	}
 

src/drivers/elphel/quantization_tables.c

@@ -78,7 +78,7 @@
 /** @brief Total number of quantization table pairs */
 #define FPGA_NQTAB           8
 #define CORING_SIZE          32 // longs
-#define QTABLE_SETS_NUM      (IMAGE_CHN_NUM + 1)
+#define QTABLE_SETS_NUM      (SENSOR_PORTS + 1)
 #define COMMON_CACHE_INDEX   0
 
 

src/drivers/elphel/sensor_common.h

@@ -20,7 +20,7 @@ int camseq_get_jpeg_rp(unsigned int chn);
 void camseq_set_jpeg_rp(unsigned int chn, int ptr);
 
 ///CIRCBUF macros
-extern unsigned long  * ccam_dma_buf_ptr;
+extern unsigned long  * ccam_dma_buf_ptr[SENSOR_PORTS];
 
 /* move these lines to x313_macro.h
 #define X313_LENGTH_MASK      0xff000000
@@ -33,7 +33,7 @@ extern unsigned long  * ccam_dma_buf_ptr;
 ///can be verified with if (!X313_IS_SDRAM_ON)
 void reset_compressor(unsigned int chn);
 void camera_interrupts (int on);
-struct sensorproc_t * copy_sensorproc (struct sensorproc_t * copy);
+struct sensorproc_t * copy_sensorproc (int sensor_port, struct sensorproc_t * copy);
 
 ///NOTE: If profiling is enabled (TASKLET_CTL_ENPROF is set in G_TASKLET_CTL) - save current time in 2 of the 32-bit locations that can be read as pastpars (i.e. from PHP)
 #ifdef TEST_DISABLE_CODE
@@ -52,8 +52,15 @@ struct sensorproc_t * copy_sensorproc (struct sensorproc_t * copy);
 int image_acq_init(struct platform_device *pdev);
 
 // indicate that this channel need attention; set in interrupt handler, reset in bottom half
-#define SENS_FLAG_IRQ   0x01
+#define SENS_FLAG_IRQ             0x01
 // got 0x20 more than start of the new image
 #define OFFSET_X40      0x40
 
+/* debug code follows */
+long long get_zero_counter(unsigned int chn);
+long long get_corrected_offset(unsigned int chn);
+long long get_frame_counter(unsigned int chn);
+long long get_frame_pos(unsigned int chn, unsigned int pos);
+/* end of debug code */
+
 #endif

src/drivers/elphel/sensor_i2c.c

@@ -18,7 +18,7 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 /****************** INCLUDE FILES SECTION ***********************************/
-#define DEBUG /* should be before linux/module.h - enables dev_dbg at boot in this file */
+//#define DEBUG /* should be before linux/module.h - enables dev_dbg at boot in this file */
 
 #include <linux/module.h>
 #include <linux/sched.h>

src/drivers/elphel/x393_helpers.c

+/** @file x393_helpers.c
+ *
+ * @brief Helper functions for various routines form x393.h which require several actions to get
+ * reliable result.
+ */
+
+/* Copyright (C) 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
+ *  (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/>.
+ */
+
+#include <stddef.h>
+#include "x393_helpers.h"
+
+/**
+ * @brief Read RTC microsecond counter.
+ * @return Current value of microsecond counter or 0 in case read sequence was
+ * not successful.
+ */
+u32 get_rtc_usec(void)
+{
+	x393_rtc_status_t stat;
+	x393_status_ctrl_t stat_ctrl;
+	x393_rtc_usec_t   usec;
+	unsigned int i;
+
+	stat = x393_rtc_status();
+	stat_ctrl.d32 = 0;
+	stat_ctrl.mode = 1;
+	stat_ctrl.seq_num = stat.seq_num + 1;
+	set_x393_rtc_set_status(stat_ctrl);
+	for (i = 0; i < REPEAT_READ; i++) {
+		stat = x393_rtc_status();
+		if (stat.seq_num == stat_ctrl.seq_num) {
+			usec = x393_rtc_status_usec();
+			return usec.usec;
+		}
+	}
+	return 0;
+}

src/drivers/elphel/x393_helpers.h

+/** @file x393_helpers.h
+ *
+ * @brief Helper functions for various routines form x393.h which require several actions to get
+ * reliable result.
+ */
+
+/* Copyright (C) 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
+ *  (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/>.
+ */
+
+#ifndef _X393_HELPERS_H
+#define _X393_HELPERS_H
+
+#include <asm/types.h>
+#include "x393.h"
+
+/** @brief Number of times to repeat register read sequence while waiting for
+ * sequence number specified.
+ */
+#define REPEAT_READ               10
+
+u32 get_rtc_usec(void);
+
+#endif /* _X393_HELPERS_H */

src/drivers/elphel/x393_macro.h

@@ -7,9 +7,6 @@
 
 #include <elphel/driver_numbers.h>
 
-/** @brief Number of image channels */
-#define IMAGE_CHN_NUM        4
-
 /** @brief Resolution of current/OEF pointer in bits */
 #define OFFSET256_CNTR_RES   26
 
@@ -62,7 +59,7 @@ static inline unsigned int minor_to_chn(unsigned int minor, unsigned int *dev_ty
 		else
 			*dev_type = 0;
 	}
-	if ((minor & 0x0f) < IMAGE_CHN_NUM)
+	if ((minor & 0x0f) < SENSOR_PORTS)
 		return minor & 0x0f;
 	else
 		return 0;

src/include/elphel/exifa.h

@@ -61,11 +61,12 @@ struct exif_dir_table_t {
 #define  Exif_Image_Software           0x00131
 #define  Exif_Image_DateTime           0x00132
 #define  Exif_Image_Artist             0x0013b
-#define  Exif_Image_HostComputer       0x0013c
+#define  Exif_Image_CameraSerialNumber 0x0c62f
 #define  Exif_Image_Orientation        0x00112
-// hack, reusing field to keep it protected
-#define  Exif_Image_IPTCNAA            0x083bb
-#define  Exif_Image_FrameNumber        0x083bb
+// used for frame number as defined in Exif specification
+#define  Exif_Image_ImageNumber        0x09211
+// used for sensor number
+#define  Exif_Image_PageNumber         0x00129
 
 #define  Exif_Image_ExifTag            0x08769
 #define  Exif_Image_GPSTag             0x08825
@@ -176,15 +177,34 @@ struct meta_CompassInfo_t {
 #define  Exif_GPSInfo_CompassPitch_Index        0x10
 #define  Exif_GPSInfo_CompassRollRef_Index      0x11
 #define  Exif_GPSInfo_CompassRoll_Index         0x12
-#define  Exif_Image_FrameNumber_Index           0x13
+#define  Exif_Image_ImageNumber_Index           0x13
 #define  Exif_Image_Orientation_Index           0x14
-#define  Exif_Photo_MakerNote_Index             0x15
+#define  Exif_Image_PageNumber_Index            0x15
+#define  Exif_Photo_MakerNote_Index             0x16
 /// update ExifKmlNumber to be total number of *_Index entries
 #define  ExifKmlNumber                          Exif_Photo_MakerNote_Index+1
 
-
-#define EXIF_DEV_NAME "/dev/exif_exif"
+//#define EXIF_DEV_NAME "/dev/exif_exif"
 #define EXIFDIR_DEV_NAME "/dev/exif_metadir"
-#define EXIFMETA_DEV_NAME "/dev/exif_meta"
-
-#endif
+//#define EXIFMETA_DEV_NAME "/dev/exif_meta"
+
+/**
+ * @brief This macro is used to construct file names in user space applications. Example
+ * of usage: <e>const char *exif_file_names[SENSOR_PORTS] = { EXIF_DEV_NAMES };</e>. Then the
+ * sensor port number can be used to access file name.
+ */
+#define EXIF_DEV_NAMES		"/dev/exif_exif0", \
+							"/dev/exif_exif1", \
+							"/dev/exif_exif2", \
+							"/dev/exif_exif3"
+/**
+ * @brief This macro is used to construct file names in user space applications. Example
+ * of usage: <e>const char *exifmeta_file_names[SENSOR_PORTS] = { EXIFMETA_DEV_NAMES };</e>. Then
+ * the sensor port number can be used to access file name.
+ */
+#define EXIFMETA_DEV_NAMES	"/dev/exif_meta0", \
+							"/dev/exif_meta1", \
+							"/dev/exif_meta2", \
+							"/dev/exif_meta3"
+
+#endif /* _ASM_EXIF_H */