Update V03.06.11-FW18.1

Changelog

@@ -1,3 +1,9 @@
+Firmware Release 03.06.11 (99)
+
+System:
+[FIXED] Display freeze after screen care
+
+################################################################################
 Firmware Release 03.06.09 (99)
 
 Devices:

configs/vtp-ctp/patches/linux-4.9.146/0442-Revert-uio-map-wc-fix-forward-of_node-to-uio-dev-reg.patch

@@ -0,0 +1,66 @@
+From 722509ddc3c6844609019d07a6269f89a7a90f45 Mon Sep 17 00:00:00 2001
+From: Oleg Karfich <[email protected]>
+Date: Mon, 14 Dec 2020 12:20:49 +0100
+Subject: [PATCH] Revert "uio: map-wc: fix: forward of_node to uio dev
+ registration"
+
+This reverts commit 9520ad8fbf48b264df949cb7a3fc4778f23608b8.
+
+Revert this patch due to hanging cpu
+---
+ drivers/uio/uio.c             | 6 +-----
+ drivers/uio/uio_pdrv_genirq.c | 1 -
+ include/linux/uio_driver.h    | 1 -
+ 3 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
+index c10aa0d..170d053 100644
+--- a/drivers/uio/uio.c
++++ b/drivers/uio/uio.c
+@@ -647,7 +647,7 @@ static const struct vm_operations_struct uio_physical_vm_ops = {
+ static int uio_mmap_physical(struct vm_area_struct *vma)
+ {
+ 	struct uio_device *idev = vma->vm_private_data;
+-	struct device_node *np = idev->info->of_node_parent;
++	struct device_node *np = idev->dev->of_node;
+ 	int mi = uio_find_mem_index(vma);
+ 	struct uio_mem *mem;
+ 	if (mi < 0)
+@@ -660,10 +660,6 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
+ 		return -EINVAL;
+
+ 	vma->vm_ops = &uio_physical_vm_ops;
+-
+-	if (np == NULL)
+-		return -EINVAL;
+-
+ 	if(of_find_property(np, "uio,map-wc", NULL))
+ 		/* map the region as normal memory with the attributes:
+ 		 * non-cacheable and bufferable. On ARM this is needed for
+diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
+index c2aff88..bc6fc21 100644
+--- a/drivers/uio/uio_pdrv_genirq.c
++++ b/drivers/uio/uio_pdrv_genirq.c
+@@ -194,7 +194,6 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
+ 	 * Interrupt sharing is not supported.
+ 	 */
+
+-	uioinfo->of_node_parent = pdev->dev.of_node;
+ 	uioinfo->handler = uio_pdrv_genirq_handler;
+ 	uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
+ 	uioinfo->open = uio_pdrv_genirq_open;
+diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
+index fa6c994..32c0e83 100644
+--- a/include/linux/uio_driver.h
++++ b/include/linux/uio_driver.h
+@@ -95,7 +95,6 @@ struct uio_info {
+ 	struct uio_device	*uio_dev;
+ 	const char		*name;
+ 	const char		*version;
+-	struct device_node      *of_node_parent;
+ 	struct uio_mem		mem[MAX_UIO_MAPS];
+ 	struct uio_port		port[MAX_UIO_PORT_REGIONS];
+ 	long			irq;
+-- 
+2.7.4
+

configs/vtp-ctp/patches/linux-4.9.146/0443-Revert-uio-add-support-for-normal-mem-mapping.patch

@@ -0,0 +1,77 @@
+From 459f800babfe34f5cbbf38cf0d988cbd01a265f0 Mon Sep 17 00:00:00 2001
+From: Oleg Karfich <[email protected]>
+Date: Mon, 14 Dec 2020 12:21:22 +0100
+Subject: [PATCH] Revert "uio: add support for normal mem mapping"
+
+This reverts commit 13d2d971cf3d5c3c2dd2a700ca677df81ef93101.
+
+Revert this patch due to hanging cpu
+---
+ arch/arm/boot/dts/am335x-pfc-750_8xxx-nvram.dtsi |  1 -
+ arch/arm/boot/dts/am3505-pfc-750_820x.dtsi       |  1 -
+ drivers/uio/uio.c                                | 11 +----------
+ 3 files changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/arch/arm/boot/dts/am335x-pfc-750_8xxx-nvram.dtsi b/arch/arm/boot/dts/am335x-pfc-750_8xxx-nvram.dtsi
+index aaa72ad..e7df885 100644
+--- a/arch/arm/boot/dts/am335x-pfc-750_8xxx-nvram.dtsi
++++ b/arch/arm/boot/dts/am335x-pfc-750_8xxx-nvram.dtsi
+@@ -9,7 +9,6 @@
+ / {
+ 	uio_nvram: UIO_NVRAM@0x1000000 {
+ 		compatible = "uio_pdrv_genirq";
+-		uio,map-wc;
+ 		reg = <0x01000000 0x00020000>; /* 128k 16bit NVRAM */
+ 	};
+ };
+diff --git a/arch/arm/boot/dts/am3505-pfc-750_820x.dtsi b/arch/arm/boot/dts/am3505-pfc-750_820x.dtsi
+index 2b7502b..578272c 100644
+--- a/arch/arm/boot/dts/am3505-pfc-750_820x.dtsi
++++ b/arch/arm/boot/dts/am3505-pfc-750_820x.dtsi
+@@ -106,7 +106,6 @@
+ 	/* nvram is on cs2 */
+ 	UIO_NVRAM@0x2000000 {
+ 		compatible = "uio_pdrv_genirq";
+-		uio,map-wc;
+ 		reg = <0x2000000 0x20000>; /* 128k */
+ 	};
+
+diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
+index 170d053..77ceda1 100644
+--- a/drivers/uio/uio.c
++++ b/drivers/uio/uio.c
+@@ -25,7 +25,6 @@
+ #include <linux/kobject.h>
+ #include <linux/cdev.h>
+ #include <linux/uio_driver.h>
+-#include <linux/of.h>
+
+ #define UIO_MAX_DEVICES		(1U << MINORBITS)
+
+@@ -647,7 +646,6 @@ static const struct vm_operations_struct uio_physical_vm_ops = {
+ static int uio_mmap_physical(struct vm_area_struct *vma)
+ {
+ 	struct uio_device *idev = vma->vm_private_data;
+-	struct device_node *np = idev->dev->of_node;
+ 	int mi = uio_find_mem_index(vma);
+ 	struct uio_mem *mem;
+ 	if (mi < 0)
+@@ -660,14 +658,7 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
+ 		return -EINVAL;
+
+ 	vma->vm_ops = &uio_physical_vm_ops;
+-	if(of_find_property(np, "uio,map-wc", NULL))
+-		/* map the region as normal memory with the attributes:
+-		 * non-cacheable and bufferable. On ARM this is needed for
+-		 * ldrex and strex operations.
+-		 */
+-		vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+-	else
+-		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+ 	/*
+ 	 * We cannot use the vm_iomap_memory() helper here,
+-- 
+2.7.4
+

configs/vtp-ctp/patches/linux-4.9.146/0444-add-new-version-w02.11.03-in-branch-maint-fw18-for-S.patch

@@ -0,0 +1,21 @@
+From f898c37b63252ec4e509f8932612af67291c0fd3 Mon Sep 17 00:00:00 2001
+From: Oleg Karfich <[email protected]>
+Date: Mon, 14 Dec 2020 12:22:55 +0100
+Subject: [PATCH] add new version w02.11.03 in branch maint-fw18 for
+ SVN-Release-branch
+
+Signed-off-by: Oleg Karfich <[email protected]>
+---
+ localversion-wago | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/localversion-wago b/localversion-wago
+index 0b1dde1..9d412b6 100644
+--- a/localversion-wago
++++ b/localversion-wago
+@@ -1 +1 @@
+-w02.11.02
++w02.11.03
+-- 
+2.7.4
+

configs/vtp-ctp/patches/linux-4.9.146/series

@@ -439,3 +439,6 @@
 0439-add-new-version-w02.11.1-in-branch-maint-fw18-for-SV.patch
 0440-config-dts-ec-enable-PTN5150-driver-and-adjust-ec300.patch
 0441-add-new-version-w02.11.2-in-branch-maint-fw18-for-SV.patch
+0442-Revert-uio-map-wc-fix-forward-of_node-to-uio-dev-reg.patch
+0443-Revert-uio-add-support-for-normal-mem-mapping.patch
+0444-add-new-version-w02.11.03-in-branch-maint-fw18-for-S.patch

configs/vtp-ctp/ptxconfig_generic

@@ -108,7 +108,6 @@ PTXCONF_HOST_DBUS_GLIB=y
 PTXCONF_HOST_DBUS=y
 # PTXCONF_HOST_DOSFSTOOLS is not set
 PTXCONF_HOST_DUMMY_INSTALL_INFO=y
-# PTXCONF_HOST_E2FSPROGS is not set
 # PTXCONF_HOST_EGGDBUS is not set
 PTXCONF_HOST_ELF_H_COMPAT=y
 PTXCONF_HOST_EXPAT=y

local_src/brightness_control/brightness_control.c

@@ -9,7 +9,7 @@
 ///
 /// \file    brightness_control.c
 ///
-/// \version $Id: brightness_control.c 51858 2020-09-08 11:48:37Z wrueckl_elrest $
+/// \version $Id: brightness_control.c 54500 2020-12-14 14:31:55Z wrueckl_elrest $
 ///
 /// \brief   brightness control, display backlight settings
 ///
@@ -252,6 +252,7 @@ int TurnScreensaverBacklightOn();
 int IsNightTime();
 int GetSensorBrightnessValue();
 int GetScreensaverActivity();
+int GetScreenCareActivity();
 int ReadAIn(unsigned short * pAdcVal);
 int GetClearScreenActivity();
 int GetUsbKeyboardDeviceName(char * pInputDeviceName, int maxlen);
@@ -2191,6 +2192,23 @@ int GetScreensaverActivity()
   return status;
 }
 
+/// \brief Read if screen care is active at this moment 
+///
+/// The function returns the current screen care activity
+///
+/// \retval  1 screen care is just active on screen
+/// \retval  0 screen care is not active on screen
+///
+int GetScreenCareActivity()
+{
+  int status = 0;  
+  if (system("pidof screen_care > /dev/null 2>&1") == 0)
+  {
+    status = 1;  
+  }
+  return status;
+}
+
 /// \brief Read analog input value 
 ///
 /// The function reads the AIN value (10 bit value)
@@ -2296,9 +2314,13 @@ void CallScreenCare()
       {  
         //do not start display care if someone is using the panel
         //if ((tnow - g_displayData.tLastEventReceived) > 60)
-        //{    
-          g_displayData.called = 1;
-          system("/usr/bin/screen_care");
+        //{
+          //start if not already running and no screensaver is active
+          if ((GetScreensaverActivity() == 0) && (GetScreenCareActivity() == 0))
+          {
+            g_displayData.called = 1;
+            system("/usr/bin/screen_care");
+          }
         //}        
       }
     }

local_src/screen_care/screen_care.cpp

@@ -25,7 +25,7 @@
 ///------------------------------------------------------------------------------
 /// \file    screen_care.cpp
 ///
-/// \version $Id: screen_care.cpp 43460 2019-10-09 13:25:56Z wrueckl_elrest $
+/// \version $Id: screen_care.cpp 54500 2020-12-14 14:31:55Z wrueckl_elrest $
 ///
 /// \brief   main file
 ///
@@ -84,8 +84,6 @@ int main(int argc, char **argv)
               qDebug() << "Start -n " << window->numberOfColorChanges << "=>" << QTime::currentTime().toString("hh:mm:ss.zzz");
           }
 
-          window->setFocus();
-          window->raise();
           window->show();
 
           app.setOverrideCursor(Qt::BlankCursor);

local_src/screen_care/screencare.cpp

@@ -25,15 +25,15 @@
 ///------------------------------------------------------------------------------
 /// \file    screencare.cpp
 ///
-/// \version $Id: screencare.cpp 43460 2019-10-09 13:25:56Z wrueckl_elrest $
+/// \version $Id: screencare.cpp 54500 2020-12-14 14:31:55Z wrueckl_elrest $
 ///
 /// \brief   Application main window implementation
 ///
 /// \author  Nicoleta Nething, elrest Automationssysteme GmbH
 ///------------------------------------------------------------------------------
 
 #include "screencare.h"
-//#include <QDebug>
+#include <QDebug>
 #include <QPainter>
 #include <QTime>
 #include <QPaintEvent>
@@ -46,6 +46,8 @@ ScreenCare::ScreenCare(long l_numberOfColorChanges, QWidget *parent) :
 {
   idxNumberOfColorChanges = 0;
   numberOfColorChanges = l_numberOfColorChanges;
+  bXdoDone = false;
+  iCounter = 0;
 }
 
 ScreenCare::~ ScreenCare()
@@ -74,13 +76,13 @@ void ScreenCare::paintEvent(QPaintEvent *event)
   idxNumberOfColorChanges++;
   if (idxNumberOfColorChanges >=numberOfColorChanges)
   {
-      //this->close();
-      QTimer::singleShot(100, this, SLOT(close()));
+      //200ms black
+      QTimer::singleShot(200, this, SLOT(OnCloseScreenCare()));
   }
   else
   {
-      QTimer::singleShot(100, this, SLOT(update()));
-      //this->update();
+      //200ms white
+      QTimer::singleShot(200, this, SLOT(update()));
   }
 
 }
@@ -106,4 +108,28 @@ void ScreenCare::ActivateX11Window()
       //qDebug() << "ActivateX11Window: " << id;
     }
   }
+  bXdoDone = true;
+}
+
+void ScreenCare::OnCloseScreenCare()
+{
+  hide();
+  if (bXdoDone)
+  {
+    close();
+  }
+  else
+  {
+    iCounter++;
+    if (iCounter > 10)
+    {
+      //timeout
+      close();
+    }
+    else
+    {
+      qDebug() << "RETRY";
+      QTimer::singleShot(1000, this, SLOT(OnCloseScreenCare()));
+    }
+  }
 }

local_src/screen_care/screencare.h

@@ -25,7 +25,7 @@
 ///------------------------------------------------------------------------------
 /// \file    screencare.h
 ///
-/// \version $Id: screencare.h 43460 2019-10-09 13:25:56Z wrueckl_elrest $
+/// \version $Id: screencare.h 54500 2020-12-14 14:31:55Z wrueckl_elrest $
 ///
 /// \brief   Application main window - header
 ///
@@ -50,10 +50,13 @@ class ScreenCare : public QMainWindow
     ~ ScreenCare();
 
     long numberOfColorChanges;
+    bool bXdoDone;
+    int iCounter;
 
 signals:
 public slots:
     void ActivateX11Window();
+    void OnCloseScreenCare();
 
 protected:
     long idxNumberOfColorChanges;

projectroot.vtp-ctp/etc/script/start_framebuffer.sh

@@ -103,5 +103,6 @@ fi
 
 #Start Microbrowser
 if [ ! -z "$URL" ]; then
+  sleep 5
   /etc/config-tools/start_microbrowser $URL > /dev/null 2>&1 &
 fi

projectroot.vtp-ctp/etc/script/start_panel.sh

@@ -105,7 +105,7 @@ set_xorg_conf () {
 		(cat /proc/bus/input/devices | grep "eGalax Inc. eGalaxTouch P80H84") &>/dev/null
 		if [ $? -eq 0 ]; then
 			cap="1"
-			#echo 6 > /sys/bus/i2c/devices/2-001b/NTHR_VALUE
+			echo 6 > /sys/bus/i2c/devices/2-001b/NTHR_VALUE
 		else
 			cap="0"
 		fi

projectroot/etc/REVISIONS

@@ -1 +1 @@
-FIRMWARE=03.06.09(99)
+FIRMWARE=03.06.11(99)

rules/host-e2fsprogs.in

@@ -0,0 +1,8 @@
+## SECTION=hosttools_noprompt
+
+config HOST_E2FSPROGS
+	tristate
+	select HOST_UTIL_LINUX_NG
+	default y if ALLYES
+	help
+	  Useful hosttools for management of ext2 and ext3 filesystems