usb_pd: Rename "Externally powered" to "Unconstrained Power"

This was changed in PD 2.0 years ago (via ECN authored by our own David
Schneider), but our codebase still refers to BIT 27 of the Fixed PDO as
"Externally powered" instead of "Unconstrained Power".

This will search and replace all instances of "Externally powered" when it
refers to BIT 27, as well as function names, other internal representations
of that property, strings, and comments.

seds:
s/PD_FLAGS_PARTNER_EXTPOWER/PD_FLAGS_PARTNER_UNCONSTR/g
s/partner_extpower/partner_unconstrained/g
s/externally powered/unconstrained/g

Some others too.

Signed-off-by: Benson Leung <bleung@chromium.org>

BUG=chromium:1030990
TEST=Codebase builds clean. No functional change, except for the property shows
up in ectool as "Unconstrained power" now.

Change-Id: I5ececa03f29eb31057be3d0ad5311117093bc6da
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1956147
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Benson Leung <bleung@google.com>
Tested-by: Benson Leung <bleung@google.com>

19 files changed, 62 insertions, 61 deletions

diff --git a/baseboard/kalista/usb_pd_policy.c b/baseboard/kalista/usb_pd_policy.c
index 0772b990ee..8d9a10e883 100644
--- a/baseboard/kalista/usb_pd_policy.c
+++ b/baseboard/kalista/usb_pd_policy.c
@@ -25,7 +25,7 @@
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
 
-#define PDO_FIXED_FLAGS (PDO_FIXED_EXTERNAL | \
+#define PDO_FIXED_FLAGS (PDO_FIXED_UNCONSTRAINED | \
 			 PDO_FIXED_DATA_SWAP | \
 			 PDO_FIXED_COMM_CAP)
 
diff --git a/board/chell/usb_pd_policy.c b/board/chell/usb_pd_policy.c
index 3a2a6b2afc..b2e8de464f 100644
--- a/board/chell/usb_pd_policy.c
+++ b/board/chell/usb_pd_policy.c
@@ -119,14 +119,14 @@ void pd_check_pr_role(int port, int pr_role, int flags)
 	if ((flags & PD_FLAGS_PARTNER_DR_POWER) &&
 	    pd_get_dual_role(port) == PD_DRP_TOGGLE_ON) {
 		/*
-		 * If we are a sink and partner is not externally powered, then
+		 * If we are a sink and partner is not unconstrained, then
 		 * swap to become a source. If we are source and partner is
-		 * externally powered, swap to become a sink.
+		 * unconstrained, swap to become a sink.
 		 */
-		int partner_extpower = flags & PD_FLAGS_PARTNER_EXTPOWER;
+		int partner_unconstrained = flags & PD_FLAGS_PARTNER_UNCONSTR;
 
-		if ((!partner_extpower && pr_role == PD_ROLE_SINK) ||
-		     (partner_extpower && pr_role == PD_ROLE_SOURCE))
+		if ((!partner_unconstrained && pr_role == PD_ROLE_SINK) ||
+		     (partner_unconstrained && pr_role == PD_ROLE_SOURCE))
 			pd_request_power_swap(port);
 	}
 }
diff --git a/board/coffeecake/usb_pd_policy.c b/board/coffeecake/usb_pd_policy.c
index 660e45e90e..89f6bd28ad 100644
--- a/board/coffeecake/usb_pd_policy.c
+++ b/board/coffeecake/usb_pd_policy.c
@@ -24,7 +24,7 @@
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
 
 #define PDO_FIXED_FLAGS_EXT (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |\
-			     PDO_FIXED_COMM_CAP | PDO_FIXED_EXTERNAL)
+			     PDO_FIXED_COMM_CAP | PDO_FIXED_UNCONSTRAINED)
 
 #define PDO_FIXED_FLAGS (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |\
 			 PDO_FIXED_COMM_CAP)
diff --git a/board/it83xx_evb/usb_pd_policy.c b/board/it83xx_evb/usb_pd_policy.c
index 1ff691ea04..bb4eb5c3f3 100644
--- a/board/it83xx_evb/usb_pd_policy.c
+++ b/board/it83xx_evb/usb_pd_policy.c
@@ -20,7 +20,7 @@
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
 
 #define PDO_FIXED_FLAGS (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |\
