From patchwork Fri Jul 21 13:08:43 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [RFC,v4,05/11] fff-support: Update PoE passthrough code
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 398
Message-Id: <1500642529-3627-6-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Fri, 21 Jul 2017 15:08:43 +0200

This implements an upgrade safe solution for the PoE passthrough
on multiple devices. Since LEDE already provides the relevant
settings, a check whether those are in place enables both
identification of affected devices and automatic deactivation
if parameters are changed.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../ar71xx/usr/lib/fff-support/activate_poe_passthrough.sh    |  8 ++++++++
 .../usr/lib/fff-support/cpe210_activate_poe_passthrough.sh    |  5 -----
 .../ar71xx/usr/lib/fff-support/disable_poe_passthrough.sh     | 11 +++++++++++
 .../ar71xx/usr/lib/fff-support/permanent_poe_passthrough.sh   |  9 +++++++++
 .../fff/fff-sysupgrade/files/usr/sbin/configurefffinit        |  5 +++++
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100755 src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/activate_poe_passthrough.sh
 delete mode 100644 src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/cpe210_activate_poe_passthrough.sh
 create mode 100755 src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/disable_poe_passthrough.sh
 create mode 100755 src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/permanent_poe_passthrough.sh

diff --git a/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/activate_poe_passthrough.sh b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/activate_poe_passthrough.sh
new file mode 100755
index 0000000..b29e351
--- /dev/null
+++ b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/activate_poe_passthrough.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This enables PoE passthrough so it is persistent through reboots,
+# but reset after firmware upgrade
+
+if uci -q get "system.poe_passthrough" > /dev/null ; then
+    uci -q set "system.poe_passthrough.value=1"
+    uci -q commit system
+fi
diff --git a/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/cpe210_activate_poe_passthrough.sh b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/cpe210_activate_poe_passthrough.sh
deleted file mode 100644
index cb3508f..0000000
--- a/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/cpe210_activate_poe_passthrough.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ "$(cat /var/sysinfo/model)" = "TP-Link CPE210 v1.1" ] ; then
-  echo 20 > /sys/class/gpio/export
-  echo out > /sys/class/gpio/gpio20/direction
-  echo 1 > /sys/class/gpio/gpio20/value
-fi
diff --git a/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/disable_poe_passthrough.sh b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/disable_poe_passthrough.sh
new file mode 100755
index 0000000..82c84fa
--- /dev/null
+++ b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/disable_poe_passthrough.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# This disables PoE passthrough permanently
+
+uci -q set "fff.poe_passthrough=gpio"
+uci -q set "fff.poe_passthrough.active=0"
+uci -q commit fff
+
+if uci -q get "system.poe_passthrough" > /dev/null ; then
+    uci -q set "system.poe_passthrough.value=0"
+    uci -q commit system
+fi
diff --git a/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/permanent_poe_passthrough.sh b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/permanent_poe_passthrough.sh
new file mode 100755
index 0000000..f9acb88
--- /dev/null
+++ b/src/packages/fff/fff-support/ar71xx/usr/lib/fff-support/permanent_poe_passthrough.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# This enables PoE passthrough permanently, so it is persistent
+# during firmware upgrades
+
+uci -q set "fff.poe_passthrough=gpio"
+uci -q set "fff.poe_passthrough.active=1"
+uci -q commit fff
+
+/usr/lib/fff-support/activate_poe_passthrough.sh
diff --git a/src/packages/fff/fff-sysupgrade/files/usr/sbin/configurefffinit b/src/packages/fff/fff-sysupgrade/files/usr/sbin/configurefffinit
index abee2a7..e8235fb 100755
--- a/src/packages/fff/fff-sysupgrade/files/usr/sbin/configurefffinit
+++ b/src/packages/fff/fff-sysupgrade/files/usr/sbin/configurefffinit
@@ -29,4 +29,9 @@ if [ "$traffic_enabled" -eq 1 ] ; then
 	simple-tc "${wan_interface}" "${traffic_in}" "${traffic_out}" 2> /dev/null
 fi
 
+poe_passthrough=$(uci -q get "fff.poe_passthrough.enabled")
+if [ "$poe_passthrough" = "1" ] && [ -s /usr/lib/fff-support/activate_poe_passthrough.sh ] ; then
+	/usr/lib/fff-support/activate_poe_passthrough.sh
+fi
+
 exit 0