From: Daniel Campello <campello@chromium.org>
To: LKML <devicetree@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>
Cc: Jonathan Cameron <jic23@kernel.org>,
Daniel Campello <campello@chromium.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Douglas Anderson <dianders@chromium.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Stephen Boyd <swboyd@chromium.org>,
linux-iio@vger.kernel.org
Subject: [PATCH v4 06/15] iio: sx9310: Fixes various memory handling
Date: Mon, 3 Aug 2020 17:41:45 -0600 [thread overview]
Message-ID: <20200803131544.v4.6.I8accffd77d616cb55b29bc3021cb0f5e1da3b68a@changeid> (raw)
In-Reply-To: <20200803234154.320400-1-campello@chromium.org>
Makes use __aligned(8) to ensure that the timestamp is correctly aligned
when we call io_push_to_buffers_with_timestamp().
Also makes use of sizeof() for regmap_bulk_read instead of static value.
Signed-off-by: Daniel Campello <campello@chromium.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
Changes in v4:
- Use pointer to buffer struct on iio_push_to_buffers_with_timestamp().
Changes in v3:
- Changed buffer to struct type to align timestamp memory properly.
Changes in v2:
- Fixed commit message from "iio: sx9310: Align memory"
drivers/iio/proximity/sx9310.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index c89a4e27201796..20a26b73b5ae90 100644
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -131,8 +131,11 @@ struct sx9310_data {
*/
bool prox_stat[SX9310_NUM_CHANNELS];
bool trigger_enabled;
- __be16 buffer[SX9310_NUM_CHANNELS +
- 4]; /* 64-bit data + 64-bit timestamp */
+ /* Ensure correct alignment of timestamp when present. */
+ struct {
+ __be16 channels[SX9310_NUM_CHANNELS];
+ s64 ts __aligned(8);
+ } buffer;
/* Remember enabled channels and sample rate during suspend. */
unsigned int suspend_ctrl0;
struct completion completion;
@@ -343,7 +346,7 @@ static int sx9310_read_prox_data(struct sx9310_data *data,
if (ret < 0)
return ret;
- return regmap_bulk_read(data->regmap, chan->address, val, 2);
+ return regmap_bulk_read(data->regmap, chan->address, val, sizeof(*val));
}
/*
@@ -693,7 +696,7 @@ static irqreturn_t sx9310_trigger_handler(int irq, void *private)
if (ret < 0)
goto out;
- data->buffer[i++] = val;
+ data->buffer.channels[i++] = val;
}
iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
--
2.28.0.163.g6104cc2f0b6-goog
next prev parent reply other threads:[~2020-08-03 23:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 23:41 [PATCH v4 00/15] sx9310 iio driver updates Daniel Campello
2020-08-03 23:41 ` [PATCH v4 01/15] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-08-03 23:41 ` [PATCH v4 02/15] iio: sx9310: Update macros declarations Daniel Campello
2020-08-03 23:41 ` [PATCH v4 03/15] iio: sx9310: Fix irq handling Daniel Campello
2020-08-03 23:41 ` [PATCH v4 04/15] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-08-03 23:41 ` [PATCH v4 05/15] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-08-03 23:41 ` Daniel Campello [this message]
2020-08-03 23:41 ` [PATCH v4 07/15] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-08-03 23:41 ` [PATCH v4 08/15] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-08-03 23:41 ` [PATCH v4 09/15] iio: sx9310: Update copyright Daniel Campello
2020-08-03 23:41 ` [PATCH v4 10/15] iio: sx9310: Simplify error return handling Daniel Campello
2020-08-03 23:41 ` [PATCH v4 11/15] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-08-03 23:41 ` [PATCH v4 12/15] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-08-03 23:41 ` [PATCH v4 13/15] iio: sx9310: Drop channel_users[] Daniel Campello
2020-08-03 23:41 ` [PATCH v4 14/15] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-08-03 23:41 ` [PATCH v4 15/15] iio: sx9310: Use irq trigger flags from firmware Daniel Campello
2020-08-03 23:50 ` [PATCH v4 00/15] sx9310 iio driver updates Daniel Campello
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200803131544.v4.6.I8accffd77d616cb55b29bc3021cb0f5e1da3b68a@changeid \
--to=campello@chromium.org \
--cc=andy.shevchenko@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=swboyd@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).