Merge pull request #148 from kpandu987/uwm_support

RDKBACCL-700 : unified-wifi-mesh integration in BPI

Author: cpokuru

conf/distro/include/rdk-bpi.inc

@@ -16,7 +16,7 @@ DISTRO_FEATURES_append = " HOSTAPD_2_11"
 DISTRO_FEATURES_append = " OneWifi"
 
 # MacFilter Feature
-DISTRO_FEATURES_append = " acl_nl_support"
+DISTRO_FEATURES_append = " disable_nl80211_acl"
 
 #No Moca Support
 DISTRO_FEATURES_append = " no_moca_support"
@@ -43,3 +43,7 @@ DISTRO_FEATURES_append = " sdmmc"
 
 #disabling lan0_as_wan to allow lan0 interface to come
 DISTRO_FEATURES_remove = " lan0_as_wan"
+
+#Need to enable below distro once required changes are merged 
+#DISTRO_FEATURES_append = " EasyMesh"
+PREFERRED_VERSION_go = "1.19.%"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

@@ -1,14 +1,26 @@
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
 
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
-SRCREV_libwebconfig = "7d4697bc74017e0ec57c3ba903a70dfe56809cb4"
+SRCREV_libwebconfig = "fa41ece5df6e6589f70fcb5b554c1a835c8d0409"
 
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
 
-CFLAGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -Wno-error=maybe-uninitialized -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=incompatible-pointer-types -Wno-error=sign-compare -Wno-error -DEASY_MESH_NODE ', '', d)}"
+CFLAGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -Wno-error=maybe-uninitialized -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=incompatible-pointer-types -Wno-error=sign-compare -Wno-error -DEASY_MESH_NODE  ', '', d)}"
+
+CFLAGS_append = " -Wno-enum-conversion"
+
+do_compile_append() {
+    oe_runmake -C source/platform
+}
 
 do_install_append() {
+       oe_runmake -C source/platform DESTDIR=${D} install
       install -m 644 ${S}/include/webconfig_external_proto_easymesh.h  ${D}/usr/include/ccsp
 }
+
+FILES_${PN} += " \
+    ${libdir}/libwifi_bus.so* \
+"
+

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend

@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
-SRCREV_OneWifi = "7d4697bc74017e0ec57c3ba903a70dfe56809cb4"
+SRCREV_OneWifi = "fa41ece5df6e6589f70fcb5b554c1a835c8d0409"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start.sh

@@ -1,10 +1,12 @@
 #!/bin/sh
 sleep 20
 
-#To update al_mac_addr in EasyMeshCfg.json
+#To update al_mac_addr in EasyMeshCfg.json to avoid onewifi restarting during fresh boot-up
 wan_mac="$(cat /sys/class/ieee80211/phy0/macaddress)"
 old_al_mac_addr=`cat /nvram/EasymeshCfg.json | grep AL_MAC_ADDR  | cut -d '"' -f4`
-sed -i "s/$old_al_mac_addr/$wan_mac/g" /nvram/EasymeshCfg.json
+if [ "$old_al_mac_addr" == "00:00:00:00:00:00" ]; then
+  sed -i "s/$old_al_mac_addr/$wan_mac/g" /nvram/EasymeshCfg.json
+fi  
 
 iw phy phy0 interface add wifi0 type __ap
 iw phy phy0 interface add wifi1 type __ap

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/hal_interface.patch

@@ -6,10 +6,20 @@
 #Signed-off-by:[email protected]
 ################################################
 diff --git a/wifi_hal_ap.h b/wifi_hal_ap.h
-index f5c37db..4453112 100644
+index f5c37db..7daf939 100644
 --- a/wifi_hal_ap.h
 +++ b/wifi_hal_ap.h
