From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1090C433B4 for ; Thu, 13 May 2021 17:38:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C2CE613CB for ; Thu, 13 May 2021 17:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231217AbhEMRjQ (ORCPT ); Thu, 13 May 2021 13:39:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:36704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231178AbhEMRjN (ORCPT ); Thu, 13 May 2021 13:39:13 -0400 Received: from jic23-huawei (cpc108967-cmbg20-2-0-cust86.5-4.cable.virginm.net [81.101.6.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A3766102A; Thu, 13 May 2021 17:38:01 +0000 (UTC) Date: Thu, 13 May 2021 18:39:11 +0100 From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Jonathan Cameron Subject: Re: [PATCH 06/19] iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Message-ID: <20210513183911.643d6fb0@jic23-huawei> In-Reply-To: <20210501170121.512209-7-jic23@kernel.org> References: <20210501170121.512209-1-jic23@kernel.org> <20210501170121.512209-7-jic23@kernel.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Sat, 1 May 2021 18:01:08 +0100 Jonathan Cameron wrote: > From: Jonathan Cameron > > To make code more readable, use a structure to express the channel > layout and ensure the timestamp is 8 byte aligned. > > Found during an audit of all calls of this function. > > Fixes: 95c12bba51c3 ("iio: accel: Add buffer mode for Sensortek STK8312") > Signed-off-by: Jonathan Cameron Also missing the __aligned(8) for the timestamp. Added it. thanks, Jonathan > --- > drivers/iio/accel/stk8312.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c > index 157d8faefb9e..c8b6915a757c 100644 > --- a/drivers/iio/accel/stk8312.c > +++ b/drivers/iio/accel/stk8312.c > @@ -103,7 +103,11 @@ struct stk8312_data { > u8 mode; > struct iio_trigger *dready_trig; > bool dready_trigger_on; > - s8 buffer[16]; /* 3x8-bit channels + 5x8 padding + 64-bit timestamp */ > + /* Ensure timestamp is naturally aligned */ > + struct { > + s8 chans[3]; > + s64 timestamp; > + } scan; > }; > > static IIO_CONST_ATTR(in_accel_scale_available, STK8312_SCALE_AVAIL); > @@ -438,7 +442,7 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) > ret = i2c_smbus_read_i2c_block_data(data->client, > STK8312_REG_XOUT, > STK8312_ALL_CHANNEL_SIZE, > - data->buffer); > + data->scan.chans); > if (ret < STK8312_ALL_CHANNEL_SIZE) { > dev_err(&data->client->dev, "register read failed\n"); > mutex_unlock(&data->lock); > @@ -452,12 +456,12 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) > mutex_unlock(&data->lock); > goto err; > } > - data->buffer[i++] = ret; > + data->scan.chans[i++] = ret; > } > } > mutex_unlock(&data->lock); > > - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, > + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, > pf->timestamp); > err: > iio_trigger_notify_done(indio_dev->trig);