[Tizen] Add arm64 target (#38093)

* Add ARM64 support

* Restyled by gn

* Allow arm64-only env

* Fix missing env var

* Add arm64 to CI

* Bump CI docker versions from 119 to 125

* Update expected output

* Fix cases

* Fix tuple

* Fix env var checking

---------

Co-authored-by: Restyled.io <[email protected]>

Author: XToripuru

.github/workflows/chef.yaml

@@ -58,7 +58,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:119
+            image: ghcr.io/project-chip/chip-build:125
             options: --user root
 
         steps:

.github/workflows/examples-tizen.yaml

@@ -64,7 +64,7 @@ jobs:
                           --enable-flashbundle \
                           --target tizen-arm-all-clusters \
                           --target tizen-arm-chip-tool-ubsan \
-                          --target tizen-arm-light-with-ui \
+                          --target tizen-arm64-light-with-ui \
                           build \
                           --copy-artifacts-to out/artifacts \
                       "

build/config/arm.gni

@@ -43,7 +43,8 @@ if ((current_cpu == "arm" || current_cpu == "arm64") &&
     arm_float_abi = ""
     arm_abi = ""
     arm_use_thumb = current_os != "linux" &&
-                    (current_os != "android" || current_cpu != "arm64")
+                    (current_os != "android" || current_cpu != "arm64") &&
+                    (current_os != "tizen" || current_cpu != "arm64")
 
     # Update defaults with platform values, if any.
     if (arm_platform_config != "") {

build/config/linux/pkg_config.gni

@@ -67,6 +67,10 @@ declare_args() {
   host_pkg_config = ""
 
   system_libdir = "lib"
+
+  if (current_os == "tizen" && current_cpu == "arm64") {
+    system_libdir = "lib64"
+  }
 }
 
 pkg_config_script = "${build_root}/config/linux/pkg-config.py"

build/toolchain/tizen/BUILD.gn

@@ -20,3 +20,10 @@ tizen_toolchain("tizen_arm") {
     arm_arch = "armv7-a"
   }
 }
+
+tizen_toolchain("tizen_arm64") {
+  toolchain_args = {
+    current_cpu = "arm64"
+    arm_arch = "armv8-a"
+  }
+}

build/toolchain/tizen/tizen_toolchain.gni

@@ -27,8 +27,13 @@ template("tizen_toolchain") {
     forward_variables_from(_invoker_toolchain_args, "*")
   }
 
-  _tizen_toolchain_prefix =
-      "${tizen_sdk_root}/tools/arm-linux-gnueabi-gcc-9.2/bin/arm-linux-gnueabi-"
+  if (_invoker_toolchain_args.current_cpu == "arm") {
+    _tizen_toolchain_prefix = "${tizen_sdk_root}/tools/arm-linux-gnueabi-gcc-9.2/bin/arm-linux-gnueabi-"
+  } else if (_invoker_toolchain_args.current_cpu == "arm64") {
+    _tizen_toolchain_prefix = "${tizen_sdk_root}/tools/aarch64-linux-gnu-gcc-9.2/bin/aarch64-linux-gnu-"
+  } else {
+    assert(false, "CPU architecture is not supported.")
+  }
 
   gcc_toolchain(target_name) {
     toolchain_args = _tizen_toolchain_args

scripts/build/build/targets.py

@@ -667,6 +667,7 @@ def BuildTizenTarget():
     # board
     target.AppendFixedTargets([
         TargetPart('arm', board=TizenBoard.ARM),
+        TargetPart('arm64', board=TizenBoard.ARM64),
     ])
 
     # apps

scripts/build/builders/tizen.py

@@ -30,6 +30,7 @@
 class TizenBoard(Enum):
 
     ARM = Board('arm')
+    ARM64 = Board('arm64')
 
 
 class TizenApp(Enum):
@@ -186,16 +187,37 @@ def PostBuildCommand(self):
 
     def GnBuildArgs(self):
         # Make sure that required ENV variables are defined
-        for env in ('TIZEN_SDK_ROOT', 'TIZEN_SDK_SYSROOT'):
+        env = 'TIZEN_SDK_ROOT'
+        if env not in os.environ:
+            raise Exception(
+                "Environment %s missing, cannot build Tizen target" % env)
+
+        sysroot = None
+
+        if self.board.value.target_cpu == "arm64":
+            env = 'TIZEN_SDK_SYSROOT_ARM64'
             if env not in os.environ:
                 raise Exception(
                     "Environment %s missing, cannot build Tizen target" % env)
 
+            sysroot = os.environ[env]
+
+        elif self.board.value.target_cpu == "arm":
+            env = 'TIZEN_SDK_SYSROOT'
+            if env not in os.environ:
+                raise Exception(
+                    "Environment %s missing, cannot build Tizen target" % env)
+
+            sysroot = os.environ[env]
+
+        else:
+            raise Exception("CPU architecture is not supported")
+
         return self.extra_gn_options + [
             'target_os="tizen"',
             'target_cpu="%s"' % self.board.value.target_cpu,
             'tizen_sdk_root="%s"' % os.environ['TIZEN_SDK_ROOT'],
-            'tizen_sdk_sysroot="%s"' % os.environ['TIZEN_SDK_SYSROOT'],
+            'tizen_sdk_sysroot="%s"' % sysroot,
         ]
 
     def _bundle(self):

scripts/build/testdata/all_targets_linux_x64.txt

@@ -22,6 +22,6 @@ nuttx-x64-light
 qpg-qpg6105-{lock,light,shell,persistent-storage,light-switch,thermostat}[-updateimage]
 realtek-rtl8777g-{lighting,light-switch,lock,window}
 stm32-stm32wb5mm-dk-light
-tizen-arm-{all-clusters,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-coverage][-with-ui]
+tizen-{arm,arm64}-{all-clusters,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-coverage][-with-ui]
 telink-{tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tl3218x,tl3218x_retention,tl7218x,tl7218x_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars][-usb][-compress-lzma][-thread-analyzer]
 openiotsdk-{shell,lock}[-mbedtls][-psa]

src/platform/Tizen/BLEManagerImpl.cpp

@@ -52,6 +52,7 @@
 #include <lib/core/ErrorStr.h>
 #include <lib/support/BitFlags.h>
 #include <lib/support/CodeUtils.h>
+#include <lib/support/SafeInt.h>
 #include <lib/support/SetupDiscriminator.h>
 #include <lib/support/Span.h>
 #include <platform/CHIPDeviceEvent.h>
@@ -1249,11 +1250,12 @@ CHIP_ERROR BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const Ble
     conId = static_cast<BLEConnection *>(g_hash_table_lookup(mConnectionMap, conId->peerAddr));
     VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED, ChipLogError(DeviceLayer, "Failed to find connection info"));
 
-    ret = bt_gatt_set_value(mGattCharC2Handle, Uint8::to_const_char(pBuf->Start()), pBuf->DataLength());
+    VerifyOrReturnError(CanCastTo<int>(pBuf->DataLength()), CHIP_ERROR_INTERNAL);
+    ret = bt_gatt_set_value(mGattCharC2Handle, Uint8::to_const_char(pBuf->Start()), static_cast<int>(pBuf->DataLength()));
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_set_value() failed: %s", get_error_message(ret)));
 
     ChipLogProgress(DeviceLayer, "Sending indication for CHIPoBLE RX characteristic (con %s, len %u)", conId->peerAddr,
-                    pBuf->DataLength());
+                    static_cast<int>(pBuf->DataLength()));
 
     ret = bt_gatt_server_notify_characteristic_changed_value(
         mGattCharC2Handle,
@@ -1283,11 +1285,12 @@ CHIP_ERROR BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const B
                  ChipLogError(DeviceLayer, "SendWriteRequest() called with invalid characteristic ID"));
     VerifyOrExit(conId->gattCharC1Handle != nullptr, ChipLogError(DeviceLayer, "Char C1 is null"));
 
-    ret = bt_gatt_set_value(conId->gattCharC1Handle, Uint8::to_const_char(pBuf->Start()), pBuf->DataLength());
+    VerifyOrReturnError(CanCastTo<int>(pBuf->DataLength()), CHIP_ERROR_INTERNAL);
+    ret = bt_gatt_set_value(conId->gattCharC1Handle, Uint8::to_const_char(pBuf->Start()), static_cast<int>(pBuf->DataLength()));
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_set_value() failed: %s", get_error_message(ret)));
 
     ChipLogProgress(DeviceLayer, "Sending Write Request for CHIPoBLE TX characteristic (con %s, len %u)", conId->peerAddr,
-                    pBuf->DataLength());
+                    static_cast<int>(pBuf->DataLength()));
 
     ret = bt_gatt_client_write_value(conId->gattCharC1Handle, WriteCompletedCb, conId);
     VerifyOrExit(ret == BT_ERROR_NONE,

src/platform/Tizen/ThreadStackManagerImpl.cpp

@@ -273,7 +273,8 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadProvision(ByteSpan netInfo)
 
     int threadErr = THREAD_ERROR_NONE;
 
-    threadErr = thread_network_set_active_dataset_tlvs(mThreadInstance, netInfo.data(), netInfo.size());
+    VerifyOrReturnError(CanCastTo<int>(netInfo.size()), CHIP_ERROR_INTERNAL);
+    threadErr = thread_network_set_active_dataset_tlvs(mThreadInstance, netInfo.data(), static_cast<int>(netInfo.size()));
     VerifyOrExit(threadErr == THREAD_ERROR_NONE,
                  ChipLogError(DeviceLayer, "FAIL: Thread set active dataset TLVs: %s", get_error_message(threadErr)));