From patchwork Mon Jul 19 14:49:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479936 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240890jao; Mon, 19 Jul 2021 08:38:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE2FWWS0OZ/0ElN6BPsVp8QPmWJfFcflkLkvHnf3gUiOC8aadq5Ina1fNsd+4IsdEZ+HWF X-Received: by 2002:a92:c5c2:: with SMTP id s2mr17937922ilt.180.1626709129699; Mon, 19 Jul 2021 08:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709129; cv=none; d=google.com; s=arc-20160816; b=n30P5ZQ+t8b0dlAqfBtejBQJyeVUoQ9iAZp55ShDny2uB8YoA/apJSwZuHfoegEXTx FprE1LQLZfiBcEkzQTjdVJDj0YZNOsca5Z7zAdsalVNrwd8CU3j+tzUTSN7MmBHWgWpW RgOeQ9ovH5xo6nnB/xMqbr8Zf9F7vuWyvplW+/HiboQz8TP0zohEBYg7RoBZS29xH7XM j75/1akK8gX8NqXSDnWF7LtSMalv4JnFx2/lf84CK1Ug3LjD2chNljDLiKi9g/aiegv/ Df8+OBUZX755q49CczH15LrMqRK17Fp8Y5l5FwAqoYL/UM6Kvxn6fkBZYa4xYwnWZsY9 Thxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/GUZ0WFcKnNlHOKiLAxrRedJQH9V8yBbIpGDHCGeuoY=; b=jrcK+Ff1tSAoGa2BTeS098KbwYDL01KZS/qxhy6cgoW5/t3Q7IlrehhFFZnwbFHn6t gKBbwiPlTBGkHYLq2ixr3hK+Bi//OZCMZVWy6yoJfLFUpIDDQLMwFUTNiq2as8VDyasF uo9oiwDZCmf7vItcqSPu+1mzh76oh2kBtYbvhoP39c5A7pEUunINWyPPxlh4XZ9jI8m6 nH5F7Nr3NoGdniidyAPZDrl4O4DTy9wENWSS55Tq6K7HMzoTI9WVgeMpKrTRacR7+6Xf evAczOqW13F48uLthd9cBa5DjGMnZy4oKRbFEJDmQZZbj3enNdMtK8TbWHZqzMq/WpJ6 DZsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=125K3wXv; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s16si20227841jan.83.2021.07.19.08.38.49; Mon, 19 Jul 2021 08:38:49 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=125K3wXv; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239326AbhGSO6I (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:51812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237869AbhGSO5X (ORCPT ); Mon, 19 Jul 2021 10:57:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AE56061220; Mon, 19 Jul 2021 15:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708894; bh=mXyXM6ZcXj2WZ/NvbP8KjejHtp4t2C5s9Oe/MVr5pfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=125K3wXvii5cVjd9X2Om+E+BvHjrnKDLb00R/WkLGbJxG0o+EQedmEnryMXdXko4r 3ahn62gKo9YCBOwh9jHFDL7g78LSb1VSCD1n3dvgwlbt5MSSDoMYvnrZIedgxipA0z aaWO8rshId99LXDPRaddEEQhvVC9+WbeXYag2+qg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 172/421] iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:43 +0200 Message-Id: <20210719144952.390612277@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron [ Upstream commit f40a71ffec808e7e51848f63f0c0d3c32d65081b ] 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 Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-7-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/stk8312.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c index cacc0da2f874..52c33addf47b 100644 --- a/drivers/iio/accel/stk8312.c +++ b/drivers/iio/accel/stk8312.c @@ -106,7 +106,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 __aligned(8); + } scan; }; static IIO_CONST_ATTR(in_accel_scale_available, STK8312_SCALE_AVAIL); @@ -441,7 +445,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); @@ -455,12 +459,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);