| Message ID | 20220720044754.4026295-3-tzungbi@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | afef1e1a0223623d063a6df51dbc342c9517b948 |
| Headers | show |
| Series | platform/chrome: avoid garbage bytes in `msg->result` | expand |
On Tue, Jul 19, 2022 at 9:48 PM Tzung-Bi Shih <tzungbi@kernel.org> wrote: > > Add default value for `msg->result` so that it won't be garbage bytes > when the mock list is empty. > > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> Reviewed-by: Guenter Roeck <groeck@chromium.org> > --- > drivers/platform/chrome/cros_kunit_util.c | 6 +++++- > drivers/platform/chrome/cros_kunit_util.h | 1 + > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/platform/chrome/cros_kunit_util.c b/drivers/platform/chrome/cros_kunit_util.c > index 090927d43035..f0fda96b11bd 100644 > --- a/drivers/platform/chrome/cros_kunit_util.c > +++ b/drivers/platform/chrome/cros_kunit_util.c > @@ -13,6 +13,7 @@ > #include "cros_ec.h" > #include "cros_kunit_util.h" > > +int cros_kunit_ec_xfer_mock_default_result; > int cros_kunit_ec_xfer_mock_default_ret; > int cros_kunit_ec_cmd_xfer_mock_called; > int cros_kunit_ec_pkt_xfer_mock_called; > @@ -25,8 +26,10 @@ int cros_kunit_ec_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_comman > struct ec_xfer_mock *mock; > > mock = list_first_entry_or_null(&cros_kunit_ec_xfer_mock_in, struct ec_xfer_mock, list); > - if (!mock) > + if (!mock) { > + msg->result = cros_kunit_ec_xfer_mock_default_result; > return cros_kunit_ec_xfer_mock_default_ret; > + } > > list_del(&mock->list); > > @@ -112,6 +115,7 @@ int cros_kunit_readmem_mock(struct cros_ec_device *ec_dev, unsigned int offset, > > void cros_kunit_mock_reset(void) > { > + cros_kunit_ec_xfer_mock_default_result = 0; > cros_kunit_ec_xfer_mock_default_ret = 0; > cros_kunit_ec_cmd_xfer_mock_called = 0; > cros_kunit_ec_pkt_xfer_mock_called = 0; > diff --git a/drivers/platform/chrome/cros_kunit_util.h b/drivers/platform/chrome/cros_kunit_util.h > index 88134c9f1acf..414002271c9c 100644 > --- a/drivers/platform/chrome/cros_kunit_util.h > +++ b/drivers/platform/chrome/cros_kunit_util.h > @@ -23,6 +23,7 @@ struct ec_xfer_mock { > u32 o_data_len; > }; > > +extern int cros_kunit_ec_xfer_mock_default_result; > extern int cros_kunit_ec_xfer_mock_default_ret; > extern int cros_kunit_ec_cmd_xfer_mock_called; > extern int cros_kunit_ec_pkt_xfer_mock_called; > -- > 2.37.0.170.g444d1eabd0-goog >
diff --git a/drivers/platform/chrome/cros_kunit_util.c b/drivers/platform/chrome/cros_kunit_util.c index 090927d43035..f0fda96b11bd 100644 --- a/drivers/platform/chrome/cros_kunit_util.c +++ b/drivers/platform/chrome/cros_kunit_util.c @@ -13,6 +13,7 @@ #include "cros_ec.h" #include "cros_kunit_util.h" +int cros_kunit_ec_xfer_mock_default_result; int cros_kunit_ec_xfer_mock_default_ret; int cros_kunit_ec_cmd_xfer_mock_called; int cros_kunit_ec_pkt_xfer_mock_called; @@ -25,8 +26,10 @@ int cros_kunit_ec_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_comman struct ec_xfer_mock *mock; mock = list_first_entry_or_null(&cros_kunit_ec_xfer_mock_in, struct ec_xfer_mock, list); - if (!mock) + if (!mock) { + msg->result = cros_kunit_ec_xfer_mock_default_result; return cros_kunit_ec_xfer_mock_default_ret; + } list_del(&mock->list); @@ -112,6 +115,7 @@ int cros_kunit_readmem_mock(struct cros_ec_device *ec_dev, unsigned int offset, void cros_kunit_mock_reset(void) { + cros_kunit_ec_xfer_mock_default_result = 0; cros_kunit_ec_xfer_mock_default_ret = 0; cros_kunit_ec_cmd_xfer_mock_called = 0; cros_kunit_ec_pkt_xfer_mock_called = 0; diff --git a/drivers/platform/chrome/cros_kunit_util.h b/drivers/platform/chrome/cros_kunit_util.h index 88134c9f1acf..414002271c9c 100644 --- a/drivers/platform/chrome/cros_kunit_util.h +++ b/drivers/platform/chrome/cros_kunit_util.h @@ -23,6 +23,7 @@ struct ec_xfer_mock { u32 o_data_len; }; +extern int cros_kunit_ec_xfer_mock_default_result; extern int cros_kunit_ec_xfer_mock_default_ret; extern int cros_kunit_ec_cmd_xfer_mock_called; extern int cros_kunit_ec_pkt_xfer_mock_called;
Add default value for `msg->result` so that it won't be garbage bytes when the mock list is empty. Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> --- drivers/platform/chrome/cros_kunit_util.c | 6 +++++- drivers/platform/chrome/cros_kunit_util.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)