arjo, use updated easy-soc-libs, map-controller depends on libwifi

Signed-off-by: Filip Matusiak <filip.matusiak@iopsys.eu>

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.16
+PKG_VERSION:=6.8.17
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=0ef6169d86333b8727ed34c63f379b08254340e3
+PKG_SOURCE_VERSION:=9f01ada03501c8db07f8eeff695b44b47309f11c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=7.2.3
+PKG_VERSION:=7.2.4
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c277f89b0791664b7d417a4de34a156fc0aa8ee0
+PKG_SOURCE_VERSION:=740b6e4f2c51ecc1efa496170fe1e98caa06fd7b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

map-controller/Makefile

@@ -26,7 +26,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin +libwifi
 endef
 
 define Package/map-controller/description

map-controller/files/etc/init.d/mapcontroller

@@ -45,7 +45,13 @@ validate_sta_steering_section() {
 		'use_bcn_metrics:bool:false' \
 		'use_usta_metrics:bool:false' \
 		'bandsteer:bool:false' \
-		'diffsnr:range(0,100)'
+		'diffsnr:range(0,100)' \
+		'rcpi_threshold_2g:range(0,220)' \
+		'rcpi_threshold_5g:range(0,220)' \
+		'rcpi_threshold_6g:range(0,220)' \
+		'report_rcpi_threshold_2g:range(0,220)' \
+		'report_rcpi_threshold_5g:range(0,220)' \
+		'report_rcpi_threshold_6g:range(0,220)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of sta_steering section failed"

ponmngr/files/etc/bbfdm/json/xpon.json

@@ -3,6 +3,7 @@
 	"Device.XPON.": {
 		"type": "object",
 		"protocols": [
+			"cwmp",
 			"usp"
 		],
 		"access": false,
@@ -13,6 +14,7 @@
 			"read": true,
 			"write": false,
 			"protocols": [
+				"cwmp",
 				"usp"
 			],
 			"datatype": "unsignedInt",
@@ -31,6 +33,7 @@
 		"Device.XPON.ONU.{i}.": {
 			"type": "object",
 			"protocols": [
+				"cwmp",
 				"usp"
 			],
 			"access": false,
@@ -51,6 +54,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "boolean",
@@ -67,6 +71,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "string",
@@ -88,6 +93,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "string",
@@ -109,6 +115,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -129,6 +136,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -149,6 +157,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -164,9 +173,31 @@
 					}
 				]
 			},
+			"TransceiverNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].Transceiver.@Count"
+						}
+					}
+				]
+			},
 			"Device.XPON.ONU.{i}.SoftwareImage.{i}.": {
 				"type": "object",
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -187,6 +218,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "unsignedInt",
@@ -209,6 +241,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -230,6 +263,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -246,6 +280,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -262,6 +297,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -277,6 +313,7 @@
 			"Device.XPON.ONU.{i}.EthernetUNI.{i}.": {
 				"type": "object",
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -297,6 +334,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -313,6 +351,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -338,6 +377,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -359,6 +399,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -380,6 +421,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -399,6 +441,7 @@
 				"Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"access": false,
@@ -415,6 +458,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -431,6 +475,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -447,6 +492,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -463,6 +509,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -479,6 +526,7 @@
 			"Device.XPON.ONU.{i}.ANI.{i}.": {
 				"type": "object",
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -499,6 +547,7 @@
 					"read": true,
 					"write": true,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -529,6 +578,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -553,6 +603,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -573,6 +624,7 @@
 				"Device.XPON.ONU.{i}.ANI.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"access": false,
@@ -589,6 +641,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -605,6 +658,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -621,6 +675,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -637,6 +692,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -649,6 +705,111 @@
 						]
 					}
 				}
+			},
+			"Device.XPON.ONU.{i}.Transceiver.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": true,
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].Transceiver"
+						}
+					}
+				],
+				"RxPower": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "int",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "RxPower"
+						}
+					]
+				},
+				"TxPower": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "int",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "TxPower"
+						}
+					]
+				},
+				"Voltage": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Voltage"
+						}
+					]
+				},
+				"Bias": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Bias"
+						}
+					]
+				},
+				"Temperature": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "int",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Temperature"
+						}
+					]
+				}
 			}
 		}
 	}

