Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
MIME-Version: 1.0
References: <20220606141051.285823-1-tzungbi@kernel.org> <20220606141051.285823-4-tzungbi@kernel.org>
 <CABXOdTdSqA0x5kLLjekQwvT+9EvNmOuA0MAdjuFp8z0T3F37Pg@mail.gmail.com>
In-Reply-To: <CABXOdTdSqA0x5kLLjekQwvT+9EvNmOuA0MAdjuFp8z0T3F37Pg@mail.gmail.com>
From:   Guenter Roeck <groeck@google.com>
Date:   Mon, 6 Jun 2022 08:23:06 -0700
Message-ID: <CABXOdTd_VW-Nn6NWhZz6k5wESzPdVz9+ie3xSzEFHcWiL0jN7Q@mail.gmail.com>
Subject: Re: [PATCH 03/13] platform/chrome: use macros for passthru indexes
To:     Tzung-Bi Shih <tzungbi@kernel.org>
Cc:     Benson Leung <bleung@chromium.org>,
        Guenter Roeck <groeck@chromium.org>,
        chrome-platform@lists.linux.dev,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Jun 6, 2022 at 8:22 AM Guenter Roeck <groeck@google.com> wrote:
>
> On Mon, Jun 6, 2022 at 7:12 AM Tzung-Bi Shih <tzungbi@kernel.org> wrote:
> >
> > Move passthru indexes for EC and PD devices to common header.  Also use
> > them instead of literal constants.
> >
> > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
Too much auto-typing. Trying again:

Reviewed-by: Guenter Roeck <groeck@chromium.org>

