[power] Remove bt-uart element

Removing the element and change the code to use TakeWakeLease.

Bug: b/356674003
Test: CQ, on device test
Change-Id: Ic6960385ca80bd4594de184d65fef5e71ceab3c8
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1143979
Reviewed-by: Andres Oportus <[email protected]>
Reviewed-by: Michael Brunson <[email protected]>
Commit-Queue: Hai Bi <[email protected]>
Reviewed-by: Zhiyi Chen <[email protected]>
Reviewed-by: Ruby Zhuang <[email protected]>

Author: Hai Bi

src/devices/board/drivers/vim3-devicetree/dts/vim3-power-config.dtsi

@@ -64,34 +64,6 @@
 	};
 };
 
-&bt_uart {
-	power-elements {
-		aml-uart-wake-on-interrupt-element {
-			power-levels {
-				off-level {
-					level = <0>;
-					level-transition-table {
-						transition-to-handling {
-							target-level = <1>;
-							latency-us = <0>;
-						};
-					};
-				};
-				handling-level {
-					level = <1>;
-					level-dependencies = <&sag_wake_active 1>;
-					level-transition-table {
-						transition-to-off {
-							target-level = <0>;
-							latency-us = <0>;
-						};
-					};
-				};
-			};
-		};
-	};
-};
-
 &audio {
 	power-elements {
 		audio-hw-element {
@@ -108,7 +80,6 @@
 	};
 };
 
-
 &sd_emmc_c {
 	power-elements {
 		aml-sdmmc-hardware-element {

src/devices/board/drivers/vim3-devicetree/dts/vim3.golden.dts

@@ -30,40 +30,6 @@
 		pwm-init = <0x21>;
 		reg = <0x00 0xffd24000 0x00 0x18>;
 		serial-port = <0x02 0x06 0x03>;
-
-		power-elements {
-
-			aml-uart-wake-on-interrupt-element {
-
-				power-levels {
-
-					handling-level {
-						level = <0x01>;
-						level-dependencies = <0x37 0x01>;
-
-						level-transition-table {
-
-							transition-to-off {
-								latency-us = <0x00>;
-								target-level = <0x00>;
-							};
-						};
-					};
-
-					off-level {
-						level = <0x00>;
-
-						level-transition-table {
-
-							transition-to-handling {
-								latency-us = <0x00>;
-								target-level = <0x01>;
-							};
-						};
-					};
-				};
-			};
-		};
 	};
 
 	canvas@ff638000 {
@@ -215,7 +181,7 @@
 		compatible = "fuchsia,gpio-buttons";
 		gpio-names = "POWER";
 		gpios = <0x06 0x5c 0x00>;
-		pinctrl-0 = <0x38>;
+		pinctrl-0 = <0x37>;
 	};
 
 	gpio_header {
@@ -646,7 +612,7 @@
 			gpio-buttons-pins {
 				bias-disable;
 				function = <0x00 0x00>;
-				phandle = <0x38>;
+				phandle = <0x37>;
 				pins = <0x5c>;
 			};
 
@@ -739,7 +705,7 @@
 
 			wifi-pins {
 				bias-disable;
-				phandle = <0x39>;
+				phandle = <0x38>;
 				pins = <0x3f>;
 			};
 		};
@@ -1019,7 +985,6 @@
 
 					active-level {
 						level = <0x01>;
-						phandle = <0x37>;
 					};
 
 					inactive-level {
@@ -1061,6 +1026,6 @@
 		compatible = "broadcom,bcm4359";
 		gpio-names = "WIFI_WAKE_HOST";
 		gpios = <0x06 0x3f 0x00>;
-		pinctrl-0 = <0x39>;
+		pinctrl-0 = <0x38>;
 	};
 };

src/devices/serial/drivers/aml-uart/BUILD.gn

@@ -59,6 +59,7 @@ source_set("aml-uart-source") {
   public_deps = [
     "//sdk/fidl/fuchsia.hardware.power:fuchsia.hardware.power_cpp",
     "//sdk/fidl/fuchsia.hardware.serialimpl:fuchsia.hardware.serialimpl_cpp",
+    "//sdk/fidl/fuchsia.power.system:fuchsia.power.system_cpp",
     "//sdk/lib/async:async-cpp",
     "//sdk/lib/driver/platform-device/cpp",
     "//sdk/lib/driver/power/cpp",

src/devices/serial/drivers/aml-uart/aml-uart-dfv2.cc

@@ -128,67 +128,14 @@ void AmlUartV2::OnReceivedMetadata(
 
 zx_status_t AmlUartV2::GetPowerConfiguration(
     const fidl::WireSyncClient<fuchsia_hardware_platform_device::Device>& pdev) {
-  auto power_broker = incoming()->Connect<fuchsia_power_broker::Topology>();
-  if (power_broker.is_error() || !power_broker->is_valid()) {
-    FDF_LOG(WARNING, "Failed to connect to power broker: %s", power_broker.status_string());
-    return power_broker.status_value();
+  auto sag = incoming()->Connect<fuchsia_power_system::ActivityGovernor>();
+  if (sag.is_error() || !sag->is_valid()) {
+    FDF_LOG(WARNING, "Failed to connect to activity governor: %s", sag.status_string());
+    return sag.status_value();
   }
 
-  // TODO(b/358361345): Use //sdk/lib/driver/platform-device/cpp to retrieve power configuration
-  // once it supports it.
-  const auto result_power_config = pdev->GetPowerConfiguration();
-  if (!result_power_config.ok()) {
-    FDF_LOG(ERROR, "Call to get power config failed: %s", result_power_config.status_string());
-    return result_power_config.status();
-  }
-  if (result_power_config->is_error()) {
-    FDF_LOG(INFO, "GetPowerConfiguration failed: %s",
-            zx_status_get_string(result_power_config->error_value()));
-    return result_power_config->error_value();
-  }
-  if (result_power_config->value()->config.count() != 1) {
-    FDF_LOG(INFO, "Unexpected number of power configurations: %zu",
-            result_power_config->value()->config.count());
-    return ZX_ERR_NOT_SUPPORTED;
-  }
-
-  const auto& wire_config = result_power_config->value()->config[0];
-  if (wire_config.element().name().get() != "aml-uart-wake-on-interrupt") {
-    FDF_LOG(ERROR, "Unexpected power element: %s",
-            std::string(wire_config.element().name().get()).c_str());
-    return ZX_ERR_BAD_STATE;
-  }
-
-  fuchsia_hardware_power::PowerElementConfiguration natural_config = fidl::ToNatural(wire_config);
-  zx::result config = fdf_power::PowerElementConfiguration::FromFidl(natural_config);
-  if (config.is_error()) {
-    FDF_SLOG(ERROR, "Failed to convert power element configuration from fidl.",
-             KV("stauts", config.status_string()));
-    return config.status_value();
-  }
-
-  // Get dependency tokens from the config, these tokens represent the dependency from the current
-  // element to its parent(s).
-  auto tokens = fdf_power::GetDependencyTokens(*incoming(), config.value());
-  if (tokens.is_error()) {
-    FDF_LOG(ERROR, "Failed to get power dependency tokens: %u",
-            static_cast<uint8_t>(tokens.error_value()));
-    return ZX_ERR_INTERNAL;
-  }
-
-  fdf_power::ElementDesc description =
-      fdf_power::ElementDescBuilder(config.value(), std::move(tokens.value())).Build();
-  auto result_add_element = fdf_power::AddElement(power_broker.value(), description);
-  if (result_add_element.is_error()) {
-    FDF_LOG(ERROR, "Failed to add power element: %u",
-            static_cast<uint8_t>(result_add_element.error_value()));
-    return ZX_ERR_INTERNAL;
-  }
+  sag_ = std::move(sag.value());
 
-  element_control_client_end_ = std::move(*description.element_control_client);
-  lessor_client_end_ = std::move(*description.lessor_client);
-  current_level_client_end_ = std::move(*description.current_level_client);
-  required_level_client_end_ = std::move(*description.required_level_client);
   return ZX_OK;
 }
 
@@ -264,9 +211,7 @@ void AmlUartV2::OnDeviceServerInitialized(zx::result<> device_server_init_result
   timer_dispatcher_.emplace(std::move(timer_dispatcher_result.value()));
   aml_uart_.emplace(std::move(pdev), serial_port_info_, std::move(mmio.value()),
                     irq_dispatcher_->borrow(), timer_dispatcher_->borrow(),
-                    driver_config_.enable_suspend() ? true : false, std::move(lessor_client_end_),
-                    std::move(current_level_client_end_), std::move(required_level_client_end_),
-                    std::move(element_control_client_end_));
+                    driver_config_.enable_suspend(), std::move(sag_));
 
   // Default configuration for the case that serial_impl_config is not called.
   constexpr uint32_t kDefaultBaudRate = 115200;

src/devices/serial/drivers/aml-uart/aml-uart-dfv2.h

@@ -52,12 +52,7 @@ class AmlUartV2 : public fdf::DriverBase {
   fdf::ServerBindingGroup<fuchsia_hardware_serialimpl::Device> serial_impl_bindings_;
 
   aml_uart_dfv2_config::Config driver_config_;
-
-  // Client ends for talking to power broker.
-  std::optional<fidl::ClientEnd<fuchsia_power_broker::CurrentLevel>> current_level_client_end_;
-  std::optional<fidl::ClientEnd<fuchsia_power_broker::RequiredLevel>> required_level_client_end_;
-  std::optional<fidl::ClientEnd<fuchsia_power_broker::ElementControl>> element_control_client_end_;
-  std::optional<fidl::ClientEnd<fuchsia_power_broker::Lessor>> lessor_client_end_;
+  std::optional<fidl::ClientEnd<fuchsia_power_system::ActivityGovernor>> sag_;
 };
 
 }  // namespace serial