Re: [PATCH 05/11] platform/chrome: cros_ec_proto: separate cros_ec_wait_until_complete()

[Tzung-Bi Shih]

On Wed, Jun 15, 2022 at 01:50:26PM -0700, Guenter Roeck wrote:
> On Tue, Jun 14, 2022 at 10:13 PM Tzung-Bi Shih <tzungbi@xxxxxxxxxx> wrote:
> > -static int cros_ec_send_command(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
> > +static int cros_ec_wait_until_complete(struct cros_ec_device *ec_dev, uint32_t *result)
> >  {
> > -       int ret = cros_ec_xfer_command(ec_dev, msg);
> > +       struct cros_ec_command *msg;
> > +       struct ec_response_get_comms_status *status;
> > +       int ret = 0, i;
> > +
> > +       msg = kzalloc(sizeof(*msg) + sizeof(*status), GFP_KERNEL);
> > +       if (!msg)
> > +               return -ENOMEM;
> >
> > -       if (msg->result == EC_RES_IN_PROGRESS) {
> > -               int i;
> > -               struct cros_ec_command *status_msg;
> > -               struct ec_response_get_comms_status *status;
> > +       msg->command = EC_CMD_GET_COMMS_STATUS;
> > +       msg->insize = sizeof(*status);
> >
> > -               status_msg = kmalloc(sizeof(*status_msg) + sizeof(*status),
> > -                                    GFP_KERNEL);
> > -               if (!status_msg)
> > -                       return -ENOMEM;
> > +       status = (struct ec_response_get_comms_status *)msg->data;
> >
> > -               status_msg->version = 0;
> > -               status_msg->command = EC_CMD_GET_COMMS_STATUS;
> > -               status_msg->insize = sizeof(*status);
> > -               status_msg->outsize = 0;
> > +       /* Query the EC's status until it's no longer busy or we encounter an error. */
> > +       for (i = 0; i < EC_COMMAND_RETRIES; ++i) {
> > +               usleep_range(10000, 11000);
> >
> > -               /*
> > -                * Query the EC's status until it's no longer busy or
> > -                * we encounter an error.
> > -                */
> > -               for (i = 0; i < EC_COMMAND_RETRIES; i++) {
> > -                       usleep_range(10000, 11000);
> > -
> > -                       trace_cros_ec_request_start(status_msg);
> > -                       ret = (*xfer_fxn)(ec_dev, status_msg);
> > -                       trace_cros_ec_request_done(status_msg, ret);
> 
> I'll have to spend more time on this; I don't immediately see (from
> the diff) the replacement for the traces, and I don't see what
> happened with xfer_fxn.

They are replaced by calling cros_ec_xfer_command() (see below) which does the
same things.

> > -                       if (ret == -EAGAIN)
> > -                               continue;
> > -                       if (ret < 0)
> > -                               break;
> > -
> > -                       msg->result = status_msg->result;
> > -                       if (status_msg->result != EC_RES_SUCCESS)
> > -                               break;
> > -
> > -                       status = (struct ec_response_get_comms_status *)
> > -                                status_msg->data;
> > -                       if (!(status->flags & EC_COMMS_STATUS_PROCESSING))
> > -                               break;
> > -               }
> > +               ret = cros_ec_xfer_command(ec_dev, msg);
> > +               if (ret == -EAGAIN)
> > +                       continue;
> > +               if (ret < 0)
> > +                       break;