-			 PDO_FIXED_EXTERNAL  | PDO_FIXED_COMM_CAP)
+			 PDO_FIXED_UNCONSTRAINED  | PDO_FIXED_COMM_CAP)
 
 /* Threshold voltage of VBUS provided (mV) */
 #define PD_VBUS_PROVIDED_THRESHOLD 3900
diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c
index abc5f91f53..64e2ec8493 100644
--- a/board/plankton/usb_pd_policy.c
+++ b/board/plankton/usb_pd_policy.c
@@ -22,7 +22,7 @@
 /* Acceptable margin between requested VBUS and measured value */
 #define MARGIN_MV 400 /* mV */
 
-#define PDO_FIXED_FLAGS (PDO_FIXED_DATA_SWAP | PDO_FIXED_EXTERNAL |\
+#define PDO_FIXED_FLAGS (PDO_FIXED_DATA_SWAP | PDO_FIXED_UNCONSTRAINED |\
 			 PDO_FIXED_COMM_CAP)
 
 /* Source PDOs */
diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c
index d96475217c..61b6b51314 100644
--- a/board/servo_v4/usb_pd_policy.c
+++ b/board/servo_v4/usb_pd_policy.c
@@ -305,7 +305,7 @@ static void update_ports(void)
 					PDO_FIXED_VOLT(max_mv) |
 					PDO_FIXED_CURR(max_ma) |
 					DUT_PDO_FIXED_FLAGS |
-					PDO_FIXED_EXTERNAL;
+					PDO_FIXED_UNCONSTRAINED;
 			}
 			chg_pdo_cnt = src_index;
 		} else {
@@ -313,7 +313,7 @@ static void update_ports(void)
 			pd_src_chg_pdo[0] = PDO_FIXED_VOLT(PD_MIN_MV) |
 				PDO_FIXED_CURR(vbus[CHG].ma) |
 				DUT_PDO_FIXED_FLAGS |
-				PDO_FIXED_EXTERNAL;
+				PDO_FIXED_UNCONSTRAINED;
 
 			chg_pdo_cnt = 1;
 		}
