From: Badhri Jagan Sridharan <badhri@google.com>
To: Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>,
Lee Jones <lee.jones@linaro.org>, Mark Brown <broonie@kernel.org>,
Maxime Ripard <mripard@kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Thierry Reding <treding@nvidia.com>,
Prashant Malani <pmalani@chromium.org>,
Badhri Jagan Sridharan <badhri@google.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org,
Amelie Delaunay <amelie.delaunay@st.com>
Subject: [PATCH v10 12/15] usb: typec: tcpm: Parse frs type-c current from device tree
Date: Wed, 7 Oct 2020 23:15:53 -0700 [thread overview]
Message-ID: <20201008061556.1402293-13-badhri@google.com> (raw)
In-Reply-To: <20201008061556.1402293-1-badhri@google.com>
New source's current capability is now defined as string based
device tree property through new-source-frs-typec-current.
Refactor tcpm code to parse new-source-frs-typec-current and
infer local port's new source current capability during frs.
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
---
v9 is the first version of this patch in this series to rebase
TCPM code to read new source frs current from
new-source-frs-typec-current. No changes since v9.
---
drivers/usb/typec/tcpm/tcpm.c | 41 +++++++++++++++++++----------------
include/linux/usb/typec.h | 12 ++++++++++
2 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 02b7f623f584..d5a3e2b3bea2 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -180,16 +180,11 @@ enum adev_actions {
ADEV_ATTENTION,
};
-/*
- * Initial current capability of the new source when vSafe5V is applied during PD3.0 Fast Role Swap.
- * Based on "Table 6-14 Fixed Supply PDO - Sink" of "USB Power Delivery Specification Revision 3.0,
- * Version 1.2"
- */
-enum frs_typec_current {
- FRS_NOT_SUPPORTED,
- FRS_DEFAULT_POWER,
- FRS_5V_1P5A,
- FRS_5V_3A,
+static const char * const typec_new_source_frs_current[] = {
+ [FRS_NOT_SUPPORTED] = "not-supported",
+ [FRS_DEFAULT_POWER] = "default",
+ [FRS_5V_1P5A] = "1.5A",
+ [FRS_5V_3A] = "3.0A",
};
/* Events from low level driver */
@@ -364,7 +359,7 @@ struct tcpm_port {
bool self_powered;
/* FRS */
- enum frs_typec_current frs_current;
+ enum typec_new_source_frs_current new_source_frs_current;
/* Sink caps have been queried */
bool sink_cap_done;
@@ -1713,7 +1708,7 @@ static void tcpm_pd_data_request(struct tcpm_port *port,
unsigned int cnt = pd_header_cnt_le(msg->header);
unsigned int rev = pd_header_rev_le(msg->header);
unsigned int i;
- enum frs_typec_current frs_current;
+ enum typec_new_source_frs_current partner_frs_current;
bool frs_enable;
int ret;
@@ -1786,12 +1781,13 @@ static void tcpm_pd_data_request(struct tcpm_port *port,
for (i = 0; i < cnt; i++)
port->sink_caps[i] = le32_to_cpu(msg->payload[i]);
- frs_current = (port->sink_caps[0] & PDO_FIXED_FRS_CURR_MASK) >>
+ partner_frs_current = (port->sink_caps[0] & PDO_FIXED_FRS_CURR_MASK) >>
PDO_FIXED_FRS_CURR_SHIFT;
- frs_enable = frs_current && (frs_current <= port->frs_current);
+ frs_enable = partner_frs_current && (partner_frs_current <=
+ port->new_source_frs_current);
tcpm_log(port,
"Port partner FRS capable partner_frs_current:%u port_frs_current:%u enable:%c",
- frs_current, port->frs_current, frs_enable ? 'y' : 'n');
+ partner_frs_current, port->new_source_frs_current, frs_enable ? 'y' : 'n');
if (frs_enable) {
ret = port->tcpc->enable_frs(port->tcpc, true);
tcpm_log(port, "Enable FRS %s, ret:%d\n", ret ? "fail" : "success", ret);
@@ -4746,7 +4742,8 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
{
const char *cap_str;
int ret;
- u32 mw, frs_current;
+ u32 mw;
+ const char *new_source_frs_current;
if (!fwnode)
return -EINVAL;
@@ -4817,9 +4814,15 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
/* FRS can only be supported byb DRP ports */
if (port->port_type == TYPEC_PORT_DRP) {
- ret = fwnode_property_read_u32(fwnode, "frs-typec-current", &frs_current);
- if (ret >= 0 && frs_current <= FRS_5V_3A)
- port->frs_current = frs_current;
+ ret = fwnode_property_read_string(fwnode, "new-source-frs-typec-current",
+ &new_source_frs_current);
+ if (!ret) {
+ ret = match_string(typec_new_source_frs_current,
+ ARRAY_SIZE(typec_new_source_frs_current),
+ new_source_frs_current);
+ if (ret >= 0)
+ port->new_source_frs_current = ret;
+ }
}
return 0;
diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h
index 6be558045942..3198b89fa451 100644
--- a/include/linux/usb/typec.h
+++ b/include/linux/usb/typec.h
@@ -72,6 +72,18 @@ enum typec_orientation {
TYPEC_ORIENTATION_REVERSE,
};
+/*
+ * Based on "Table 6-14 Fixed Supply PDO - Sink" of "USB Power Delivery Specification Revision 3.0,
+ * Version 1.2"
+ * Initial current capability of the new source when vSafe5V is applied.
+ */
+enum typec_new_source_frs_current {
+ FRS_NOT_SUPPORTED,
+ FRS_DEFAULT_POWER,
+ FRS_5V_1P5A,
+ FRS_5V_3A,
+};
+
/*
* struct enter_usb_data - Enter_USB Message details
* @eudo: Enter_USB Data Object
--
2.28.0.806.g8561365e88-goog
next prev parent reply other threads:[~2020-10-08 6:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 6:15 [PATCH v10 00/15] TCPM support for FRS and AutoDischarge Disconnect Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 01/15] usb: typec: tcpci: Add a getter method to retrieve tcpm_port reference Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 02/15] usb: typec: tcpci: Add set_vbus tcpci callback Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 03/15] dt-bindings: usb: Maxim type-c controller device tree binding document Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 04/15] usb: typec: tcpci_maxim: Chip level TCPC driver Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 05/15] dt-bindings: connector: Add property to set initial current cap for FRS Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 06/15] usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS) Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 07/15] usb: typec: tcpci: Implement callbacks for FRS Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 08/15] usb: typec: tcpci_maxim: Add support for Sink FRS Badhri Jagan Sridharan
2020-10-08 6:15 ` [PATCH v10 09/15] usb: typec: tcpm: frs sourcing vbus callback Badhri Jagan Sridharan
2020-10-19 13:40 ` Heikki Krogerus
2020-10-08 6:15 ` [PATCH v10 10/15] usb: typec: tcpci: " Badhri Jagan Sridharan
2020-10-19 13:41 ` Heikki Krogerus
2020-10-08 6:15 ` [PATCH v10 11/15] usb: typec: tcpci_max77759: Fix vbus stuck on upon diconnecting sink Badhri Jagan Sridharan
2020-10-19 13:44 ` Heikki Krogerus
2020-10-08 6:15 ` Badhri Jagan Sridharan [this message]
2020-10-08 6:15 ` [PATCH v10 13/15] usb: typec: tcpm: Implement enabling Auto Discharge disconnect support Badhri Jagan Sridharan
2020-10-19 13:48 ` Heikki Krogerus
2020-10-08 6:15 ` [PATCH v10 14/15] usb: typec: tcpci: Implement Auto discharge disconnect callbacks Badhri Jagan Sridharan
2020-10-19 13:49 ` Heikki Krogerus
2020-10-08 6:15 ` [PATCH v10 15/15] usb: typec: tcpci_maxim: Enable auto discharge disconnect Badhri Jagan Sridharan
2020-10-19 13:50 ` Heikki Krogerus
2020-10-08 7:46 ` [PATCH v10 00/15] TCPM support for FRS and AutoDischarge Disconnect Greg Kroah-Hartman
2020-10-08 17:54 ` Badhri Jagan Sridharan
2020-10-13 14:11 ` Rob Herring
2020-10-19 13:55 ` Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201008061556.1402293-13-badhri@google.com \
--to=badhri@google.com \
--cc=alexandre.belloni@bootlin.com \
--cc=amelie.delaunay@st.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mripard@kernel.org \
--cc=pmalani@chromium.org \
--cc=robh+dt@kernel.org \
--cc=treding@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).