-@@ -2736,6 +2736,14 @@ typedef struct {
+@@ -349,7 +349,8 @@ typedef enum
+     WIFI_RADIO_SCAN_MODE_FULL,
+     WIFI_RADIO_SCAN_MODE_ONCHAN,
+     WIFI_RADIO_SCAN_MODE_OFFCHAN,
+-    WIFI_RADIO_SCAN_MODE_SURVEY
++    WIFI_RADIO_SCAN_MODE_SURVEY,
++    WIFI_RADIO_SCAN_MODE_SELECT_CHANNELS
+ } wifi_neighborScanMode_t;
+ 
+ /**
+@@ -2736,6 +2737,14 @@ typedef struct {
  } __attribute__((packed)) wifi_back_haul_sta_t;
 
  #define WIFI_AP_MAX_SSID_LEN    33
@@ -24,7 +34,7 @@ index f5c37db..4453112 100644
  typedef struct {
      CHAR    ssid[WIFI_AP_MAX_SSID_LEN];
      BOOL    enabled;
-@@ -2763,6 +2771,8 @@ typedef struct {
+@@ -2763,6 +2772,8 @@ typedef struct {
      UINT   wmmNoAck;
      UINT   wepKeyLength;
      BOOL   bssHotspot;
@@ -33,7 +43,7 @@ index f5c37db..4453112 100644
      UINT   wpsPushButton;
      char   beaconRateCtl[32];
      BOOL   network_initiated_greylist;
-@@ -2919,4 +2929,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
+@@ -2919,4 +2930,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
  }
  #endif
 
@@ -52,3 +62,22 @@ index a55ede6..c8ca1a8 100644
 
      //Device Information related fields
       CHAR manufacturer[DEFAULT_DEVICE_FIELD_LEN];
+diff --git a/wifi_hal_telemetry.h b/wifi_hal_telemetry.h
+index 6867002..3596ea0 100644
+--- a/wifi_hal_telemetry.h
++++ b/wifi_hal_telemetry.h
+@@ -102,6 +102,7 @@ typedef struct _wifi_neighbor_ap2
+      CHAR  ap_SupportedDataTransferRates[256];  /**< Comma-separated list (maximum list length 256) of strings. Data transmit rates (in Mbps) for unicast frames at which the SSID will permit a station to connect. For example, ifSupportedDataTransferRatesis "1,2,5.5", this indicates that the SSID will only permit connections at 1 Mbps, 2 Mbps and 5.5 Mbps. */
+      UINT  ap_DTIMPeriod;   /**< The number of beacon intervals that elapse between transmission of Beacon frames containing a TIM element whose DTIM count field is 0. This value is transmitted in the DTIM Period field of beacon frames. [802.11-2012] */
+      UINT  ap_ChannelUtilization;   /**< Indicates the fraction of the time AP senses that the channel is in use by the neighboring AP for transmissions. */
++     UINT  ap_freq;    /**< Frequency. */
+ } wifi_neighbor_ap2_t;    //COSA_DML_NEIGHTBOURING_WIFI_RESULT
+ 
+ /*    Explanation:
+@@ -338,4 +339,4 @@ INT wifi_getVAPTelemetry(UINT apIndex, wifi_VAPTelemetry_t *telemetry);
+ }
+ #endif
+ 
+-#endif
+\ No newline at end of file
++#endif

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend

@@ -1,7 +1,7 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
 
 SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
-SRCREV_rdk-wifi-hal = "1232914fc172a2ba81997b983f68970c908eadaf"
+SRCREV_rdk-wifi-hal = "a8bdea1dce2761060f54e4dfe8e69af19f3d9b1f"
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DBANANA_PI_PORT  -DFEATURE_SINGLE_PHY "
 CFLAGS_append_kirkstone = " -fcommon"

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend

@@ -1,4 +1,4 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
 
 SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
-SRCREV_rdk-wifi-util = "51ce6f510012f1d3989bbe7141429498c9158d82"
+SRCREV_rdk-wifi-util = "a8bdea1dce2761060f54e4dfe8e69af19f3d9b1f"

meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend

@@ -21,3 +21,4 @@ add_busybox_fixes() {
 }
 
 IMAGE_INSTALL_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ppp-enabled', '', 'pptp-linux rp-pppoe xl2tpd', d)}"
+IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh',' unified-wifi-mesh unified-wifi-mesh-cli','',d)}"

setup-environment-refboard-rdkb

@@ -39,24 +39,6 @@ fi
 # default BSP layer is meta-cmf-bananapi for B-PI builds
 export RDK_BSP_LAYER=meta-cmf-bananapi
 
-if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then
-    sed -i '/sdmmc/s/^/#/' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
-else # SD card image is default
-    mkdir -p ${_TOPDIR}/downloads
-    if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip.bin ]; then
-        echo "Both bl2 and fip binaries are present in local workspace."
-    else
-        echo "**********************************************************************"
-        echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES."
-        echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin"
-        echo "> If you don't have access to above resources, please follow instruction in https://wiki.rdkcentral.com/pages/viewpage.action?pageId=354648448#SDMonoliticimagebuildandflashingstepsforBPIR4.-Buildingbl2.imgandfip.binincaseofnothavingaccesstoartifactoryrepository to build bl2 and fip binaries yourselves."
-        echo "> Place those binaries under ${_TOPDIR}/downloads/"
-        echo "> EXITING NOW."
-        echo "**********************************************************************"
-        return 1
-    fi
-fi
-
 if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia_changes_applied ]; then
 sed -i '19 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia.bbappend
 sed -i '39 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-ccsp/util/utopia.bbappend
@@ -101,3 +83,25 @@ if [ ! -e ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_change ]; then
 sed -i '19 s/^/#/' ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_%.bbappend
 touch ${_TOPDIR}/meta-cmf-filogic/recipes-core/dbus/dbus_change
 fi
+
+if [ "X$FEATURE_TYPE" == "XEasyMesh" ]; then
+    sed -i '/EasyMesh/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
+fi
+
+if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then
+    sed -i '/sdmmc/s/^/#/' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
+else # SD card image is default
+    mkdir -p ${_TOPDIR}/downloads
+    if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip.bin ]; then
+        echo "Both bl2 and fip binaries are present in local workspace."
+    else
+        echo "**********************************************************************"
+        echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES."
+        echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin"
+        echo "> If you don't have access to above resources, please follow instruction in https://wiki.rdkcentral.com/pages/viewpage.action?pageId=354648448#SDMonoliticimagebuildandflashingstepsforBPIR4.-Buildingbl2.imgandfip.binincaseofnothavingaccesstoartifactoryrepository to build bl2 and fip binaries yourselves."
+        echo "> Place those binaries under ${_TOPDIR}/downloads/"
+        echo "> EXITING NOW."
+        echo "**********************************************************************"
+        return 1
+    fi
+fi