@@ -693,8 +693,8 @@ __override int pd_check_power_swap(int port)
 {
 	/*
 	 * When only host VBUS is available, then servo_v4 is not setting
-	 * PDO_FIXED_EXTERNAL in the src_pdo sent to the DUT. When this bit is
-	 * not set, the DUT will always attempt to swap its power role to
+	 * PDO_FIXED_UNCONSTRAINED in the src_pdo sent to the DUT. When this bit
+	 * is not set, the DUT will always attempt to swap its power role to
 	 * SRC. Let servo_v4 have more control over its power role by always
 	 * rejecting power swap requests from the DUT.
 	 */
diff --git a/board/twinkie/usb_pd_policy.c b/board/twinkie/usb_pd_policy.c
index d4fc43d3b9..253bf717f4 100644
--- a/board/twinkie/usb_pd_policy.c
+++ b/board/twinkie/usb_pd_policy.c
@@ -17,7 +17,7 @@
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
 
-#define PDO_FIXED_FLAGS (PDO_FIXED_EXTERNAL | PDO_FIXED_DATA_SWAP)
+#define PDO_FIXED_FLAGS (PDO_FIXED_UNCONSTRAINED | PDO_FIXED_DATA_SWAP)
 
 const uint32_t pd_src_pdo[] = {
 		PDO_FIXED(5000,  3000, PDO_FIXED_FLAGS),
diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c
index 0ea132945c..560a8ba3b6 100644
--- a/board/zinger/usb_pd_policy.c
+++ b/board/zinger/usb_pd_policy.c
@@ -154,7 +154,7 @@ static void discharge_voltage(int target_volt)
 
 /* ----------------------- USB Power delivery policy ---------------------- */
 
-#define PDO_FIXED_FLAGS (PDO_FIXED_EXTERNAL | PDO_FIXED_DATA_SWAP)
+#define PDO_FIXED_FLAGS (PDO_FIXED_UNCONSTRAINED | PDO_FIXED_DATA_SWAP)
 
 /* Voltage indexes for the PDOs */
 enum volt_idx {
diff --git a/common/usb_common.c b/common/usb_common.c
index 65e686ac73..dc7a40a08e 100644
--- a/common/usb_common.c
+++ b/common/usb_common.c
@@ -556,14 +556,14 @@ __overridable void pd_check_pr_role(int port, int pr_role, int flags)
 	if ((flags & PD_FLAGS_PARTNER_DR_POWER) &&
 	    pd_get_dual_role(port) == PD_DRP_TOGGLE_ON) {
 		/*
-		 * If we are a sink and partner is not externally powered, then
+		 * If we are a sink and partner is not unconstrained, then
 		 * swap to become a source. If we are source and partner is
-		 * externally powered, swap to become a sink.
+		 * unconstrained, swap to become a sink.
 		 */
-		int partner_extpower = flags & PD_FLAGS_PARTNER_EXTPOWER;
+		int partner_unconstrained = flags & PD_FLAGS_PARTNER_UNCONSTR;
 
-		if ((!partner_extpower && pr_role == PD_ROLE_SINK) ||
-		     (partner_extpower && pr_role == PD_ROLE_SOURCE))
+		if ((!partner_unconstrained && pr_role == PD_ROLE_SINK) ||
+		     (partner_unconstrained && pr_role == PD_ROLE_SOURCE))
 			pd_request_power_swap(port);
 	}
 }
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 4b8fa85071..f31f859641 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -157,7 +157,7 @@ int pd_charge_from_device(uint16_t vid, uint16_t pid)
 	/* TODO: rewrite into table if we get more of these */
 	/*
 	 * White-list Apple charge-through accessory since it doesn't set
-	 * externally powered bit, but we still need to charge from it when
+	 * unconstrained bit, but we still need to charge from it when
 	 * we are a sink.
 	 */
 	return (vid == USB_VID_APPLE && (pid == 0x1012 || pid == 0x1013));
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 37d9dafd86..5e7e181141 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -1575,10 +1575,10 @@ static void pd_update_pdo_flags(int port, uint32_t pdo)
 	else
 		pd[port].flags &= ~PD_FLAGS_PARTNER_DR_POWER;
 
-	if (pdo & PDO_FIXED_EXTERNAL)
-		pd[port].flags |= PD_FLAGS_PARTNER_EXTPOWER;
+	if (pdo & PDO_FIXED_UNCONSTRAINED)
+		pd[port].flags |= PD_FLAGS_PARTNER_UNCONSTR;
 	else
-		pd[port].flags &= ~PD_FLAGS_PARTNER_EXTPOWER;
+		pd[port].flags &= ~PD_FLAGS_PARTNER_UNCONSTR;
 
 	if (pdo & PDO_FIXED_COMM_CAP)
 		pd[port].flags |= PD_FLAGS_PARTNER_USB_COMM;
@@ -1594,12 +1594,12 @@ static void pd_update_pdo_flags(int port, uint32_t pdo)
 #ifdef CONFIG_CHARGE_MANAGER
 	/*
 	 * Treat device as a dedicated charger (meaning we should charge
-	 * from it) if it does not support power swap, or if it is externally
-	 * powered, or if we are a sink and the device identity matches a
+	 * from it) if it does not support power swap, or has unconstrained
+	 * power, or if we are a sink and the device identity matches a
 	 * charging white-list.
 	 */
 	if (!(pd[port].flags & PD_FLAGS_PARTNER_DR_POWER) ||
-	    (pd[port].flags & PD_FLAGS_PARTNER_EXTPOWER) ||
+	    (pd[port].flags & PD_FLAGS_PARTNER_UNCONSTR) ||
 	    charge_whitelisted)
 		charge_manager_update_dualrole(port, CAP_DEDICATED);
 	else
@@ -5390,8 +5390,8 @@ static enum ec_status hc_usb_pd_control(struct host_cmd_handler_args *args)
 				PD_CTRL_RESP_ROLE_DR_DATA : 0) |
 			((pd[p->port].flags & PD_FLAGS_PARTNER_USB_COMM) ?
 				PD_CTRL_RESP_ROLE_USB_COMM : 0) |
-			((pd[p->port].flags & PD_FLAGS_PARTNER_EXTPOWER) ?
-				PD_CTRL_RESP_ROLE_EXT_POWERED : 0);
+			((pd[p->port].flags & PD_FLAGS_PARTNER_UNCONSTR) ?
+				PD_CTRL_RESP_ROLE_UNCONSTRAINED : 0);
 		r_v2->polarity = pd[p->port].polarity;
 
 		if (debug_level > 0)
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c
index 8f68a5db3e..6c1d784467 100644
--- a/common/usbc/usb_pe_drp_sm.c
+++ b/common/usbc/usb_pe_drp_sm.c
@@ -898,10 +898,10 @@ static void pe_update_pdo_flags(int port, uint32_t pdo)
 	else
 		tc_partner_dr_power(port, 0);
 
-	if (pdo & PDO_FIXED_EXTERNAL)
-		tc_partner_extpower(port, 1);
+	if (pdo & PDO_FIXED_UNCONSTRAINED)
+		tc_partner_unconstrainedpower(port, 1);
 	else
-		tc_partner_extpower(port, 0);
+		tc_partner_unconstrainedpower(port, 0);
 
 	if (pdo & PDO_FIXED_COMM_CAP)
 		tc_partner_usb_comm(port, 1);
@@ -916,11 +916,11 @@ static void pe_update_pdo_flags(int port, uint32_t pdo)
 #ifdef CONFIG_CHARGE_MANAGER
 	/*
 	 * Treat device as a dedicated charger (meaning we should charge
-	 * from it) if it does not support power swap, or if it is externally
-	 * powered, or if we are a sink and the device identity matches a
+	 * from it) if it does not support power swap, or if it is unconstrained
+	 * power, or if we are a sink and the device identity matches a
 	 * charging white-list.
 	 */
-	if (!(pdo & PDO_FIXED_DUAL_ROLE) || (pdo & PDO_FIXED_EXTERNAL) ||
+	if (!(pdo & PDO_FIXED_DUAL_ROLE) || (pdo & PDO_FIXED_UNCONSTRAINED) ||
 		charge_whitelisted) {
 		PE_CLR_FLAG(port, PE_FLAGS_PORT_PARTNER_IS_DUALROLE);
 		charge_manager_update_dualrole(port, CAP_DEDICATED);
@@ -4451,7 +4451,7 @@ int pd_charge_from_device(uint16_t vid, uint16_t pid)
 	/* TODO: rewrite into table if we get more of these */
 	/*
 	 * White-list Apple charge-through accessory since it doesn't set
-	 * externally powered bit, but we still need to charge from it when
+	 * unconstrained bit, but we still need to charge from it when
 	 * we are a sink.
 	 */
 	return (vid == USB_VID_APPLE &&
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
index 73b242272a..0bad15117f 100644
--- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c
+++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
@@ -60,8 +60,8 @@
 #define TC_FLAGS_REQUEST_DR_SWAP        BIT(11)
 /* Flag to note request to power off sink */
 #define TC_FLAGS_POWER_OFF_SNK          BIT(12)
-/* Flag to note port partner has external power */
-#define TC_FLAGS_PARTNER_EXTPOWER       BIT(13)
+/* Flag to note port partner has unconstrained power */
+#define TC_FLAGS_PARTNER_UNCONSTRAINED  BIT(13)
 /* Flag to note port partner is Dual Role Data */
 #define TC_FLAGS_PARTNER_DR_DATA        BIT(14)
 /* Flag to note port partner is Dual Role Power */
@@ -506,12 +506,12 @@ void tc_partner_dr_power(int port, int en)
 		TC_CLR_FLAG(port, TC_FLAGS_PARTNER_DR_POWER);
 }
 
-void tc_partner_extpower(int port, int en)
+void tc_partner_unconstrainedpower(int port, int en)
 {
 	if (en)
-		TC_SET_FLAG(port, TC_FLAGS_PARTNER_EXTPOWER);
+		TC_SET_FLAG(port, TC_FLAGS_PARTNER_UNCONSTRAINED);
 	else
-		TC_CLR_FLAG(port, TC_FLAGS_PARTNER_EXTPOWER);
+		TC_CLR_FLAG(port, TC_FLAGS_PARTNER_UNCONSTRAINED);
 }
 
 void tc_partner_usb_comm(int port, int en)
@@ -1247,8 +1247,8 @@ static enum ec_status hc_usb_pd_control(struct host_cmd_handler_args *args)
 				PD_CTRL_RESP_ROLE_DR_DATA : 0) |
 			(TC_CHK_FLAG(p->port, TC_FLAGS_PARTNER_USB_COMM) ?
 				PD_CTRL_RESP_ROLE_USB_COMM : 0) |
-			(TC_CHK_FLAG(p->port, TC_FLAGS_PARTNER_EXTPOWER) ?
-				PD_CTRL_RESP_ROLE_EXT_POWERED : 0);
+			(TC_CHK_FLAG(p->port, TC_FLAGS_PARTNER_UNCONSTRAINED) ?
+				PD_CTRL_RESP_ROLE_UNCONSTRAINED : 0);
 		r_v2->polarity = tc[p->port].polarity;
 		r_v2->cc_state = tc[p->port].cc_state;
 
diff --git a/include/ec_commands.h b/include/ec_commands.h
index d23e8e999e..00c692ec79 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -5144,7 +5144,7 @@ struct ec_params_usb_pd_control {
 #define PD_CTRL_RESP_ROLE_DR_POWER      BIT(3) /* Partner is dualrole power */
 #define PD_CTRL_RESP_ROLE_DR_DATA       BIT(4) /* Partner is dualrole data */
 #define PD_CTRL_RESP_ROLE_USB_COMM      BIT(5) /* Partner USB comm capable */
-#define PD_CTRL_RESP_ROLE_EXT_POWERED   BIT(6) /* Partner externally powerd */
+#define PD_CTRL_RESP_ROLE_UNCONSTRAINED BIT(6) /* Partner unconstrained power */
 
 struct ec_response_usb_pd_control {
 	uint8_t enabled;
diff --git a/include/usb_pd.h b/include/usb_pd.h
index b04c100717..77549cd595 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -93,11 +93,11 @@ enum pd_rx_errors {
 #define PDO_TYPE_AUGMENTED (3 << 30)
 #define PDO_TYPE_MASK      (3 << 30)
 
-#define PDO_FIXED_DUAL_ROLE BIT(29) /* Dual role device */
-#define PDO_FIXED_SUSPEND   BIT(28) /* USB Suspend supported */
-#define PDO_FIXED_EXTERNAL  BIT(27) /* Externally powered */
-#define PDO_FIXED_COMM_CAP  BIT(26) /* USB Communications Capable */
-#define PDO_FIXED_DATA_SWAP BIT(25) /* Data role swap command supported */
+#define PDO_FIXED_DUAL_ROLE	BIT(29) /* Dual role device */
+#define PDO_FIXED_SUSPEND	BIT(28) /* USB Suspend supported */
+#define PDO_FIXED_UNCONSTRAINED	BIT(27) /* Unconstrained Power */
+#define PDO_FIXED_COMM_CAP	BIT(26) /* USB Communications Capable */
+#define PDO_FIXED_DATA_SWAP	BIT(25) /* Data role swap command supported */
 #define PDO_FIXED_FRS_CURR_MASK (3 << 23) /* [23..24] FRS current */
 #define PDO_FIXED_FRS_CURR_NOT_SUPPORTED  (0 << 23)
 #define PDO_FIXED_FRS_CURR_DFLT_USB_POWER (1 << 23)
@@ -1086,7 +1086,7 @@ enum pd_states {
 #define PD_FLAGS_PREVIOUS_PD_CONN  BIT(8) /* previously PD connected */
 #define PD_FLAGS_CHECK_PR_ROLE     BIT(9) /* check power role in READY */
 #define PD_FLAGS_CHECK_DR_ROLE     BIT(10)/* check data role in READY */
-#define PD_FLAGS_PARTNER_EXTPOWER  BIT(11)/* port partner has external pwr */
+#define PD_FLAGS_PARTNER_UNCONSTR  BIT(11)/* port partner unconstrained pwr */
 #define PD_FLAGS_VCONN_ON          BIT(12)/* vconn is being sourced */
 #define PD_FLAGS_TRY_SRC           BIT(13)/* Try.SRC states are active */
 #define PD_FLAGS_PARTNER_USB_COMM  BIT(14)/* port partner is USB comms */
@@ -1120,7 +1120,7 @@ enum pd_states {
 					   PD_FLAGS_PREVIOUS_PD_CONN | \
 					   PD_FLAGS_CHECK_PR_ROLE | \
 					   PD_FLAGS_CHECK_DR_ROLE | \
-					   PD_FLAGS_PARTNER_EXTPOWER | \
+					   PD_FLAGS_PARTNER_UNCONSTR | \
 					   PD_FLAGS_VCONN_ON | \
 					   PD_FLAGS_TRY_SRC | \
 					   PD_FLAGS_PARTNER_USB_COMM | \
@@ -1679,7 +1679,7 @@ __override_proto void pd_check_dr_role(int port, int dr_role, int flags);
 /**
  * Check if we should charge from this device. This is
  * basically a white-list for chargers that are dual-role,
- * don't set the externally powered bit, but we should charge
+ * don't set the unconstrained bit, but we should charge
  * from by default.
  *
  * @param vid Port partner Vendor ID
diff --git a/include/usb_tc_sm.h b/include/usb_tc_sm.h
index b4b559152f..614269d5cd 100644
--- a/include/usb_tc_sm.h
+++ b/include/usb_tc_sm.h
@@ -126,12 +126,12 @@ void tc_partner_dr_power(int port, int en);
 
 /**
  * Policy Engine informs the Type-C state machine if the port partner
- * has external power
+ * has unconstrained power
  *
  * @param port USB_C port number
- * @param en   1 if port partner has external power, else 0
+ * @param en   1 if port partner has unconstrained power, else 0
  */
-void tc_partner_extpower(int port, int en);
+void tc_partner_unconstrainedpower(int port, int en);
 
 /**
  * Policy Engine informs the Type-C state machine if the port partner
diff --git a/test/fake_usbc.c b/test/fake_usbc.c
index d074876f6f..aab7f0a7ed 100644
--- a/test/fake_usbc.c
+++ b/test/fake_usbc.c
@@ -88,7 +88,7 @@ void tc_partner_dr_data(int port, int en)
 void tc_partner_dr_power(int port, int en)
 {}
 
-void tc_partner_extpower(int port, int en)
+void tc_partner_unconstrainedpower(int port, int en)
 {}
 
 void tc_partner_usb_comm(int port, int en)
diff --git a/util/ectool.c b/util/ectool.c
index 802ea530ba..32312fe52b 100644
--- a/util/ectool.c
+++ b/util/ectool.c
@@ -5592,8 +5592,8 @@ int cmd_usb_pd(int argc, char *argv[])
 					" DR data\n" : "",
 				(r_v1->role & PD_CTRL_RESP_ROLE_USB_COMM) ?
 					" USB capable\n" : "",
-				(r_v1->role & PD_CTRL_RESP_ROLE_EXT_POWERED) ?
-					" Externally powered\n" : "");
+				(r_v1->role & PD_CTRL_RESP_ROLE_UNCONSTRAINED) ?
+					" Unconstrained power\n" : "");
 	}
 	return 0;
 }
diff --git a/util/genvif.c b/util/genvif.c
index ba217a4acf..796384aee0 100644
--- a/util/genvif.c
+++ b/util/genvif.c
@@ -115,10 +115,10 @@ static int is_snk(void)
 #endif
 }
 
-static int is_extpwr(void)
+static int is_unconstrained(void)
 {
 	if (is_src())
-		return !!(src_pdo[0] & PDO_FIXED_EXTERNAL);
+		return !!(src_pdo[0] & PDO_FIXED_UNCONSTRAINED);
 	else
 		return 0;
 }
@@ -449,7 +449,8 @@ static int gen_vif(const char *name, const char *board,
 				dr_swap_to_dfp_supported());
 	fprintf(vif, "DR_Swap_To_UFP_Supported: %s\r\n",
 				dr_swap_to_ufp_supported());
-	fprintf(vif, "Unconstrained_Powered: %s\r\n", yes_no(is_extpwr()));
+	fprintf(vif, "Unconstrained_Powered: %s\r\n",
+				yes_no(is_unconstrained()));
 	fprintf(vif, "VCONN_Swap_To_On_Supported: %s\r\n", vconn_swap());
 	fprintf(vif, "VCONN_Swap_To_Off_Supported: %s\r\n", vconn_swap());
 	fprintf(vif, "Responds_To_Discov_SOP: YES\r\n");