From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933736AbcKWIfj (ORCPT ); Wed, 23 Nov 2016 03:35:39 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35349 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933283AbcKWIet (ORCPT ); Wed, 23 Nov 2016 03:34:49 -0500 Date: Wed, 23 Nov 2016 08:37:49 +0000 From: Lee Jones To: Brian Norris Cc: Olof Johansson , Benson Leung , linux-kernel@vger.kernel.org, Doug Anderson , Brian Norris , Javier Martinez Canillas , Shawn Nematbakhsh , Gwendal Grignou , Enric Balletbo , Tomeu Vizoso Subject: Re: [PATCH] mfd: cros_ec: Use proper protocol transfer function Message-ID: <20161123083749.GN10134@dell.home> References: <1470861912-130475-1-git-send-email-briannorris@chromium.org> <20161122221932.GA60416@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161122221932.GA60416@google.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Nov 2016, Brian Norris wrote: > + Benson > > On Wed, Aug 10, 2016 at 01:45:12PM -0700, Brian Norris wrote: > > From: Shawn Nematbakhsh > > > > pkt_xfer should be used for protocol v3, and cmd_xfer otherwise. We had > > one instance of these functions correct, but not the second, fall-back > > case. We use the fall-back only when the first command returns an > > IN_PROGRESS status, which is only used on some EC firmwares where we > > don't want to constantly poll the bus, but instead back off and > > sleep/retry for a little while. > > > > Fixes: 2c7589af3c4d ("mfd: cros_ec: add proto v3 skeleton") You need to Cc stable with a note saying which kernel version it fixes. Grep the `git log`s for stable.*#. > > Signed-off-by: Shawn Nematbakhsh > > Signed-off-by: Brian Norris > > --- > > MAINTAINERS tells me this goes through Olof, but many things have gone through > > Lee. > > I believe this was supposed to go through Olof. Olof, are you out there? Yes, I concur. There maybe some confusion since the $SUBJECT line is misleading/incorrect. > Or Benson? I see this: > > http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1273587.html > [PATCH] platform/chrome : Add myself as Maintainer > > but it's not merged anywhere AFAICT. > > I can resend if that helps. > > Brian > > > drivers/platform/chrome/cros_ec_proto.c | 8 +++++--- > > 1 file changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c > > index 6c084b266651..591f0b0becbd 100644 > > --- a/drivers/platform/chrome/cros_ec_proto.c > > +++ b/drivers/platform/chrome/cros_ec_proto.c > > @@ -59,12 +59,14 @@ static int send_command(struct cros_ec_device *ec_dev, > > struct cros_ec_command *msg) > > { > > int ret; > > + int (*xfer_fxn)(struct cros_ec_device *ec, struct cros_ec_command *msg); > > > > if (ec_dev->proto_version > 2) > > - ret = ec_dev->pkt_xfer(ec_dev, msg); > > + xfer_fxn = ec_dev->pkt_xfer; > > else > > - ret = ec_dev->cmd_xfer(ec_dev, msg); > > + xfer_fxn = ec_dev->cmd_xfer; > > > > + ret = (*xfer_fxn)(ec_dev, msg); > > if (msg->result == EC_RES_IN_PROGRESS) { > > int i; > > struct cros_ec_command *status_msg; > > @@ -87,7 +89,7 @@ static int send_command(struct cros_ec_device *ec_dev, > > for (i = 0; i < EC_COMMAND_RETRIES; i++) { > > usleep_range(10000, 11000); > > > > - ret = ec_dev->cmd_xfer(ec_dev, status_msg); > > + ret = (*xfer_fxn)(ec_dev, status_msg); > > if (ret < 0) > > break; > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog