Re: [PATCH 3/3] platform/chrome: notify: Pull PD_HOST_EVENT status

[Enric Balletbo i Serra]

Hi Prashant,

On 12/3/20 11:08, Prashant Malani wrote:
> Read the PD host even status from the EC and send that to the notifier
> listeners, for more fine-grained event information.
> 
> Signed-off-by: Prashant Malani <pmalani@xxxxxxxxxxxx>
> ---
>  drivers/platform/chrome/cros_usbpd_notify.c | 87 ++++++++++++++++++++-
>  1 file changed, 84 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/platform/chrome/cros_usbpd_notify.c b/drivers/platform/chrome/cros_usbpd_notify.c
> index d2dbf7017e29c..3d9db4146217e 100644
> --- a/drivers/platform/chrome/cros_usbpd_notify.c
> +++ b/drivers/platform/chrome/cros_usbpd_notify.c
> @@ -53,11 +53,91 @@ void cros_usbpd_unregister_notify(struct notifier_block *nb)
>  }
>  EXPORT_SYMBOL_GPL(cros_usbpd_unregister_notify);
>  
> +/**
> + * cros_ec_pd_command - Send a command to the EC.
> + *
> + * @ec_dev: EC device
> + * @command: EC command
> + * @outdata: EC command output data
> + * @outsize: Size of outdata
> + * @indata: EC command input data
> + * @insize: Size of indata
> + *
> + * Return: 0 on success, < 0 on failure.
> + */
> +static int cros_ec_pd_command(struct cros_ec_device *ec_dev,
> +			      int command,
> +			      uint8_t *outdata,
> +			      int outsize,
> +			      uint8_t *indata,
> +			      int insize)
> +{
> +	int ret;
> +	struct cros_ec_command *msg;

Reverse x-mas tree, please.

struct cros_ec_command *msg;
int ret;

> +
> +	msg = kzalloc(sizeof(*msg) + max(insize, outsize), GFP_KERNEL);
> +	if (!msg)
> +		return -EC_RES_ERROR;

Use standard linux error codes please, in that case -ENOMEM.

> +
> +	msg->command = command;
> +	msg->outsize = outsize;
> +	msg->insize = insize;
> +
> +	if (outsize)
> +		memcpy(msg->data, outdata, outsize);
> +
> +	ret = cros_ec_cmd_xfer_status(ec_dev, msg);
> +	if (ret < 0)
> +		goto error;
> +
> +	if (insize)
> +		memcpy(indata, msg->data, insize);
> +	ret = EC_RES_SUCCESS;

Standard linux error codes, just return what cros_ec_cmd_xfer_status returns.

> +error:
> +	kfree(msg);
> +	return ret;
> +}
> +
> +static void cros_usbpd_get_event_and_notify(struct device  *dev,
> +					    struct cros_ec_device *ec_dev)
> +{
> +	struct ec_response_host_event_status host_event_status;
> +	u32 event = 0;
> +	int ret;
> +
> +	/*
> +	 * We still send a 0 event out to older devices which don't
> +	 * have the updated device heirarchy.
> +	 */
> +	if (!ec_dev) {

Ok, remembering my comment in previous patch it makes sense to check for ec_dev,
but see below ...

> +		dev_dbg(dev,
> +			"EC device inaccessible; sending 0 event status.\n");
> +		goto send_notify;
> +	}
> +
> +	/* Check for PD host events on EC. */
> +	ret = cros_ec_pd_command(ec_dev, EC_CMD_PD_HOST_EVENT_STATUS,
> +				 NULL, 0,
> +				 (uint8_t *)&host_event_status,
> +				 sizeof(host_event_status));
> +	if (ret < 0) {
> +		dev_warn(dev, "Can't get host event status (err: %d)\n", ret);

This print is unneeded, a error will be printed already if it fails.

> +		goto send_notify;
> +	}
> +
> +	event = host_event_status.status;
> +
> +send_notify:
> +	blocking_notifier_call_chain(&cros_usbpd_notifier_list, event, NULL);
> +}
> +
>  #ifdef CONFIG_ACPI
>  
>  static void cros_usbpd_notify_acpi(acpi_handle device, u32 event, void *data)
>  {
> -	blocking_notifier_call_chain(&cros_usbpd_notifier_list, event, NULL);
> +	struct cros_usbpd_notify_data *pdnotify = data;
> +
> +	cros_usbpd_get_event_and_notify(pdnotify->dev, pdnotify->ec);
>  }
>  
>  static int cros_usbpd_notify_probe_acpi(struct platform_device *pdev)
> @@ -144,6 +224,8 @@ static int cros_usbpd_notify_plat(struct notifier_block *nb,
>  				  unsigned long queued_during_suspend,
>  				  void *data)
>  {
> +	struct cros_usbpd_notify_data *pdnotify = container_of(nb,
> +			struct cros_usbpd_notify_data, nb);
>  	struct cros_ec_device *ec_dev = (struct cros_ec_device *)data;
>  	u32 host_event = cros_ec_get_host_event(ec_dev);
>  

Not related to this patch but as you introduced the possibility to have ec_dev
NULL, crash here.


> @@ -151,8 +233,7 @@ static int cros_usbpd_notify_plat(struct notifier_block *nb,
>  		return NOTIFY_BAD;
>  
>  	if (host_event & EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)) {
> -		blocking_notifier_call_chain(&cros_usbpd_notifier_list,
> -					     host_event, NULL);
> +		cros_usbpd_get_event_and_notify(pdnotify->dev, ec_dev);
>  		return NOTIFY_OK;
>  	}
>  	return NOTIFY_DONE;
>