Incorporate updates to the EC headers to support the retrieval of VDM
Attention messages from port partners. These headers are already present
in the ChromeOS EC codebase. [1]
[1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
Signed-off-by: Prashant Malani <[email protected]>
---
include/linux/platform_data/cros_ec_commands.h | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index b9c4a3964247..ec327638c6eb 100644
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -5862,6 +5862,7 @@ enum tcpc_cc_polarity {
#define PD_STATUS_EVENT_MUX_1_SET_DONE BIT(5)
#define PD_STATUS_EVENT_VDM_REQ_REPLY BIT(6)
#define PD_STATUS_EVENT_VDM_REQ_FAILED BIT(7)
+#define PD_STATUS_EVENT_VDM_ATTENTION BIT(8)
struct ec_params_typec_status {
uint8_t port;
@@ -5906,7 +5907,8 @@ struct ec_response_typec_status {
} __ec_align1;
/*
- * Gather the response to the most recent VDM REQ from the AP
+ * Gather the response to the most recent VDM REQ from the AP, as well
+ * as popping the oldest VDM:Attention from the DPM queue
*/
#define EC_CMD_TYPEC_VDM_RESPONSE 0x013C
@@ -5919,10 +5921,18 @@ struct ec_response_typec_vdm_response {
uint8_t vdm_data_objects;
/* Partner to address - see enum typec_partner_type */
uint8_t partner_type;
- /* Reserved */
- uint16_t reserved;
+ /* enum ec_status describing VDM response */
+ uint16_t vdm_response_err;
/* VDM data, including VDM header */
uint32_t vdm_response[VDO_MAX_SIZE];
+ /* Number of 32-bit Attention fields filled in */
+ uint8_t vdm_attention_objects;
+ /* Number of remaining messages to consume */
+ uint8_t vdm_attention_left;
+ /* Reserved */
+ uint16_t reserved1;
+ /* VDM:Attention contents */
+ uint32_t vdm_attention[2];
} __ec_align1;
#undef VDO_MAX_SIZE
--
2.39.1.456.gfc5497dd1b-goog
Add support to retrieve VDM attention messages and forward them to the
appropriate alt mode driver.
Signed-off-by: Prashant Malani <[email protected]>
---
drivers/platform/chrome/cros_ec_typec.c | 8 +++++
drivers/platform/chrome/cros_typec_vdm.c | 40 ++++++++++++++++++++++++
drivers/platform/chrome/cros_typec_vdm.h | 1 +
3 files changed, 49 insertions(+)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 1abb471840d5..71f5d7d8e055 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -1015,6 +1015,14 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
if (ret < 0)
dev_warn(typec->dev, "Failed VDM Reply event clear, port: %d\n", port_num);
}
+
+ if (resp.events & PD_STATUS_EVENT_VDM_ATTENTION) {
+ cros_typec_handle_vdm_attention(typec, port_num);
+ ret = cros_typec_send_clear_event(typec, port_num, PD_STATUS_EVENT_VDM_ATTENTION);
+ if (ret < 0)
+ dev_warn(typec->dev, "Failed VDM Attenetion event clear, port: %d\n",
+ port_num);
+ }
}
static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
diff --git a/drivers/platform/chrome/cros_typec_vdm.c b/drivers/platform/chrome/cros_typec_vdm.c
index 06f4a55999c5..20515ee0a20e 100644
--- a/drivers/platform/chrome/cros_typec_vdm.c
+++ b/drivers/platform/chrome/cros_typec_vdm.c
@@ -13,6 +13,46 @@
#include "cros_ec_typec.h"
#include "cros_typec_vdm.h"
+/*
+ * Retrieves pending VDM attention messages from the EC and forwards them to the altmode driver
+ * based on SVID.
+ */
+void cros_typec_handle_vdm_attention(struct cros_typec_data *typec, int port_num)
+{
+ struct ec_response_typec_vdm_response resp;
+ struct ec_params_typec_vdm_response req = {
+ .port = port_num,
+ };
+ struct typec_altmode *amode;
+ u16 svid;
+ u32 hdr;
+ int ret;
+
+ do {
+ ret = cros_ec_cmd(typec->ec, 0, EC_CMD_TYPEC_VDM_RESPONSE, &req,
+ sizeof(req), &resp, sizeof(resp));
+ if (ret < 0) {
+ dev_warn(typec->dev, "Failed VDM response fetch, port: %d\n", port_num);
+ return;
+ }
+
+ hdr = resp.vdm_response[0];
+ svid = PD_VDO_VID(hdr);
+ dev_dbg(typec->dev, "Received VDM Attention header: %x, port: %d\n", hdr, port_num);
+
+ amode = typec_match_altmode(typec->ports[port_num]->port_altmode,
+ CROS_EC_ALTMODE_MAX, svid, PD_VDO_OPOS(hdr));
+ if (!amode) {
+ dev_err(typec->dev,
+ "Received VDM for unregistered altmode (SVID:%x), port: %d\n",
+ svid, port_num);
+ return;
+ }
+
+ typec_altmode_attention(amode, resp.vdm_attention[1]);
+ } while (resp.vdm_attention_left);
+}
+
/*
* Retrieves a VDM response from the EC and forwards it to the altmode driver based on SVID.
*/
diff --git a/drivers/platform/chrome/cros_typec_vdm.h b/drivers/platform/chrome/cros_typec_vdm.h
index 003587525554..95a6a75d32b6 100644
--- a/drivers/platform/chrome/cros_typec_vdm.h
+++ b/drivers/platform/chrome/cros_typec_vdm.h
@@ -7,6 +7,7 @@
extern struct typec_altmode_ops port_amode_ops;
+void cros_typec_handle_vdm_attention(struct cros_typec_data *typec, int port_num);
void cros_typec_handle_vdm_response(struct cros_typec_data *typec, int port_num);
#endif /* __CROS_TYPEC_VDM__ */
--
2.39.1.456.gfc5497dd1b-goog
Hi Prashant,
On Thu, Jan 26, 2023 at 08:55:45PM +0000, Prashant Malani wrote:
> Incorporate updates to the EC headers to support the retrieval of VDM
> Attention messages from port partners. These headers are already present
> in the ChromeOS EC codebase. [1]
>
> [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
>
> Signed-off-by: Prashant Malani <[email protected]>
Reviewed-by: Benson Leung <[email protected]>
> ---
> include/linux/platform_data/cros_ec_commands.h | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
> index b9c4a3964247..ec327638c6eb 100644
> --- a/include/linux/platform_data/cros_ec_commands.h
> +++ b/include/linux/platform_data/cros_ec_commands.h
> @@ -5862,6 +5862,7 @@ enum tcpc_cc_polarity {
> #define PD_STATUS_EVENT_MUX_1_SET_DONE BIT(5)
> #define PD_STATUS_EVENT_VDM_REQ_REPLY BIT(6)
> #define PD_STATUS_EVENT_VDM_REQ_FAILED BIT(7)
> +#define PD_STATUS_EVENT_VDM_ATTENTION BIT(8)
>
> struct ec_params_typec_status {
> uint8_t port;
> @@ -5906,7 +5907,8 @@ struct ec_response_typec_status {
> } __ec_align1;
>
> /*
> - * Gather the response to the most recent VDM REQ from the AP
> + * Gather the response to the most recent VDM REQ from the AP, as well
> + * as popping the oldest VDM:Attention from the DPM queue
> */
> #define EC_CMD_TYPEC_VDM_RESPONSE 0x013C
>
> @@ -5919,10 +5921,18 @@ struct ec_response_typec_vdm_response {
> uint8_t vdm_data_objects;
> /* Partner to address - see enum typec_partner_type */
> uint8_t partner_type;
> - /* Reserved */
> - uint16_t reserved;
> + /* enum ec_status describing VDM response */
> + uint16_t vdm_response_err;
> /* VDM data, including VDM header */
> uint32_t vdm_response[VDO_MAX_SIZE];
> + /* Number of 32-bit Attention fields filled in */
> + uint8_t vdm_attention_objects;
> + /* Number of remaining messages to consume */
> + uint8_t vdm_attention_left;
> + /* Reserved */
> + uint16_t reserved1;
> + /* VDM:Attention contents */
> + uint32_t vdm_attention[2];
> } __ec_align1;
>
> #undef VDO_MAX_SIZE
> --
> 2.39.1.456.gfc5497dd1b-goog
>
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
On Thu, Jan 26, 2023 at 08:55:46PM +0000, Prashant Malani wrote:
> Add support to retrieve VDM attention messages and forward them to the
> appropriate alt mode driver.
>
> Signed-off-by: Prashant Malani <[email protected]>
Reviewed-by: Benson Leung <[email protected]>
> ---
> drivers/platform/chrome/cros_ec_typec.c | 8 +++++
> drivers/platform/chrome/cros_typec_vdm.c | 40 ++++++++++++++++++++++++
> drivers/platform/chrome/cros_typec_vdm.h | 1 +
> 3 files changed, 49 insertions(+)
>
> diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
> index 1abb471840d5..71f5d7d8e055 100644
> --- a/drivers/platform/chrome/cros_ec_typec.c
> +++ b/drivers/platform/chrome/cros_ec_typec.c
> @@ -1015,6 +1015,14 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
> if (ret < 0)
> dev_warn(typec->dev, "Failed VDM Reply event clear, port: %d\n", port_num);
> }
> +
> + if (resp.events & PD_STATUS_EVENT_VDM_ATTENTION) {
> + cros_typec_handle_vdm_attention(typec, port_num);
> + ret = cros_typec_send_clear_event(typec, port_num, PD_STATUS_EVENT_VDM_ATTENTION);
> + if (ret < 0)
> + dev_warn(typec->dev, "Failed VDM Attenetion event clear, port: %d\n",
> + port_num);
> + }
> }
>
> static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
> diff --git a/drivers/platform/chrome/cros_typec_vdm.c b/drivers/platform/chrome/cros_typec_vdm.c
> index 06f4a55999c5..20515ee0a20e 100644
> --- a/drivers/platform/chrome/cros_typec_vdm.c
> +++ b/drivers/platform/chrome/cros_typec_vdm.c
> @@ -13,6 +13,46 @@
> #include "cros_ec_typec.h"
> #include "cros_typec_vdm.h"
>
> +/*
> + * Retrieves pending VDM attention messages from the EC and forwards them to the altmode driver
> + * based on SVID.
> + */
> +void cros_typec_handle_vdm_attention(struct cros_typec_data *typec, int port_num)
> +{
> + struct ec_response_typec_vdm_response resp;
> + struct ec_params_typec_vdm_response req = {
> + .port = port_num,
> + };
> + struct typec_altmode *amode;
> + u16 svid;
> + u32 hdr;
> + int ret;
> +
> + do {
> + ret = cros_ec_cmd(typec->ec, 0, EC_CMD_TYPEC_VDM_RESPONSE, &req,
> + sizeof(req), &resp, sizeof(resp));
> + if (ret < 0) {
> + dev_warn(typec->dev, "Failed VDM response fetch, port: %d\n", port_num);
> + return;
> + }
> +
> + hdr = resp.vdm_response[0];
> + svid = PD_VDO_VID(hdr);
> + dev_dbg(typec->dev, "Received VDM Attention header: %x, port: %d\n", hdr, port_num);
> +
> + amode = typec_match_altmode(typec->ports[port_num]->port_altmode,
> + CROS_EC_ALTMODE_MAX, svid, PD_VDO_OPOS(hdr));
> + if (!amode) {
> + dev_err(typec->dev,
> + "Received VDM for unregistered altmode (SVID:%x), port: %d\n",
> + svid, port_num);
> + return;
> + }
> +
> + typec_altmode_attention(amode, resp.vdm_attention[1]);
> + } while (resp.vdm_attention_left);
> +}
> +
> /*
> * Retrieves a VDM response from the EC and forwards it to the altmode driver based on SVID.
> */
> diff --git a/drivers/platform/chrome/cros_typec_vdm.h b/drivers/platform/chrome/cros_typec_vdm.h
> index 003587525554..95a6a75d32b6 100644
> --- a/drivers/platform/chrome/cros_typec_vdm.h
> +++ b/drivers/platform/chrome/cros_typec_vdm.h
> @@ -7,6 +7,7 @@
>
> extern struct typec_altmode_ops port_amode_ops;
>
> +void cros_typec_handle_vdm_attention(struct cros_typec_data *typec, int port_num);
> void cros_typec_handle_vdm_response(struct cros_typec_data *typec, int port_num);
>
> #endif /* __CROS_TYPEC_VDM__ */
> --
> 2.39.1.456.gfc5497dd1b-goog
>
>
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
On Thu, Jan 26, 2023 at 08:55:46PM +0000, Prashant Malani wrote:
> Add support to retrieve VDM attention messages and forward them to the
> appropriate alt mode driver.
>
> Signed-off-by: Prashant Malani <[email protected]>
Reviewed-by: Heikki Krogerus <[email protected]>
> ---
> drivers/platform/chrome/cros_ec_typec.c | 8 +++++
> drivers/platform/chrome/cros_typec_vdm.c | 40 ++++++++++++++++++++++++
> drivers/platform/chrome/cros_typec_vdm.h | 1 +
> 3 files changed, 49 insertions(+)
>
> diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
> index 1abb471840d5..71f5d7d8e055 100644
> --- a/drivers/platform/chrome/cros_ec_typec.c
> +++ b/drivers/platform/chrome/cros_ec_typec.c
> @@ -1015,6 +1015,14 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
> if (ret < 0)
> dev_warn(typec->dev, "Failed VDM Reply event clear, port: %d\n", port_num);
> }
> +
> + if (resp.events & PD_STATUS_EVENT_VDM_ATTENTION) {
> + cros_typec_handle_vdm_attention(typec, port_num);
> + ret = cros_typec_send_clear_event(typec, port_num, PD_STATUS_EVENT_VDM_ATTENTION);
> + if (ret < 0)
> + dev_warn(typec->dev, "Failed VDM Attenetion event clear, port: %d\n",
> + port_num);
> + }
> }
>
> static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
> diff --git a/drivers/platform/chrome/cros_typec_vdm.c b/drivers/platform/chrome/cros_typec_vdm.c
> index 06f4a55999c5..20515ee0a20e 100644
> --- a/drivers/platform/chrome/cros_typec_vdm.c
> +++ b/drivers/platform/chrome/cros_typec_vdm.c
> @@ -13,6 +13,46 @@
> #include "cros_ec_typec.h"
> #include "cros_typec_vdm.h"
>
> +/*
> + * Retrieves pending VDM attention messages from the EC and forwards them to the altmode driver
> + * based on SVID.
> + */
> +void cros_typec_handle_vdm_attention(struct cros_typec_data *typec, int port_num)
> +{
> + struct ec_response_typec_vdm_response resp;
> + struct ec_params_typec_vdm_response req = {
> + .port = port_num,
> + };
> + struct typec_altmode *amode;
> + u16 svid;
> + u32 hdr;
> + int ret;
> +
> + do {
> + ret = cros_ec_cmd(typec->ec, 0, EC_CMD_TYPEC_VDM_RESPONSE, &req,
> + sizeof(req), &resp, sizeof(resp));
> + if (ret < 0) {
> + dev_warn(typec->dev, "Failed VDM response fetch, port: %d\n", port_num);
> + return;
> + }
> +
> + hdr = resp.vdm_response[0];
> + svid = PD_VDO_VID(hdr);
> + dev_dbg(typec->dev, "Received VDM Attention header: %x, port: %d\n", hdr, port_num);
> +
> + amode = typec_match_altmode(typec->ports[port_num]->port_altmode,
> + CROS_EC_ALTMODE_MAX, svid, PD_VDO_OPOS(hdr));
> + if (!amode) {
> + dev_err(typec->dev,
> + "Received VDM for unregistered altmode (SVID:%x), port: %d\n",
> + svid, port_num);
> + return;
> + }
> +
> + typec_altmode_attention(amode, resp.vdm_attention[1]);
> + } while (resp.vdm_attention_left);
> +}
> +
> /*
> * Retrieves a VDM response from the EC and forwards it to the altmode driver based on SVID.
> */
> diff --git a/drivers/platform/chrome/cros_typec_vdm.h b/drivers/platform/chrome/cros_typec_vdm.h
> index 003587525554..95a6a75d32b6 100644
> --- a/drivers/platform/chrome/cros_typec_vdm.h
> +++ b/drivers/platform/chrome/cros_typec_vdm.h
> @@ -7,6 +7,7 @@
>
> extern struct typec_altmode_ops port_amode_ops;
>
> +void cros_typec_handle_vdm_attention(struct cros_typec_data *typec, int port_num);
> void cros_typec_handle_vdm_response(struct cros_typec_data *typec, int port_num);
>
> #endif /* __CROS_TYPEC_VDM__ */
> --
> 2.39.1.456.gfc5497dd1b-goog
--
heikki
On Thu, Jan 26, 2023 at 08:55:45PM +0000, Prashant Malani wrote:
> Incorporate updates to the EC headers to support the retrieval of VDM
> Attention messages from port partners. These headers are already present
> in the ChromeOS EC codebase. [1]
>
> [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
>
> Signed-off-by: Prashant Malani <[email protected]>
With a nit:
Reviewed-by: Tzung-Bi Shih <[email protected]>
> diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
> index b9c4a3964247..ec327638c6eb 100644
> --- a/include/linux/platform_data/cros_ec_commands.h
> +++ b/include/linux/platform_data/cros_ec_commands.h
> @@ -5862,6 +5862,7 @@ enum tcpc_cc_polarity {
> #define PD_STATUS_EVENT_MUX_1_SET_DONE BIT(5)
> #define PD_STATUS_EVENT_VDM_REQ_REPLY BIT(6)
> #define PD_STATUS_EVENT_VDM_REQ_FAILED BIT(7)
> +#define PD_STATUS_EVENT_VDM_ATTENTION BIT(8)
This has an extra tab if comparing with others around.
Hello:
This series was applied to chrome-platform/linux.git (for-kernelci)
by Prashant Malani <[email protected]>:
On Thu, 26 Jan 2023 20:55:45 +0000 you wrote:
> Incorporate updates to the EC headers to support the retrieval of VDM
> Attention messages from port partners. These headers are already present
> in the ChromeOS EC codebase. [1]
>
> [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
>
> Signed-off-by: Prashant Malani <[email protected]>
>
> [...]
Here is the summary with links:
- [1/2] platform/chrome: cros_ec: Add VDM attention headers
https://git.kernel.org/chrome-platform/c/4b1936cd0814
- [2/2] platform/chrome: cros_typec_vdm: Add Attention support
https://git.kernel.org/chrome-platform/c/f54c013e7eef
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Thanks for reviewing the patch, Tzung-Bi.
On Mon, Jan 30, 2023 at 7:19 PM Tzung-Bi Shih <[email protected]> wrote:
>
> On Thu, Jan 26, 2023 at 08:55:45PM +0000, Prashant Malani wrote:
> > Incorporate updates to the EC headers to support the retrieval of VDM
> > Attention messages from port partners. These headers are already present
> > in the ChromeOS EC codebase. [1]
> >
> > [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
> >
> > Signed-off-by: Prashant Malani <[email protected]>
>
> With a nit:
> Reviewed-by: Tzung-Bi Shih <[email protected]>
>
> > diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
> > index b9c4a3964247..ec327638c6eb 100644
> > --- a/include/linux/platform_data/cros_ec_commands.h
> > +++ b/include/linux/platform_data/cros_ec_commands.h
> > @@ -5862,6 +5862,7 @@ enum tcpc_cc_polarity {
> > #define PD_STATUS_EVENT_MUX_1_SET_DONE BIT(5)
> > #define PD_STATUS_EVENT_VDM_REQ_REPLY BIT(6)
> > #define PD_STATUS_EVENT_VDM_REQ_FAILED BIT(7)
> > +#define PD_STATUS_EVENT_VDM_ATTENTION BIT(8)
>
> This has an extra tab if comparing with others around.
Fixed the tab and applied to chrome-platform/for-kernelci.
Hello:
This series was applied to chrome-platform/linux.git (for-next)
by Prashant Malani <[email protected]>:
On Thu, 26 Jan 2023 20:55:45 +0000 you wrote:
> Incorporate updates to the EC headers to support the retrieval of VDM
> Attention messages from port partners. These headers are already present
> in the ChromeOS EC codebase. [1]
>
> [1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h
>
> Signed-off-by: Prashant Malani <[email protected]>
>
> [...]
Here is the summary with links:
- [1/2] platform/chrome: cros_ec: Add VDM attention headers
https://git.kernel.org/chrome-platform/c/4b1936cd0814
- [2/2] platform/chrome: cros_typec_vdm: Add Attention support
https://git.kernel.org/chrome-platform/c/f54c013e7eef
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html