qosmngr/files/airoha/etc/uci-defaults/60-qos_config_generate

@@ -5,7 +5,7 @@
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
 populate_no_of_queue(){
-    local queue_num=$(get_no_of_queue "airoha")
+    queue_num=4
 
     # writing no. of queue per port into file and read on classify generate
     if [ ! -d "/tmp/qos" ]; then
@@ -61,3 +61,4 @@ touch /etc/config/qos
 # generate qos queue config
 config_load ports
 config_foreach generate_queue ethport
+

qosmngr/files/airoha/lib/qos/qos.sh

@@ -25,36 +25,6 @@ configure_qos() {
     configure_classify
 }
 
-get_no_of_queue() {
-	platform_name=$1
-	cpu_model=$2
-
-	if [ -z "$platform_name" ];then
-		return
-	fi
-
-	if [ "$platform_name" == "airoha" ]; then
-		queue_num=4
-		echo "Fix: airohai no_of_queue: $queue_num"
-	elif [ "$platform_name" == "broadcom" ]; then
-		if [[ $cpu_model == "BCM68"* ]]; then
-			queue_num=4
-			echo "Fix: broadcom bcm no_of_queue: $queue_num"
-		elif grep -qE '[0-9]+ archer$' /proc/devices; then
-                	queue_num=4
-			echo "Fix: broadcom arcee no_of_queue: $queue_num"
-		else
-                	queue_num=8
-			echo "Fix: broadcom else no_of_queue: $queue_num"
-		fi
-	elif [ "$platform_name" == "linux" ]; then
-		queue_num=8
-		echo "Fix: linux no_of_queue: $queue_num"
-	fi
-
-	echo $queue_num
-}
-
 reload_qos() {
     local service_name="$1"
 

qosmngr/files/broadcom/etc/uci-defaults/60-qos_config_generate

@@ -4,10 +4,17 @@
 
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
-queue_num=0
+
+queue_num=8
 
 populate_no_of_queue(){
-	queue_num=$(get_no_of_queue "broadcom")
+	case $cpu_model in
+		BCM68*) queue_num=4;;
+	esac
+        if grep -qE '[0-9]+ archer$' /proc/devices; then
+                queue_num=4
+        fi
+
 	# writing no. of queue per port into file and read on classify generate
 	if [ ! -d "/tmp/qos" ]; then
 		mkdir -p "/tmp/qos"

qosmngr/files/broadcom/lib/qos/qos.sh

@@ -642,7 +642,7 @@ handle_ebtables_rules() {
 			*)
 				if [ -n "$protocol" ] || [ -n "$dscp_filter" ]; then
 					ip_version=1 #neither ether_type nor ip address used
-					#ethertype is not configured by user so install
+					#ethertype is not configured by user so install 
 					#both proto ipv4 and ipv6 rule
 					BR6_RULE="$BR_RULE"
 					broute_filter_on_ether_type "IPv4"
@@ -1372,7 +1372,7 @@ reload_qos_service() {
 			fi
 			if [ "$policer" == "true" ]; then
 				reload_qos "policer"
-				# change in policer config may need reconfiguration
+				# change in policer config may need reconfiguration 
 				# of classifier
 				reload_qos "classify"
 			fi
@@ -1383,35 +1383,3 @@ reload_qos_service() {
 	fi
 	cp /etc/config/qos /tmp/qos/qos
 }
-
-get_no_of_queue() {
-	platform_name=$1
-	cpu_model=$2
-
-	if [ -z "$platform_name" ];then
-		return
-	fi
-
-	if [ "$platform_name" == "airoha" ]; then
-		queue_num=4
-		echo "Fix: airohai no_of_queue: $queue_num"
-	elif [ "$platform_name" == "broadcom" ]; then
-		if [[ $cpu_model == "BCM68"* ]]; then
-			queue_num=4
-			echo "Fix: broadcom bcm no_of_queue: $queue_num"
-		elif grep -qE '[0-9]+ archer$' /proc/devices; then
-                	queue_num=4
-			echo "Fix: broadcom arcee no_of_queue: $queue_num"
-		else
-                	queue_num=8
-			echo "Fix: broadcom else no_of_queue: $queue_num"
-		fi
-	elif [ "$platform_name" == "linux" ]; then
-		queue_num=8
-		echo "Fix: linux no_of_queue: $queue_num"
-	fi
-
-	echo $queue_num
-}
-
-

qosmngr/files/linux/etc/uci-defaults/60-qos_config_generate

@@ -5,7 +5,7 @@
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
 populate_no_of_queue(){
-    local queue_num=$(get_no_of_queue "linux")
+    queue_num=8
 
     # writing no. of queue per port into file and read on classify generate
     if [ ! -d "/tmp/qos" ]; then

qosmngr/files/linux/lib/qos/qos.sh

@@ -555,22 +555,22 @@ pre_configure_queue() {
 	done
 }
 
-get_link_rate() {
-        intf="$1"
-        speed=0
-        config_load ports
+get_link_rate() {                     
+        intf="$1"              
+        speed=0   
+        config_load ports               
         get_speed() {
-                psid="$1"
+                psid="$1"                     
                 iname="$2"
-                config_load ports
+                config_load ports             
                 config_get ifname "$psid" "ifname"
                 if [ "$ifname" == "$iname" ]; then
                         config_get speed "$psid" "speed"
                 fi
-        }
-        config_foreach get_speed ethport $intf
-        echo "$speed"
-}
+        }                                
+        config_foreach get_speed ethport $intf           
+        echo "$speed"           
+}                   
 
 configure_queue() {
 	qdisc_idx=0
@@ -657,35 +657,6 @@ configure_policer() {
         echo $POLICER_COUNT > /tmp/qos/max_policer_inst
 }
 
-get_no_of_queue() {
-	platform_name=$1
-	cpu_model=$2
-
-	if [ -z "$platform_name" ];then
-		return
-	fi
-
-	if [ "$platform_name" == "airoha" ]; then
-		queue_num=4
-		echo "Fix: airohai no_of_queue: $queue_num"
-	elif [ "$platform_name" == "broadcom" ]; then
-		if [[ $cpu_model == "BCM68"* ]]; then
-			queue_num=4
-			echo "Fix: broadcom bcm no_of_queue: $queue_num"
-		elif grep -qE '[0-9]+ archer$' /proc/devices; then
-                	queue_num=4
-			echo "Fix: broadcom arcee no_of_queue: $queue_num"
-		else
-                	queue_num=8
-			echo "Fix: broadcom else no_of_queue: $queue_num"
-		fi
-	elif [ "$platform_name" == "linux" ]; then
-		queue_num=8
-		echo "Fix: linux no_of_queue: $queue_num"
-	fi
-
-	echo $queue_num
-}
 
 configure_qos() {
 	pre_configure_queue

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/usermngr.git
-PKG_SOURCE_VERSION:=9d5f529e236e03c91e41c421de7702923a24664e
+PKG_SOURCE_VERSION:=91cddabfdcd496a3c52d4206b72215a938185332
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.11.0.4
+PKG_VERSION:=4.0.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=24dcb18f3e60082c70ab17b0707073fd2981f0a9
+PKG_SOURCE_VERSION:=574d22ed710ff4dae441f7c0273b05bbfd5c33ed
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -22,18 +22,6 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/wfadatad
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi DataElements Agent (standalone) daemon
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
-	   @(!PACKAGE_map-agent) +libieee1905 +map-plugin
-endef
-
-define Package/wfadatad/description
- This package implements WiFi DataElements Agent.
-endef
-
 define Package/wfadatad-collector
   SECTION:=utils
   CATEGORY:=Utilities
@@ -60,7 +48,6 @@ MAKE_FLAGS += DEBUG=1
 endif
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -76,25 +63,15 @@ MAKE_PATH:=src
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
 EXECS := \
-	$(if $(CONFIG_PACKAGE_wfadatad),agent/deagent) \
-	$(if $(CONFIG_PACKAGE_wfadatad-collector),collector/decollector)
+	$(if $(CONFIG_PACKAGE_wfadatad-collector),decollector)
 
 MAKE_FLAGS += EXECS="$(EXECS)"
 
-
-define Package/wfadatad/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/deagent.init $(1)/etc/init.d/deagent
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/agent/deagent $(1)/usr/sbin/
-endef
-
 define Package/wfadatad-collector/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/collector/decollector $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,wfadatad))
 $(eval $(call BuildPackage,wfadatad-collector))