> > ---
> >  drivers/platform/chrome/cros_ec.c            |  3 ---
> >  drivers/platform/chrome/cros_ec_proto.c      |  6 +++---
> >  drivers/platform/chrome/cros_ec_proto_test.c | 18 ++++++++++++------
> >  drivers/platform/chrome/cros_ec_trace.h      |  8 ++++----
> >  include/linux/platform_data/cros_ec_proto.h  |  3 +++
> >  5 files changed, 22 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c
> > index b3e94cdf7d1a..e51a3f2176c7 100644
> > --- a/drivers/platform/chrome/cros_ec.c
> > +++ b/drivers/platform/chrome/cros_ec.c
> > @@ -19,9 +19,6 @@
> >
> >  #include "cros_ec.h"
> >
> > -#define CROS_EC_DEV_EC_INDEX 0
> > -#define CROS_EC_DEV_PD_INDEX 1
> > -
> >  static struct cros_ec_platform ec_p = {
> >         .ec_name = CROS_EC_DEV_NAME,
> >         .cmd_offset = EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_EC_INDEX),
> > diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
> > index 13ced9d2dd71..65191af5139c 100644
> > --- a/drivers/platform/chrome/cros_ec_proto.c
> > +++ b/drivers/platform/chrome/cros_ec_proto.c
> > @@ -433,7 +433,7 @@ int cros_ec_query_all(struct cros_ec_device *ec_dev)
> >
> >         /* First try sending with proto v3. */
> >         ec_dev->proto_version = 3;
> > -       ret = cros_ec_host_command_proto_query(ec_dev, 0, proto_msg);
> > +       ret = cros_ec_host_command_proto_query(ec_dev, CROS_EC_DEV_EC_INDEX, proto_msg);
> >
> >         if (ret == 0) {
> >                 proto_info = (struct ec_response_get_protocol_info *)
> > @@ -459,7 +459,7 @@ int cros_ec_query_all(struct cros_ec_device *ec_dev)
> >                 /*
> >                  * Check for PD
> >                  */
> > -               ret = cros_ec_host_command_proto_query(ec_dev, 1, proto_msg);
> > +               ret = cros_ec_host_command_proto_query(ec_dev, CROS_EC_DEV_PD_INDEX, proto_msg);
> >
> >                 if (ret) {
> >                         dev_dbg(ec_dev->dev, "no PD chip found: %d\n", ret);
> > @@ -609,7 +609,7 @@ int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
> >                 msg->insize = ec_dev->max_response;
> >         }
> >
> > -       if (msg->command < EC_CMD_PASSTHRU_OFFSET(1)) {
> > +       if (msg->command < EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX)) {
> >                 if (msg->outsize > ec_dev->max_request) {
> >                         dev_err(ec_dev->dev,
> >                                 "request of size %u is too big (max: %u)\n",
> > diff --git a/drivers/platform/chrome/cros_ec_proto_test.c b/drivers/platform/chrome/cros_ec_proto_test.c
> > index c5e16566a634..5169bf33360b 100644
> > --- a/drivers/platform/chrome/cros_ec_proto_test.c
> > +++ b/drivers/platform/chrome/cros_ec_proto_test.c
> > @@ -280,7 +280,8 @@ static void cros_ec_proto_test_query_all_normal(struct kunit *test)
> >
> >                 KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.command,
> > -                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
> > +                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
> > +                               EC_CMD_GET_PROTOCOL_INFO);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.insize,
> >                                 sizeof(struct ec_response_get_protocol_info));
> >                 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
> > @@ -393,7 +394,8 @@ static void cros_ec_proto_test_query_all_no_pd(struct kunit *test)
> >
> >                 KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.command,
> > -                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
> > +                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
> > +                               EC_CMD_GET_PROTOCOL_INFO);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.insize,
> >                                 sizeof(struct ec_response_get_protocol_info));
> >                 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
> > @@ -535,7 +537,8 @@ static void cros_ec_proto_test_query_all_no_mkbp(struct kunit *test)
> >
> >                 KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.command,
> > -                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
> > +                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
> > +                               EC_CMD_GET_PROTOCOL_INFO);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.insize,
> >                                 sizeof(struct ec_response_get_protocol_info));
> >                 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
> > @@ -623,7 +626,8 @@ static void cros_ec_proto_test_query_all_no_mkbp2(struct kunit *test)
> >
> >                 KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.command,
> > -                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
> > +                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
> > +                               EC_CMD_GET_PROTOCOL_INFO);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.insize,
> >                                 sizeof(struct ec_response_get_protocol_info));
> >                 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
> > @@ -723,7 +727,8 @@ static void cros_ec_proto_test_query_all_no_host_sleep(struct kunit *test)
> >
> >                 KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.command,
> > -                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
> > +                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
> > +                               EC_CMD_GET_PROTOCOL_INFO);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.insize,
> >                                 sizeof(struct ec_response_get_protocol_info));
> >                 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
> > @@ -833,7 +838,8 @@ static void cros_ec_proto_test_query_all_default_wake_mask(struct kunit *test)
> >
> >                 KUNIT_EXPECT_EQ(test, mock->msg.version, 0);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.command,
> > -                               EC_CMD_PASSTHRU_OFFSET(1) | EC_CMD_GET_PROTOCOL_INFO);
> > +                               EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX) |
> > +                               EC_CMD_GET_PROTOCOL_INFO);
> >                 KUNIT_EXPECT_EQ(test, mock->msg.insize,
> >                                 sizeof(struct ec_response_get_protocol_info));
> >                 KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0);
> > diff --git a/drivers/platform/chrome/cros_ec_trace.h b/drivers/platform/chrome/cros_ec_trace.h
> > index 9bb5cd2c98b8..d7e407de88df 100644
> > --- a/drivers/platform/chrome/cros_ec_trace.h
> > +++ b/drivers/platform/chrome/cros_ec_trace.h
> > @@ -30,8 +30,8 @@ TRACE_EVENT(cros_ec_request_start,
> >         ),
> >         TP_fast_assign(
> >                 __entry->version = cmd->version;
> > -               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(1);
> > -               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(1);
> > +               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
> > +               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
> >                 __entry->outsize = cmd->outsize;
> >                 __entry->insize = cmd->insize;
> >         ),
> > @@ -55,8 +55,8 @@ TRACE_EVENT(cros_ec_request_done,
> >         ),
> >         TP_fast_assign(
> >                 __entry->version = cmd->version;
> > -               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(1);
> > -               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(1);
> > +               __entry->offset = cmd->command / EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
> > +               __entry->command = cmd->command % EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX);
> >                 __entry->outsize = cmd->outsize;
> >                 __entry->insize = cmd->insize;
> >                 __entry->result = cmd->result;
> > diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
> > index 138fd912c808..6475a8066f00 100644
> > --- a/include/linux/platform_data/cros_ec_proto.h
> > +++ b/include/linux/platform_data/cros_ec_proto.h
> > @@ -21,6 +21,9 @@
> >  #define CROS_EC_DEV_SCP_NAME   "cros_scp"
> >  #define CROS_EC_DEV_TP_NAME    "cros_tp"
> >
> > +#define CROS_EC_DEV_EC_INDEX 0
> > +#define CROS_EC_DEV_PD_INDEX 1
> > +
> >  /*
> >   * The EC is unresponsive for a time after a reboot command.  Add a
> >   * simple delay to make sure that the bus stays locked.
> > --
> > 2.36.1.255.ge46751e96f-goog
> >