From: Sven Peter <sven@svenpeter.dev>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: "Sven Peter" <sven@svenpeter.dev>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Guido Günther" <agx@sigxcpu.org>,
"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
"Hector Martin" <marcan@marcan.st>,
"Mohamed Mediouni" <mohamed.mediouni@caramail.com>,
"Stan Skowronek" <stan@corellium.com>,
"Mark Kettenis" <mark.kettenis@xs4all.nl>,
"Alexander Graf" <graf@amazon.com>,
"Alyssa Rosenzweig" <alyssa@rosenzweig.io>
Subject: [RFT PATCH 8/9] usb: typec: tipd: Switch power state to S0 for Apple variant
Date: Sat, 18 Sep 2021 14:09:33 +0200 [thread overview]
Message-ID: <20210918120934.28252-9-sven@svenpeter.dev> (raw)
In-Reply-To: <20210918120934.28252-1-sven@svenpeter.dev>
The Apple CD321x comes up in a low-power state after boot. Usually, the
bootloader will already power it up to S0 but let's do it here as well
in case that didn't happen.
Suggested-by: Stan Skowronek <stan@corellium.com>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/usb/typec/tipd/core.c | 44 +++++++++++++++++++++++++++++++
drivers/usb/typec/tipd/tps6598x.h | 6 +++++
2 files changed, 50 insertions(+)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index e96b17fe6af6..26807c050662 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -30,6 +30,7 @@
#define TPS_REG_INT_MASK2 0x17
#define TPS_REG_INT_CLEAR1 0x18
#define TPS_REG_INT_CLEAR2 0x19
+#define TPS_REG_SYSTEM_POWER_STATE 0x20
#define TPS_REG_STATUS 0x1a
#define TPS_REG_SYSTEM_CONF 0x28
#define TPS_REG_CTRL_CONF 0x29
@@ -84,6 +85,8 @@ struct tps6598x_hw {
unsigned int irq_data_status_update;
unsigned int irq_plug_event;
void (*irq_trace)(u64 event1, u64 event2);
+
+ bool supports_spss;
};
static const struct tps6598x_hw ti_tps6598x_data;
@@ -161,6 +164,11 @@ static int tps6598x_block_write(struct tps6598x *tps, u8 reg,
return regmap_raw_write(tps->regmap, reg, data, sizeof(data));
}
+static inline int tps6598x_read8(struct tps6598x *tps, u8 reg, u8 *val)
+{
+ return tps6598x_block_read(tps, reg, val, sizeof(u8));
+}
+
static inline int tps6598x_read16(struct tps6598x *tps, u8 reg, u16 *val)
{
return tps6598x_block_read(tps, reg, val, sizeof(u16));
@@ -572,6 +580,35 @@ static int tps6598x_psy_get_prop(struct power_supply *psy,
return ret;
}
+static int cd321x_switch_power_state(struct tps6598x *tps, u8 target_state)
+{
+ u8 state;
+ int ret;
+
+ if (!tps->hw->supports_spss)
+ return 0;
+
+ ret = tps6598x_read8(tps, TPS_REG_SYSTEM_POWER_STATE, &state);
+ if (ret)
+ return ret;
+
+ if (state == target_state)
+ return 0;
+
+ ret = tps6598x_exec_cmd(tps, "SPSS", sizeof(u8), &target_state, 0, NULL);
+ if (ret)
+ return ret;
+
+ ret = tps6598x_read8(tps, TPS_REG_SYSTEM_POWER_STATE, &state);
+ if (ret)
+ return ret;
+
+ if (state != target_state)
+ return -EINVAL;
+
+ return 0;
+}
+
static int devm_tps6598_psy_register(struct tps6598x *tps)
{
struct power_supply_config psy_cfg = {};
@@ -648,6 +685,11 @@ static int tps6598x_probe(struct i2c_client *client)
if (ret)
return ret;
+ /* Switch Apple chips to the correct system power state */
+ ret = cd321x_switch_power_state(tps, TPS_SYSTEM_POWER_STATE_S0);
+ if (ret)
+ return ret;
+
ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
if (ret < 0)
return ret;
@@ -786,6 +828,7 @@ static const struct tps6598x_hw ti_tps6598x_data = {
.irq_data_status_update = TPS_REG_INT_DATA_STATUS_UPDATE,
.irq_plug_event = TPS_REG_INT_PLUG_EVENT,
.irq_trace = trace_tps6598x_irq,
+ .supports_spss = false,
};
static const struct tps6598x_hw apple_cd321x_data = {
@@ -795,6 +838,7 @@ static const struct tps6598x_hw apple_cd321x_data = {
.irq_data_status_update = APPLE_TPS_REG_INT_DATA_STATUS_UPDATE,
.irq_plug_event = APPLE_TPS_REG_INT_PLUG_EVENT,
.irq_trace = trace_cd321x_irq,
+ .supports_spss = true,
};
static const struct of_device_id tps6598x_of_match[] = {
diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h
index 36b482733297..5e6ff51aa657 100644
--- a/drivers/usb/typec/tipd/tps6598x.h
+++ b/drivers/usb/typec/tipd/tps6598x.h
@@ -135,6 +135,12 @@
#define APPLE_TPS_REG_INT_STATUS_UPDATE BIT(8)
#define APPLE_TPS_REG_INT_PLUG_EVENT BIT(1)
+/* TPS_REG_SYSTEM_POWER_STATE states */
+#define TPS_SYSTEM_POWER_STATE_S0 0x00
+#define TPS_SYSTEM_POWER_STATE_S3 0x03
+#define TPS_SYSTEM_POWER_STATE_S4 0x04
+#define TPS_SYSTEM_POWER_STATE_S5 0x05
+
/* TPS_REG_POWER_STATUS bits */
#define TPS_POWER_STATUS_CONNECTION(x) TPS_FIELD_GET(BIT(0), (x))
#define TPS_POWER_STATUS_SOURCESINK(x) TPS_FIELD_GET(BIT(1), (x))
--
2.25.1
next prev parent reply other threads:[~2021-09-18 12:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 12:09 [RFT PATCH 0/9] usb: typec: tipd: Add Apple M1 support Sven Peter
2021-09-18 12:09 ` [RFT PATCH 1/9] dt-bindings: usb: tps6598x: Add Apple CD321x compatible Sven Peter
2021-09-19 11:25 ` Alyssa Rosenzweig
2021-09-22 20:38 ` Rob Herring
2021-09-18 12:09 ` [RFT PATCH 2/9] usb: typec: tipd: Prepare supporting different variants Sven Peter
2021-09-19 11:27 ` Alyssa Rosenzweig
2021-09-21 13:10 ` Heikki Krogerus
2021-09-22 14:55 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 3/9] usb: typec: tipd: Allow irq controller selection Sven Peter
2021-09-19 11:28 ` Alyssa Rosenzweig
2021-09-21 13:21 ` Heikki Krogerus
2021-09-22 14:56 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 4/9] usb: typec: tipd: Add short-circuit for no irqs Sven Peter
2021-09-21 13:23 ` Heikki Krogerus
2021-09-18 12:09 ` [RFT PATCH 5/9] usb: typec: tipd: Allow to configure irq bits Sven Peter
2021-09-21 13:34 ` Heikki Krogerus
2021-09-22 14:58 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 6/9] usb: typec: tipd: Setup IntMask explicitly Sven Peter
2021-09-19 11:31 ` Alyssa Rosenzweig
2021-09-21 13:40 ` Heikki Krogerus
2021-09-22 14:58 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 7/9] usb: typec: tipd: Add support for apple,cd321x Sven Peter
2021-09-19 11:32 ` Alyssa Rosenzweig
2021-09-18 12:09 ` Sven Peter [this message]
2021-09-19 11:33 ` [RFT PATCH 8/9] usb: typec: tipd: Switch power state to S0 for Apple variant Alyssa Rosenzweig
2021-09-21 13:46 ` Heikki Krogerus
2021-09-22 15:00 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 9/9] usb: typec: tipd: Remove FIXME about testing with I2C_FUNC_I2C Sven Peter
2021-09-19 11:33 ` Alyssa Rosenzweig
2021-09-21 13:41 ` Heikki Krogerus
2021-09-19 11:35 ` [RFT PATCH 0/9] usb: typec: tipd: Add Apple M1 support Alyssa Rosenzweig
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=20210918120934.28252-9-sven@svenpeter.dev \
--to=sven@svenpeter.dev \
--cc=agx@sigxcpu.org \
--cc=alyssa@rosenzweig.io \
--cc=bryan.odonoghue@linaro.org \
--cc=graf@amazon.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=mark.kettenis@xs4all.nl \
--cc=mohamed.mediouni@caramail.com \
--cc=stan@corellium.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).