From: "Angus Ainslie (Purism)" <angus@akkea.ca>
To: angus.ainslie@puri.sm
Cc: Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
"Angus Ainslie (Purism)" <angus@akkea.ca>
Subject: [PATCH 2/3] usb: typec: tcpm: Add functions to read the VBUS voltage
Date: Mon, 6 May 2019 08:08:29 -0600 [thread overview]
Message-ID: <20190506140830.25376-3-angus@akkea.ca> (raw)
In-Reply-To: <20190506140830.25376-1-angus@akkea.ca>
Put some diagnostics in the tcpm log when there's an over
or under voltage situation.
Signed-off-by: Angus Ainslie (Purism) <angus@akkea.ca>
---
drivers/usb/typec/tcpm/tcpci.c | 44 ++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index c1f7073a56de..c6e0e48b9a2a 100644
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -261,6 +261,39 @@ static int tcpci_set_pd_rx(struct tcpc_dev *tcpc, bool enable)
return 0;
}
+static int tcpci_get_vbus_voltage(struct tcpc_dev *tcpc)
+{
+ struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
+ u16 vbus_reg;
+ unsigned int vbus_voltage;
+ int ret, scale;
+
+ ret = tcpci_read16(tcpci, TCPC_VBUS_VOLTAGE, &vbus_reg);
+ if (ret < 0)
+ return ret;
+
+ vbus_voltage = vbus_reg & 0x3f;
+ switch ((ret >> 10) & 3) {
+ case 0:
+ scale = 1;
+ break;
+ case 1:
+ scale = 2;
+ break;
+ case 2:
+ scale = 4;
+ break;
+ case 3:
+ tcpm_log(tcpci->port, "invalid VBUS scale");
+ return -1;
+ }
+
+ if (scale != 1)
+ vbus_voltage *= scale;
+
+ return vbus_voltage;
+}
+
static int tcpci_get_vbus(struct tcpc_dev *tcpc)
{
struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
@@ -463,6 +496,17 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci)
else if (status & TCPC_ALERT_TX_FAILED)
tcpm_pd_transmit_complete(tcpci->port, TCPC_TX_FAILED);
+ if (status & (TCPC_ALERT_V_ALARM_LO | TCPC_ALERT_V_ALARM_HI)) {
+ int ret;
+
+ ret = tcpci_get_vbus_voltage(&tcpci->tcpc);
+
+ if (IS_ERR(ret))
+ tcpm_log(tcpci->port, "Can't read VBUS voltage");
+ else
+ tcpm_log(tcpci->port, "Invalid VBUS voltage %d", ret);
+ }
+
return IRQ_HANDLED;
}
EXPORT_SYMBOL_GPL(tcpci_irq);
--
2.17.1
next prev parent reply other threads:[~2019-05-06 14:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 14:08 [PATCH 0/3] usb: typec: tcpm: Add some FAULT_STATUS processing Angus Ainslie (Purism)
2019-05-06 14:08 ` [PATCH 1/3] usb: typec: tcpm: Export the logging function so it can be used by tcpci Angus Ainslie (Purism)
2019-05-06 15:28 ` Guenter Roeck
2019-05-06 14:08 ` Angus Ainslie (Purism) [this message]
2019-05-06 16:20 ` [PATCH 2/3] usb: typec: tcpm: Add functions to read the VBUS voltage Guenter Roeck
2019-05-07 12:20 ` Angus Ainslie
2019-05-06 14:08 ` [PATCH 3/3] usb: typec: tcpm: Clear the fault status register Angus Ainslie (Purism)
2019-05-06 15:11 ` Fabio Estevam
2019-05-06 15:27 ` Guenter Roeck
2019-05-07 11:42 ` Angus Ainslie
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=20190506140830.25376-3-angus@akkea.ca \
--to=angus@akkea.ca \
--cc=angus.ainslie@puri.sm \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
/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).