pd: Move *_set_input_current() to common code

Boards that use charge_manager have identical implementations of
typec_set_input_current_limit() and pd_set_input_current_limit(), so
move these functions to charge_manager.

BUG=b:67413505
TEST=`make buildall -j`, also verify that fizz continues to power-on and
boot AP, in both protected and unprotected mode, with barrel jack power
and with zinger.
BRANCH=None

Change-Id: I5f08357fe4b117c6452c0ed984b2a9d3a883a3bb
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Original-Commit-Id: 286b800f14b139ca5d349d35142d7f31f3655689
Original-Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Original-Change-Id: I99a5314d02c4696db944c0f8ac689405f4f1f707
Original-Reviewed-on: https://chromium-review.googlesource.com/701412
Original-Commit-Ready: Shawn N <shawnn@chromium.org>
Original-Tested-by: Shawn N <shawnn@chromium.org>
Original-Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/914650

18 files changed, 20 insertions, 391 deletions

diff --git a/board/chell/usb_pd_policy.c b/board/chell/usb_pd_policy.c
index 9c2218dd5a..276f97f800 100644
--- a/board/chell/usb_pd_policy.c
+++ b/board/chell/usb_pd_policy.c
@@ -72,30 +72,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_snk_is_vbus_provided(int port)
 {
 	return !gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE_L :
diff --git a/board/coral/usb_pd_policy.c b/board/coral/usb_pd_policy.c
index e0c334f063..7760cdd50f 100644
--- a/board/coral/usb_pd_policy.c
+++ b/board/coral/usb_pd_policy.c
@@ -129,30 +129,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/elm/usb_pd_policy.c b/board/elm/usb_pd_policy.c
index b03d52e71e..2da68d7484 100644
--- a/board/elm/usb_pd_policy.c
+++ b/board/elm/usb_pd_policy.c
@@ -76,26 +76,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/eve/usb_pd_policy.c b/board/eve/usb_pd_policy.c
index 16d7f5547f..15088d153b 100644
--- a/board/eve/usb_pd_policy.c
+++ b/board/eve/usb_pd_policy.c
@@ -149,30 +149,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/fizz/usb_pd_policy.c b/board/fizz/usb_pd_policy.c
index 44214d0312..713bd474ab 100644
--- a/board/fizz/usb_pd_policy.c
+++ b/board/fizz/usb_pd_policy.c
@@ -91,36 +91,6 @@ int pd_snk_is_vbus_provided(int port)
 	return !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-
-	/* If the port is already supplying the power, don't reset it */
-	if (charge_manager_get_active_charge_port() == CHARGE_PORT_TYPEC0 &&
-			max_ma == 0 && supply_voltage == 0)
-		return;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-
-	/* If the port is already supplying the power, don't reset it */
-	if (charge_manager_get_active_charge_port() == CHARGE_PORT_TYPEC0 &&
-			max_ma == 0 && supply_voltage == 0)
-		return;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/glados/usb_pd_policy.c b/board/glados/usb_pd_policy.c
index 59bf0d7545..d7b607f1de 100644
--- a/board/glados/usb_pd_policy.c
+++ b/board/glados/usb_pd_policy.c
@@ -72,28 +72,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_snk_is_vbus_provided(int port)
 {
 	return !gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE_L :
diff --git a/board/it83xx_evb/usb_pd_policy.c b/board/it83xx_evb/usb_pd_policy.c
index b1c0fa3014..32060a587c 100644
--- a/board/it83xx_evb/usb_pd_policy.c
+++ b/board/it83xx_evb/usb_pd_policy.c
@@ -37,16 +37,6 @@ const uint32_t pd_snk_pdo[] = {
 };
 const int pd_snk_pdo_cnt = ARRAY_SIZE(pd_snk_pdo);
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-}
-
 int pd_is_max_request_allowed(void)
 {
 	/* max voltage request allowed */
diff --git a/board/kahlee/usb_pd_policy.c b/board/kahlee/usb_pd_policy.c
index 00101f80f9..a2ff7224f2 100644
--- a/board/kahlee/usb_pd_policy.c
+++ b/board/kahlee/usb_pd_policy.c
@@ -134,30 +134,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/kevin/usb_pd_policy.c b/board/kevin/usb_pd_policy.c
index 14a5b2f0a7..b8a4766984 100644
--- a/board/kevin/usb_pd_policy.c
+++ b/board/kevin/usb_pd_policy.c
@@ -125,30 +125,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 void typec_set_source_current_limit(int port, int rp)
 {
 	vbus_rp[port] = rp;
diff --git a/board/oak/usb_pd_policy.c b/board/oak/usb_pd_policy.c
index 357afabd8f..d1932e9493 100644
--- a/board/oak/usb_pd_policy.c
+++ b/board/oak/usb_pd_policy.c
@@ -72,41 +72,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-	/*
-	 * move power info change notification to board_set_charge_limit(),
-	 * board_set_charge_limit() will be executed in call stack of
-	 * charge_manager_update_charge() if the "charge limit" or "charge port"
-	 * or supplier if is changed.
-	 */
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-	/*
-	 * move power info change notification to board_set_charge_limit(),
-	 * board_set_charge_limit() will be executed in call stack of
-	 * charge_manager_update_charge() if the "charge limit" or "charge port"
-	 * or supplier if is changed.
-	 */
-}
-
-
 int pd_board_checks(void)
 {
 #if BOARD_REV <= OAK_REV3
diff --git a/board/poppy/usb_pd_policy.c b/board/poppy/usb_pd_policy.c
index 085b86e738..7ff413eb92 100644
--- a/board/poppy/usb_pd_policy.c
+++ b/board/poppy/usb_pd_policy.c
@@ -143,30 +143,6 @@ int pd_snk_is_vbus_provided(int port)
 				      GPIO_USB_C0_VBUS_WAKE_L);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/reef/usb_pd_policy.c b/board/reef/usb_pd_policy.c
index e0c334f063..7760cdd50f 100644
--- a/board/reef/usb_pd_policy.c
+++ b/board/reef/usb_pd_policy.c
@@ -129,30 +129,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/reef_it8320/usb_pd_policy.c b/board/reef_it8320/usb_pd_policy.c
index 45a4169394..6d671b3cfd 100644
--- a/board/reef_it8320/usb_pd_policy.c
+++ b/board/reef_it8320/usb_pd_policy.c
@@ -122,30 +122,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/rowan/usb_pd_policy.c b/board/rowan/usb_pd_policy.c
index 81147ee936..db428b71d7 100644
--- a/board/rowan/usb_pd_policy.c
+++ b/board/rowan/usb_pd_policy.c
@@ -76,26 +76,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-}
-
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;
diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c
index 875234a9fb..6c9147bef4 100644
--- a/board/samus_pd/usb_pd_policy.c
+++ b/board/samus_pd/usb_pd_policy.c
@@ -80,24 +80,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-}
-
 int pd_snk_is_vbus_provided(int port)
 {
 	return gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE :
diff --git a/board/strago/usb_pd_policy.c b/board/strago/usb_pd_policy.c
index e252f98dc9..64e0d4f863 100644
--- a/board/strago/usb_pd_policy.c
+++ b/board/strago/usb_pd_policy.c
@@ -64,28 +64,6 @@ void pd_power_supply_reset(int port)
 	gpio_set_level(GPIO_USB_C0_5V_EN, 0);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_snk_is_vbus_provided(int port)
 {
 	return !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L);
diff --git a/board/wheatley/usb_pd_policy.c b/board/wheatley/usb_pd_policy.c
index e0bdef8e20..29cf4b4b9a 100644
--- a/board/wheatley/usb_pd_policy.c
+++ b/board/wheatley/usb_pd_policy.c
@@ -69,28 +69,6 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void pd_set_input_current_limit(int port, uint32_t max_ma,
-				uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
-#endif
-}
-
-void typec_set_input_current_limit(int port, uint32_t max_ma,
-				   uint32_t supply_voltage)
-{
-#ifdef CONFIG_CHARGE_MANAGER
-	struct charge_port_info charge;
-	charge.current = max_ma;
-	charge.voltage = supply_voltage;
-	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
-#endif
-}
-
 int pd_snk_is_vbus_provided(int port)
 {
 	return !gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE_L :
diff --git a/common/charge_manager.c b/common/charge_manager.c
index 57e4f5e722..e540bdfa09 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -815,6 +815,26 @@ static void charge_manager_make_change(enum charge_manager_change_type change,
 		hook_call_deferred(&charge_manager_refresh_data, 0);
 }
 
+void pd_set_input_current_limit(int port, uint32_t max_ma,
+				uint32_t supply_voltage)
+{
+	struct charge_port_info charge;
+
+	charge.current = max_ma;
+	charge.voltage = supply_voltage;
+	charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge);
+}
+
+void typec_set_input_current_limit(int port, uint32_t max_ma,
+				   uint32_t supply_voltage)
+{
+	struct charge_port_info charge;
+
+	charge.current = max_ma;
+	charge.voltage = supply_voltage;
+	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
+}
+
 void charge_manager_update_charge(int supplier,
 				  int port,
 				  struct charge_port_info *charge)